diff options
| -rw-r--r-- | DESCRIPTION | 4 | ||||
| -rw-r--r-- | R/drplot.R | 9 | ||||
| -rw-r--r-- | man/drplot.Rd | 12 | ||||
| -rw-r--r-- | tests/pyrithione.Rout.save | 10 |
4 files changed, 23 insertions, 12 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index 01e66ed..2e7af32 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: drfit -Version: 0.05-92 -Date: 2007-11-23 +Version: 0.05-93 +Date: 2008-04-09 Title: Dose-response data evaluation Author: Johannes Ranke <jranke@uni-bremen.de> Maintainer: Johannes Ranke <jranke@uni-bremen.de> @@ -4,6 +4,7 @@ drplot <- function(drresults, data, xlim = c("auto","auto"), ylim = c("auto","auto"), xlab = paste("Decadic Logarithm of the dose in ", unit), ylab = "Normalized response", + axes = TRUE, frame.plot = TRUE, postscript = FALSE, pdf = FALSE, png = FALSE, bw = TRUE, pointsize = 12, @@ -84,7 +85,9 @@ drplot <- function(drresults, data, xlim = xlim, ylim = ylim, xlab = xlab, - ylab = ylab) + ylab = ylab, + axes = axes, + frame.plot = frame.plot) } else { # If overlay plot is not requested, ask before showing multiple plots on the screen if (!postscript && !png && !pdf && length(dsubstances) > 1) { @@ -133,7 +136,9 @@ drplot <- function(drresults, data, xlim = xlim, ylim = ylim, xlab = xlab, - ylab = ylab) + ylab = ylab, + axes = axes, + frame.plot = frame.plot) } if (!overlay) legend(lpos, i, lty = 1, col = color, inset=0.05) tmp$dosefactor <- factor(tmp$dose) # necessary because the old diff --git a/man/drplot.Rd b/man/drplot.Rd index 7924be2..b2c2745 100644 --- a/man/drplot.Rd +++ b/man/drplot.Rd @@ -7,8 +7,8 @@ } \usage{ drplot(drresults, data, dtype, alpha, ctype, path, - fileprefix, overlay, xlim, ylim, xlab, ylab, postscript, pdf, png, bw, - pointsize, colors, ltys, devoff, lpos) + fileprefix, overlay, xlim, ylim, xlab, ylab, axes, frame.plot, postscript, + pdf, png, bw, pointsize, colors, ltys, devoff, lpos) } \arguments{ \item{drresults}{ @@ -63,6 +63,14 @@ \item{ylab}{ The axis title for the y axis. Defaults to "Normalized response". } + \item{axes}{ + Specifies if axes should be drawn. Default is TRUE, as in + \code{\link{plot.default}} + } + \item{frame.plot}{ + Specifies if the plot should be framed. Default is TRUE, as in + \code{\link{plot.default}} + } \item{postscript}{ If TRUE, (a) postscript graph(s) will be created. Otherwise, and if the pdf and png arguments are also FALSE, graphics will be diff --git a/tests/pyrithione.Rout.save b/tests/pyrithione.Rout.save index 4a045a3..b62ddda 100644 --- a/tests/pyrithione.Rout.save +++ b/tests/pyrithione.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.6.2 (2008-02-08) +Copyright (C) 2008 The R Foundation for Statistical Computing ISBN 3-900051-07-0 R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -24,7 +24,6 @@ Loading required package: RODBC Na Pyrithion: Fitting data... Waiting for profiling to be done... -Error in prof$getProfile() : attempt to apply non-function Pyridin: Fitting data... @@ -48,7 +47,6 @@ 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... @@ -74,13 +72,13 @@ 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 +1 Na Pyrithion 20 108 -2.107 2.0 linlogit -0.346 -0.428 -0.2648 microM 0.209 2 Pyridin 19 161 0.592 3.7 inactive NA NA NA microM NA 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 NA NA microM 0.146 +7 PyS 18 80 -0.408 3.0 linlogit 2.756 2.694 2.8229 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 |