Some bugfixes and the addition of the linearlogisWrong argument

to the drfit function.



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

3 files changed, 25 insertions, 23 deletions

diff --git a/man/drfit.Rd b/man/drfit.Rd
index 30f3fd4..ddcf80b 100644
--- a/man/drfit.Rd
+++ b/man/drfit.Rd
@@ -7,7 +7,7 @@
 }
 \usage{
   drfit(data, startlogEC50 = NA, chooseone = TRUE, lognorm = TRUE, logis = FALSE, 
-    linearlogis = FALSE, b0 = 2, f0 = 0)
+    linearlogis = FALSE, linearlogisWrong = NA, b0 = 2, f0 = 0)
 }
 \arguments{
   \item{data}{
@@ -30,8 +30,12 @@
     A boolean defining if cumulative densitiy curves of logistic distributions
     are fitted to the data. Default is FALSE.} 
   \item{linearlogis}{
-    A boolean defining if the linear-logistic function as defined by van Ewijk and Hoekstra
-    1993 is fitted to the data. Default is FALSE.}
+    A boolean defining if the linear-logistic function
+    \code{\link{linearlogisf}} as defined by van Ewijk and Hoekstra 1993 is
+    fitted to the data. Default is FALSE.}
+  \item{linearlogisWrong}{
+    An optional vector containing the names of the substances for which the
+    linearlogis function produces a wrong fit.}
   \item{chooseone}{
     If TRUE (default), the models are tried in the order linearlogis, logis and lognorm,
     and the first model that produces a valid fit is used. Usually this will be the one 
diff --git a/man/drplot.Rd b/man/drplot.Rd
index 418de15..784b65b 100644
--- a/man/drplot.Rd
+++ b/man/drplot.Rd
@@ -7,7 +7,7 @@
 }
 \usage{
   drplot(drresults, data, dtype, alpha, path, fileprefix, overlay,
-    postscript, color, datacolors, fitcolors)
+    postscript, png, bw, colors)
 }
 \arguments{
   \item{drresults}{
@@ -46,23 +46,21 @@
     will all be put into the last graph in this case.
     }
   \item{postscript}{
-    If TRUE, (a) postscript graph(s) will be created. Otherwise, graphics will be
+    If TRUE, (a) postscript graph(s) will be created. Otherwise, and if 
+    the png argument is also FALSE, graphics will be
     displayed with a screen graphics device.
     }
-  \item{color}{
-    If TRUE, a sensible selection of colors will be attempted. If false, everything
-    will be drawn in black
+  \item{png}{
+    If TRUE, (a) png graph(s) will be created. Otherwise, and if the
+    postscript argument is also FALSE, graphics will be displayed with a
+    screen graphics device.
     }
-  \item{datacolors}{
-    This is a vector of colors, defaulting to 1:8, used for plotting the data.
+  \item{bw}{
+    A boolean deciding if the plots will be black and white or not. Default 
+    is TRUE.
     }
-  \item{fitcolors}{
-    Here you can specify a palette for the colors of the dose-response fits. The 
-    default value is "default", which produces the default palette, if the 
-    number of fits to be plotted is 8 or less. Otherwise, rainbow colors 
-    will be plotted. Unless there is more than one fit per substance to be plotted,
-    or the number of fits is larger than 8, the fitcolors will match the
-    datacolors.
+  \item{colors}{
+    This is a vector of colors, defaulting to 1:8, used for plotting the data.
     }
 }
 \value{
@@ -73,9 +71,9 @@
     
 } 
 \note{
-  Turn off the colors if you don't like them and don't want to fiddle with
-  them. Treatment of legends is quite bad. Be sure all devices are closed
-  (e.g. by calling \code{dev.off()}) before calling \code{drplot} again.
+  Treatment of legends is not really well solved. Be sure all devices are
+  closed (e.g. by calling \code{dev.off()}) before calling \code{drplot}
+  again after a failure.
 }
 \examples{
 data(antifoul)
diff --git a/man/linearlogisf.Rd b/man/linearlogisf.Rd
index d49dc9a..1ebe8be 100644
--- a/man/linearlogisf.Rd
+++ b/man/linearlogisf.Rd
@@ -23,9 +23,9 @@
 \value{
   The response at dose x.
 } 
-\examples{
-  
-}
+\references{
+  van Ewijk, P. H. and Hoekstra, J. A. (1993) \emph{Ecotox Environ Safety}
+  \bold{25} 25-32}
 \author{
   Johannes Ranke 
   \email{jranke@uni-bremen.de}