From 1718d434efae26de02754c6622c43f4dc9e624b9 Mon Sep 17 00:00:00 2001
From: jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Thu, 15 Mar 2012 15:54:14 +0000
Subject: Update kinfit and mkin to the latest version published on BerliOS.

git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@17 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
---
 inst/unitTests/runit.mkinfit.R | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'inst/unitTests/runit.mkinfit.R')

diff --git a/inst/unitTests/runit.mkinfit.R b/inst/unitTests/runit.mkinfit.R
index df09cc6..831c069 100644
--- a/inst/unitTests/runit.mkinfit.R
+++ b/inst/unitTests/runit.mkinfit.R
@@ -1,3 +1,23 @@
+# $Id: runit.mkinfit.R 68 2010-09-09 22:40:04Z jranke $
+
+# Copyright (C) 2010 Johannes Ranke
+# Contact: mkin-devel@lists.berlios.de
+
+# This file is part of the R package mkin
+
+# mkin is free software: you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>
+
 test.mkinmod.schaefer07_complex_example <- function()
 {
   schaefer07_complex_model <- mkinmod(
@@ -17,16 +37,16 @@ test.mkinmod.schaefer07_complex_example <- function()
   r$mkin <- c(
     k_parent,
     s$distimes["parent", "DT50"],
-    k_parent_A1/k_parent,
+    s$ff["parent_A1"],
     sum(k_A1_sink, k_A1_A2),
     s$distimes["A1", "DT50"],
-    k_parent_B1/k_parent,
+    s$ff["parent_B1"],
     k_B1_sink,
     s$distimes["B1", "DT50"],
-    k_parent_C1/k_parent,
+    s$ff["parent_C1"],
     k_C1_sink,
     s$distimes["C1", "DT50"],
-    k_A1_A2/(k_A1_A2 + k_A1_sink),
+    s$ff["A1_A2"],
     k_A2_sink,
     s$distimes["A2", "DT50"])
   r$means <- (r$KinGUI + r$ModelMaker)/2
-- 
cgit v1.2.1