- Added an error message for drplot

- Recalculated the XY data, so the response data is now calculated
  based on growth rates instead of simple frond numbers
- Reduced the number of columns in the IM1xVibrio data



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

6 files changed, 11 insertions, 5 deletions

diff --git a/DESCRIPTION b/DESCRIPTION
index c744e02..7d0960b 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: drfit
-Version: 0.04-58
-Date: 2006-03-16
+Version: 0.04-59
+Date: 2006-03-28
 Title: Dose-response data evaluation
 Author: Johannes Ranke <jranke@uni-bremen.de>
 Maintainer: Johannes Ranke <jranke@uni-bremen.de>
diff --git a/R/drfit.R b/R/drfit.R
index 4d93a6d..f3262bd 100644
--- a/R/drfit.R
+++ b/R/drfit.R
@@ -330,6 +330,11 @@ drplot <- function(drresults, data,
                 cat("will not be displayed\n")
                 ctype = "none"
             }
+        } else {
+            if (ctype != "none") {
+                stop("There are no controls in the dataset, and therefore ",
+                    "their scatter cannot be displayed\n")
+            }
         }
         lld <- log10(min(nonzerodata$dose))
         lhd <- log10(max(nonzerodata$dose))
diff --git a/data/IM1xVibrio.rda b/data/IM1xVibrio.rda
index d49d2c6..daef0b1 100644
--- a/data/IM1xVibrio.rda
+++ b/data/IM1xVibrio.rda
diff --git a/data/XY.rda b/data/XY.rda
index 158285a..4b0d426 100644
--- a/data/XY.rda
+++ b/data/XY.rda
diff --git a/man/IM1xVibrio.Rd b/man/IM1xVibrio.Rd
index 468fb67..79936d6 100644
--- a/man/IM1xVibrio.Rd
+++ b/man/IM1xVibrio.Rd
@@ -13,8 +13,8 @@
 \usage{data(IM1xVibrio)}
 \format{
   A dataframe containing the data as required for the \code{\link{drfit}} function. Additional
-  columns contain the name of the persons that generated the data
-  (\code{experimentator}) and a field specifying if the data is regarded valid
+  columns contain the species tested (luminescent bacteria Vibrio fischeri, \code{organism}),
+  and a field specifying if the data is regarded valid
   (\code{ok}).
 }
 \source{
diff --git a/man/XY.Rd b/man/XY.Rd
index ae28e99..6e78266 100644
--- a/man/XY.Rd
+++ b/man/XY.Rd
@@ -3,7 +3,8 @@
 \alias{XY}
 \title{Dose-Response data for two substances X and Y}
 \description{
-  This is just a sample data set for two substances named X and Y.
+  This is just a sample Lemna growth rate data set for two substances 
+  arbitrarily named X and Y.
 }
 \usage{data(antifoul)}
 \format{