aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DESCRIPTION4
-rw-r--r--tests/IM1xIPC81.Rout.save14
-rw-r--r--tests/IM1xVibrio.Rout.save6
-rw-r--r--tests/XY.Rout.save6
-rw-r--r--tests/antifoul.Rout.save8
-rw-r--r--tests/pyrithione.Rout.save8
6 files changed, 23 insertions, 23 deletions
diff --git a/DESCRIPTION b/DESCRIPTION
index 4ff5c91..636ad8a 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
Package: drfit
-Version: 0.05-94
-Date: 2009-10-10
+Version: 0.05-95
+Date: 2009-10-11
Title: Dose-response data evaluation
Author: Johannes Ranke <jranke@uni-bremen.de>
Maintainer: Johannes Ranke <jranke@uni-bremen.de>
diff --git a/tests/IM1xIPC81.Rout.save b/tests/IM1xIPC81.Rout.save
index 170243e..db37e67 100644
--- a/tests/IM1xIPC81.Rout.save
+++ b/tests/IM1xIPC81.Rout.save
@@ -1,6 +1,6 @@
-R version 2.6.0 (2007-10-03)
-Copyright (C) 2007 The R Foundation for Statistical Computing
+R version 2.9.2 (2009-08-24)
+Copyright (C) 2009 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -28,7 +28,7 @@ IM14 BF4: Fitting data...
Error in nls(response ~ linlogitf(dose, 1, f, logED50, b), data = tmp, :
Convergence failure: false convergence (8)
-Error in numericDeriv(form[[3]], names(ind), env, ifelse(internalPars < :
+Error in numericDeriv(form[[3L]], names(ind), env, ifelse(internalPars < :
Missing value or an infinity produced when evaluating the model
In addition: Warning message:
In pnorm(q, mean, sd, lower.tail, log.p) : NaNs produced
@@ -42,7 +42,7 @@ IM16 BF4: Fitting data...
IM17 BF4: Fitting data...
Waiting for profiling to be done...
-Error in numericDeriv(form[[3]], names(ind), env, ifelse(internalPars < :
+Error in numericDeriv(form[[3L]], names(ind), env, ifelse(internalPars < :
Missing value or an infinity produced when evaluating the model
In addition: Warning message:
In pnorm(q, mean, sd, lower.tail, log.p) : NaNs produced
@@ -50,7 +50,7 @@ In pnorm(q, mean, sd, lower.tail, log.p) : NaNs produced
IM18 BF4: Fitting data...
Waiting for profiling to be done...
-Error in numericDeriv(form[[3]], names(ind), env, ifelse(internalPars < :
+Error in numericDeriv(form[[3L]], names(ind), env, ifelse(internalPars < :
Missing value or an infinity produced when evaluating the model
In addition: Warning message:
In pnorm(q, mean, sd, lower.tail, log.p) : NaNs produced
@@ -58,7 +58,7 @@ In pnorm(q, mean, sd, lower.tail, log.p) : NaNs produced
IM19 BF4: Fitting data...
Waiting for profiling to be done...
-Error in numericDeriv(form[[3]], names(ind), env, ifelse(internalPars < :
+Error in numericDeriv(form[[3L]], names(ind), env, ifelse(internalPars < :
Missing value or an infinity produced when evaluating the model
In addition: Warning message:
In pnorm(q, mean, sd, lower.tail, log.p) : NaNs produced
@@ -73,7 +73,7 @@ Waiting for profiling to be done...
3 IM15 BF4 9 135 0.591760 3.0000 inactive NA NA NA microM
4 IM16 BF4 9 108 0.591760 3.0000 inactive NA NA NA microM
5 IM17 BF4 9 81 0.591760 3.0000 linlogit 2.5786 2.50572 2.66174 microM
-6 IM18 BF4 9 135 0.591760 3.0000 linlogit 1.6806 1.62298 1.74189 microM
+6 IM18 BF4 9 135 0.591760 3.0000 linlogit 1.6806 1.62297 1.74189 microM
7 IM19 BF4 9 81 0.591760 3.0000 linlogit 1.6496 1.59848 1.70315 microM
8 IM1-10 BF4 11 162 -0.010300 3.0000 linlogit 0.7697 0.68701 0.85442 microM
sigma a b c
diff --git a/tests/IM1xVibrio.Rout.save b/tests/IM1xVibrio.Rout.save
index e08e9e5..ccfdc48 100644
--- a/tests/IM1xVibrio.Rout.save
+++ b/tests/IM1xVibrio.Rout.save
@@ -1,6 +1,6 @@
-R version 2.6.0 (2007-10-03)
-Copyright (C) 2007 The R Foundation for Statistical Computing
+R version 2.9.2 (2009-08-24)
+Copyright (C) 2009 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -60,7 +60,7 @@ Waiting for profiling to be done...
4 IM16 BF4 13 30 -4.30103 4.6990 probit 3.18042 3.14358 3.21762 microM
5 IM17 BF4 10 20 -1.30103 4.6990 probit 2.43173 2.36807 2.49512 microM
6 IM18 BF4 10 17 -2.30103 2.6990 probit 1.40152 1.31467 1.48806 microM
-7 IM19 BF4 13 22 -5.30103 2.6990 probit 0.71579 0.67037 0.75925 microM
+7 IM19 BF4 13 22 -5.30103 2.6990 probit 0.71579 0.67038 0.75925 microM
8 IM1-10 BF4 11 20 -6.30103 2.6990 probit -0.17903 -0.25694 -0.10372 microM
sigma a b
1 0.063029 3.93991 0.57631
diff --git a/tests/XY.Rout.save b/tests/XY.Rout.save
index e59ab76..fc5b0cd 100644
--- a/tests/XY.Rout.save
+++ b/tests/XY.Rout.save
@@ -1,6 +1,6 @@
-R version 2.6.0 (2007-10-03)
-Copyright (C) 2007 The R Foundation for Statistical Computing
+R version 2.9.2 (2009-08-24)
+Copyright (C) 2009 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -35,7 +35,7 @@ Substance Y: Fitting data...
Substance ndl n lld lhd mtype logED50 2.5% 97.5% unit sigma
1 Control 1 6 -Inf -Inf inactive NA NA NA mg/L NA
2 Substance X 4 12 1 3 probit 2.1619 2.1059 2.2144 mg/L 0.041317
-3 Substance X 4 12 1 3 logit 2.1609 2.1122 2.2079 mg/L 0.037587
+3 Substance X 4 12 1 3 logit 2.1609 2.1121 2.2079 mg/L 0.037587
4 Substance X 4 12 1 3 weibull 2.1744 NA NA mg/L 0.057239
5 Substance Y 4 12 1 3 active NA NA NA mg/L NA
a b
diff --git a/tests/antifoul.Rout.save b/tests/antifoul.Rout.save
index 28f8ad0..6846b1e 100644
--- a/tests/antifoul.Rout.save
+++ b/tests/antifoul.Rout.save
@@ -1,6 +1,6 @@
-R version 2.6.0 (2007-10-03)
-Copyright (C) 2007 The R Foundation for Statistical Computing
+R version 2.9.2 (2009-08-24)
+Copyright (C) 2009 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -30,8 +30,8 @@ Zn Pyrithion: Fitting data...
Waiting for profiling to be done...
> print(rantifoul,digits=5)
Substance ndl n lld lhd mtype logED50 2.5% 97.5% unit
-1 TBT 38 135 -2.7093 2.3979 probit -0.16436 -0.26504 -0.056486 microM
-2 Zn Pyrithion 27 81 -2.1072 2.0000 probit -0.39792 -0.50783 -0.291561 microM
+1 TBT 38 135 -2.7093 2.3979 probit -0.16436 -0.26504 -0.056498 microM
+2 Zn Pyrithion 27 81 -2.1072 2.0000 probit -0.39792 -0.50783 -0.291563 microM
sigma a b
1 0.19286 -0.16436 0.67637
2 0.22866 -0.39792 0.41696
diff --git a/tests/pyrithione.Rout.save b/tests/pyrithione.Rout.save
index b62ddda..af67552 100644
--- a/tests/pyrithione.Rout.save
+++ b/tests/pyrithione.Rout.save
@@ -1,6 +1,6 @@
-R version 2.6.2 (2008-02-08)
-Copyright (C) 2008 The R Foundation for Statistical Computing
+R version 2.9.2 (2009-08-24)
+Copyright (C) 2009 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -77,8 +77,8 @@ NaJ: Fitting data...
3 PyNO 19 81 0.592 3.7 no fit NA NA NA microM 0.107
4 (PT)2 19 81 -2.408 2.0 linlogit -0.420 -0.533 NA microM 0.205
5 MSO2P 28 108 -1.709 3.7 inactive NA NA NA microM NA
-6 MSPHI 19 81 0.592 3.7 probit 3.663 3.555 3.8805 microM 0.129
-7 PyS 18 80 -0.408 3.0 linlogit 2.756 2.694 2.8229 microM 0.146
+6 MSPHI 19 81 0.592 3.7 probit 3.663 3.555 3.8802 microM 0.129
+7 PyS 18 80 -0.408 3.0 linlogit 2.756 NA 2.8228 microM 0.146
8 Zn Pyrithion 27 81 -2.107 2.0 linlogit -0.413 -0.529 -0.2998 microM 0.229
9 Cu Pyrithion 19 79 -2.408 2.0 linlogit -0.307 -0.475 -0.1544 microM 0.245
10 Fe Pyrithion 19 81 -2.408 2.0 linlogit -0.353 -0.500 -0.2146 microM 0.234

Contact - Imprint