- Releasable version for CRAN

- Changed usage of cat() to message() because the latter does not interfere
  with Sweave. Left cat() in checkexperiment.R and checksubstance.R



git-svn-id: http://kriemhild.uft.uni-bremen.de/svn/drfit@92 d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc

5 files changed, 44 insertions, 10 deletions

diff --git a/tests/IM1xIPC81.Rout.save b/tests/IM1xIPC81.Rout.save
index b45d6f5..170243e 100644
--- a/tests/IM1xIPC81.Rout.save
+++ b/tests/IM1xIPC81.Rout.save
@@ -1,5 +1,5 @@
 
-R version 2.6.0 RC (2007-09-25 r42980)
+R version 2.6.0 (2007-10-03)
 Copyright (C) 2007 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
 
@@ -23,7 +23,9 @@ Loading required package: RODBC
 
 IM13 BF4: Fitting data...
 
+
 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 <  : 
@@ -33,9 +35,12 @@ In pnorm(q, mean, sd, lower.tail, log.p) : NaNs produced
 
 IM15 BF4: Fitting data...
 
+
 IM16 BF4: Fitting data...
 
+
 IM17 BF4: Fitting data...
+
 Waiting for profiling to be done...
 Error in numericDeriv(form[[3]], names(ind), env, ifelse(internalPars <  : 
   Missing value or an infinity produced when evaluating the model
@@ -43,6 +48,7 @@ In addition: Warning message:
 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 <  : 
   Missing value or an infinity produced when evaluating the model
@@ -50,6 +56,7 @@ In addition: Warning message:
 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 <  : 
   Missing value or an infinity produced when evaluating the model
@@ -57,6 +64,7 @@ In addition: Warning message:
 In pnorm(q, mean, sd, lower.tail, log.p) : NaNs produced
 
 IM1-10 BF4: Fitting data...
+
 Waiting for profiling to be done...
 > print(rIM1xIPC81,digits=5)
    Substance ndl   n       lld    lhd    mtype logED50    2.5%   97.5%   unit
diff --git a/tests/IM1xVibrio.Rout.save b/tests/IM1xVibrio.Rout.save
index 6ba7310..e08e9e5 100644
--- a/tests/IM1xVibrio.Rout.save
+++ b/tests/IM1xVibrio.Rout.save
@@ -1,6 +1,6 @@
 
-R version 2.4.1 (2006-12-18)
-Copyright (C) 2006 The R Foundation for Statistical Computing
+R version 2.6.0 (2007-10-03)
+Copyright (C) 2007 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -22,27 +22,35 @@ Loading required package: RODBC
 > rIM1xVibrio <- drfit(IM1xVibrio)
 
 IM13 BF4: Fitting data...
+
 Waiting for profiling to be done...
 
 IM14 BF4: Fitting data...
+
 Waiting for profiling to be done...
 
 IM15 BF4: Fitting data...
+
 Waiting for profiling to be done...
 
 IM16 BF4: Fitting data...
+
 Waiting for profiling to be done...
 
 IM17 BF4: Fitting data...
+
 Waiting for profiling to be done...
 
 IM18 BF4: Fitting data...
+
 Waiting for profiling to be done...
 
 IM19 BF4: Fitting data...
+
 Waiting for profiling to be done...
 
 IM1-10 BF4: Fitting data...
+
 Waiting for profiling to be done...
 > print(rIM1xVibrio,digits=5)
    Substance ndl  n      lld    lhd  mtype  logED50     2.5%    97.5%   unit
diff --git a/tests/XY.Rout.save b/tests/XY.Rout.save
index 9172e08..e59ab76 100644
--- a/tests/XY.Rout.save
+++ b/tests/XY.Rout.save
@@ -1,6 +1,6 @@
 
-R version 2.4.1 (2006-12-18)
-Copyright (C) 2006 The R Foundation for Statistical Computing
+R version 2.6.0 (2007-10-03)
+Copyright (C) 2007 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -23,11 +23,14 @@ Loading required package: RODBC
 
 Control: Fitting data...
 
+
 Substance X: Fitting data...
+
 Waiting for profiling to be done...
 Waiting for profiling to be done...
 
 Substance Y: Fitting data...
+
 > print(rXY,digits=5)
     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
diff --git a/tests/antifoul.Rout.save b/tests/antifoul.Rout.save
index 7bcba6a..28f8ad0 100644
--- a/tests/antifoul.Rout.save
+++ b/tests/antifoul.Rout.save
@@ -1,6 +1,6 @@
 
-R version 2.4.1 (2006-12-18)
-Copyright (C) 2006 The R Foundation for Statistical Computing
+R version 2.6.0 (2007-10-03)
+Copyright (C) 2007 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -22,9 +22,11 @@ Loading required package: RODBC
 > rantifoul <- drfit(antifoul)
 
 TBT: Fitting data...
+
 Waiting for profiling to be done...
 
 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
diff --git a/tests/pyrithione.Rout.save b/tests/pyrithione.Rout.save
index 6df94db..4a045a3 100644
--- a/tests/pyrithione.Rout.save
+++ b/tests/pyrithione.Rout.save
@@ -1,6 +1,6 @@
 
-R version 2.4.1 (2006-12-18)
-Copyright (C) 2006 The R Foundation for Statistical Computing
+R version 2.6.0 (2007-10-03)
+Copyright (C) 2007 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -22,43 +22,56 @@ Loading required package: RODBC
 > rpyr <- drfit(pyrithione,linlogit=TRUE,linlogitWrong=c("MSPT","MSPHI"))
 
 Na Pyrithion: Fitting data...
+
 Waiting for profiling to be done...
 Error in prof$getProfile() : attempt to apply non-function
 
 Pyridin: Fitting data...
 
+
 PyNO: Fitting data...
+
 Error in nls(response ~ linlogitf(dose, 1, f, logED50, b), data = tmp,  : 
-	Convergence failure: false convergence (8)
+  Convergence failure: false convergence (8)
 
 (PT)2: Fitting data...
+
 Waiting for profiling to be done...
 
 MSO2P: Fitting data...
 
+
 MSPHI: Fitting data...
+
 Waiting for profiling to be done...
 
 PyS: Fitting data...
+
 Waiting for profiling to be done...
 Error in prof$getProfile() : attempt to apply non-function
 
 Zn Pyrithion: Fitting data...
+
 Waiting for profiling to be done...
 
 Cu Pyrithion: Fitting data...
+
 Waiting for profiling to be done...
 
 Fe Pyrithion: Fitting data...
+
 Waiting for profiling to be done...
 
 MSPT: Fitting data...
+
 Waiting for profiling to be done...
 
 TBT: Fitting data...
+
 Waiting for profiling to be done...
 
 NaJ: Fitting data...
+
 > print(rpyr,digits=3)
       Substance ndl   n    lld lhd    mtype logED50   2.5%   97.5%   unit sigma
 1  Na Pyrithion  20 108 -2.107 2.0 linlogit  -0.346     NA      NA microM 0.209