diff options
| author | jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb> | 2012-03-15 15:54:14 +0000 |
|---|---|---|
| committer | jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb> | 2012-03-15 15:54:14 +0000 |
| commit | 3a6b9f52c74d6ef88a8d32c50e42864b3f251719 (patch) | |
| tree | c80ebe6187fc88e77dd17da09135a168744ea23f /tests | |
| parent | b9f180f177c2aca5d3a33e850b4fb0c51053bf2f (diff) | |
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/kinfit@17 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_FOCUS_2006_A.R | 20 | ||||
| -rw-r--r-- | tests/test_FOCUS_2006_A.Rout.save | 65 |
2 files changed, 62 insertions, 23 deletions
diff --git a/tests/test_FOCUS_2006_A.R b/tests/test_FOCUS_2006_A.R index 2077315..ff55174 100644 --- a/tests/test_FOCUS_2006_A.R +++ b/tests/test_FOCUS_2006_A.R @@ -1,3 +1,23 @@ +# $Id: test_FOCUS_2006_A.R 59 2010-07-28 12:29:15Z jranke $
+
+# Copyright (C) 2008-2010 Johannes Ranke
+# Contact: mkin-devel@lists.berlios.de
+
+# This file is part of the R package kinfit
+
+# kinfit 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/>
+
library(kinfit)
data(FOCUS_2006_A)
fits <- kinfit(FOCUS_2006_A, kinmodels = c("SFO", "HS"))
diff --git a/tests/test_FOCUS_2006_A.Rout.save b/tests/test_FOCUS_2006_A.Rout.save index a26b701..d209084 100644 --- a/tests/test_FOCUS_2006_A.Rout.save +++ b/tests/test_FOCUS_2006_A.Rout.save @@ -1,7 +1,8 @@ -R version 2.10.0 (2009-10-26)
-Copyright (C) 2009 The R Foundation for Statistical Computing
+R version 2.14.0 (2011-10-31)
+Copyright (C) 2011 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
+Platform: i386-pc-mingw32/i386 (32-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -15,17 +16,35 @@ Type 'demo()' for some demos, 'help()' for on-line help, or 'help.start()' for an HTML browser interface to help.
Type 'q()' to quit R.
+> # $Id: test_FOCUS_2006_A.R 59 2010-07-28 12:29:15Z jranke $
+>
+> # Copyright (C) 2008-2010 Johannes Ranke
+> # Contact: mkin-devel@lists.berlios.de
+>
+> # This file is part of the R package kinfit
+>
+> # kinfit 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/>
+>
> library(kinfit)
> data(FOCUS_2006_A)
> fits <- kinfit(FOCUS_2006_A, kinmodels = c("SFO", "HS"))
> print(kinresults(fits)$results, digits=5)
DT50 DT90
SFO 18.624 61.868
-HS 20.294 49.854
> print(kinresults(fits)$stats, digits=5)
- n.times df mean.means RSS err.min
-SFO 8 6 50.054 221.8078 0.083848
-HS 8 4 50.054 6.6927 0.016766
+ n.times df mean.means RSS err.min R2
+SFO 8 6 50.054 221.81 0.083848 0.9845
>
> data(FOCUS_2006_B)
> fits <- kinfit(FOCUS_2006_B, kinmodels = c("SFO", "FOMC", "DFOP"))
@@ -35,23 +54,23 @@ SFO 8.8686 29.461 FOMC 8.6834 30.754
DFOP 8.6829 30.789
> print(kinresults(fits)$stats, digits=5)
- n.times df mean.means RSS err.min
-SFO 8 6 35.015 30.656 0.044555
-FOMC 8 5 35.015 28.583 0.045886
-DFOP 8 4 35.015 28.550 0.049527
+ n.times df mean.means RSS err.min R2
+SFO 8 6 35.015 30.656 0.044555 0.99713
+FOMC 8 5 35.015 28.583 0.045886 0.99733
+DFOP 8 4 35.015 28.550 0.049527 0.99733
>
> data(FOCUS_2006_C)
> fits <- kinfit(FOCUS_2006_C, kinmodels = c("SFO", "FOMC", "DFOP"))
> print(kinresults(fits)$results, digits=5)
DT50 DT90
-SFO 2.2647 7.5232
+SFO 2.2647 7.5233
FOMC 1.7852 15.1479
DFOP 1.8869 21.2507
> print(kinresults(fits)$stats, digits=5)
- n.times df mean.means RSS err.min
-SFO 9 7 23.589 196.5334 0.158440
-FOMC 9 6 23.589 31.0509 0.066568
-DFOP 9 5 23.589 4.3627 0.026621
+ n.times df mean.means RSS err.min R2
+SFO 9 7 23.589 196.5334 0.158440 0.97136
+FOMC 9 6 23.589 31.0509 0.066568 0.99548
+DFOP 9 5 23.589 4.3627 0.026621 0.99936
>
> data(FOCUS_2006_D)
> fits <- kinfit(FOCUS_2006_D, kinmodels = c("SFO", "FOMC"))
@@ -60,20 +79,20 @@ DFOP 9 5 23.589 4.3627 0.026621 SFO 7.0776 23.511
FOMC 6.9350 24.044
> print(kinresults(fits)$stats, digits=5)
- n.times df mean.means RSS err.min
-SFO 9 7 39.523 207.63 0.064524
-FOMC 9 6 39.523 205.45 0.067802
+ n.times df mean.means RSS err.min R2
+SFO 9 7 39.523 207.63 0.064524 0.99194
+FOMC 9 6 39.523 205.45 0.067802 0.99202
>
> data(FOCUS_2006_E)
> fits <- kinfit(FOCUS_2006_E, kinmodels = c("SFO", "FOMC", "DFOP"))
> print(kinresults(fits)$results, digits=5)
DT50 DT90
-SFO 2.2647 7.5232
+SFO 2.2647 7.5233
FOMC 1.7852 15.1479
DFOP 1.8869 21.2507
> print(kinresults(fits)$stats, digits=5)
- n.times df mean.means RSS err.min
-SFO 9 7 23.589 196.5334 0.158440
-FOMC 9 6 23.589 31.0509 0.066568
-DFOP 9 5 23.589 4.3627 0.026621
+ n.times df mean.means RSS err.min R2
+SFO 9 7 23.589 196.5334 0.158440 0.97136
+FOMC 9 6 23.589 31.0509 0.066568 0.99548
+DFOP 9 5 23.589 4.3627 0.026621 0.99936
>
|