aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorranke <ranke@d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc>2007-10-01 19:17:27 +0000
committerranke <ranke@d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc>2007-10-01 19:17:27 +0000
commite6b9164327957c56de221889e396dcbab6fddd31 (patch)
tree64d56cc486235aeb0106db0db9c33ef35ea8fd98
parent893e4cf7c08b02d8e6dc1340608c418fc64536fa (diff)
Make drfit compatible with R 2.6.0, checked with prerelease from today
git-svn-id: http://kriemhild.uft.uni-bremen.de/svn/drfit@91 d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc
-rw-r--r--DESCRIPTION9
-rw-r--r--R/drplot.R2
-rw-r--r--tests/IM1xIPC81.Rout.save22
3 files changed, 17 insertions, 16 deletions
diff --git a/DESCRIPTION b/DESCRIPTION
index 23e2ee1..c4b7819 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
Package: drfit
-Version: 0.05-89
-Date: 2007-03-29
+Version: 0.05-90
+Date: 2007-10-01
Title: Dose-response data evaluation
Author: Johannes Ranke <jranke@uni-bremen.de>
Maintainer: Johannes Ranke <jranke@uni-bremen.de>
@@ -15,7 +15,8 @@ Description: drfit provides basic and easy-to-use functions for fitting
at low doses (hormesis). In addition, functions checking, plotting and
retrieving dose-response data retrieved from a database accessed via RODBC
are included.
-License: GPL version 2 or newer
+Encoding: latin1
+License: GPL (>= 2)
URL: http://www.r-project.org,
- http://www.uft.uni-bremen.de/chemie/ranke,
+ http://www.uft.uni-bremen.de/chemie/ranke?page=drfit,
http://kriemhild.uft.uni-bremen.de/viewcvs/?root=drfit
diff --git a/R/drplot.R b/R/drplot.R
index 3573fd9..08a92d1 100644
--- a/R/drplot.R
+++ b/R/drplot.R
@@ -7,7 +7,7 @@ drplot <- function(drresults, data,
postscript = FALSE, pdf = FALSE, png = FALSE,
bw = TRUE,
pointsize = 12,
- colors = 1:8, ltys = 1:8, devoff=T, lpos="topright")
+ colors = 1:8, ltys = 1:8, devoff=TRUE, lpos="topright")
{
# Check if all data have the same unit
unitlevels <- levels(as.factor(drresults$unit))
diff --git a/tests/IM1xIPC81.Rout.save b/tests/IM1xIPC81.Rout.save
index 022ef9a..b45d6f5 100644
--- a/tests/IM1xIPC81.Rout.save
+++ b/tests/IM1xIPC81.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 RC (2007-09-25 r42980)
+Copyright (C) 2007 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -25,11 +25,11 @@ 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)
+ Convergence failure: false convergence (8)
Error in numericDeriv(form[[3]], names(ind), env, ifelse(internalPars < :
- Missing value or an infinity produced when evaluating the model
+ Missing value or an infinity produced when evaluating the model
In addition: Warning message:
-NaNs produced in: pnorm(q, mean, sd, lower.tail, log.p)
+In pnorm(q, mean, sd, lower.tail, log.p) : NaNs produced
IM15 BF4: Fitting data...
@@ -38,23 +38,23 @@ 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
+ Missing value or an infinity produced when evaluating the model
In addition: Warning message:
-NaNs produced in: pnorm(q, mean, sd, lower.tail, log.p)
+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
+ Missing value or an infinity produced when evaluating the model
In addition: Warning message:
-NaNs produced in: pnorm(q, mean, sd, lower.tail, log.p)
+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
+ Missing value or an infinity produced when evaluating the model
In addition: Warning message:
-NaNs produced in: pnorm(q, mean, sd, lower.tail, log.p)
+In pnorm(q, mean, sd, lower.tail, log.p) : NaNs produced
IM1-10 BF4: Fitting data...
Waiting for profiling to be done...

Contact - Imprint