aboutsummaryrefslogtreecommitdiff
path: root/R/drfit.R
diff options
context:
space:
mode:
authorranke <ranke@d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc>2007-11-23 16:19:08 +0000
committerranke <ranke@d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc>2007-11-23 16:19:08 +0000
commit1066c87b174f2b3df19e54adee1ee435021441c9 (patch)
tree26003c9a4a333ecdc99ef6773a6df96572f51c11 /R/drfit.R
parente6b9164327957c56de221889e396dcbab6fddd31 (diff)
- 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
Diffstat (limited to 'R/drfit.R')
-rw-r--r--R/drfit.R10
1 files changed, 5 insertions, 5 deletions
diff --git a/R/drfit.R b/R/drfit.R
index 3bd9021..462bc43 100644
--- a/R/drfit.R
+++ b/R/drfit.R
@@ -32,13 +32,13 @@ drfit <- function(data, startlogED50 = NA, chooseone=TRUE,
fit <- FALSE
if (length(tmp) != 0) {
unit <- levels(as.factor(as.vector(tmp$unit)))
- cat("\n",i,": Fitting data...\n",sep="")
+ message("\n",i,": Fitting data...\n")
} else {
unit <- ""
- cat("\n",i,": No data\n",sep="")
+ message("\n",i,": No data\n")
}
if (length(unit) > 1) {
- cat("More than one unit for substance ",i,", halting\n\n",sep="")
+ message("More than one unit for substance ",i,", halting\n\n")
break
}
if (length(tmp$response) == 0) {
@@ -211,8 +211,8 @@ drfit <- function(data, startlogED50 = NA, chooseone=TRUE,
}
logED50[[ri]] <- nlm(sqrdev,startlogED50[[i]])$estimate
if (sqrdev(logED50[[ri]]) > 0.1) {
- cat("\nCan't find ED50 for fitted weibull model of ",i,
- "data\nwith startlogED50", startlogED50[[i]],"\n")
+ message("\nCan't find ED50 for fitted weibull model of ",i,
+ " data\nwith startlogED50 ", startlogED50[[i]],"\n")
ri <- ri - 1
length(a) <- length(b) <- ri
length(logED50) <- ri

Contact - Imprint