- inverse.predict now has a var.s argument instead of the never

  tested ss argument. This is documented in the updated vignette
- loq() now has w.loq and var.loq arguments, and stops with a message
  if neither are specified and the model has weights.
- calplot doesn't stop any more for weighted regression models, but
  only refrains from drawing prediction bands
- Added method = "din" to lod(), now that I actually have it (DIN 32645) and
  was able to see which approximation is used therein.
- removed the demos, as the examples and tests are already partially 
  duplicated
- The vignette is more of a collection of various notes, but should 
  certainly be helpful for the user.
- Version bump to 0.1-xxx



git-svn-id: http://kriemhild.uft.uni-bremen.de/svn/chemCal@16 5fad18fb-23f0-0310-ab10-e59a3bee62b4

1 files changed, 14 insertions, 11 deletions

diff --git a/man/inverse.predict.Rd b/man/inverse.predict.Rd
index 5be0250..925f3e9 100644
--- a/man/inverse.predict.Rd
+++ b/man/inverse.predict.Rd
@@ -5,7 +5,7 @@
 \alias{inverse.predict.default}
 \title{Predict x from y for a linear calibration}
 \usage{inverse.predict(object, newdata, \dots,
-  ws, alpha=0.05, ss = "auto")
+  ws, alpha=0.05, var.s = "auto")
 }
 \arguments{
   \item{object}{
@@ -21,15 +21,17 @@
     future implementations.
   }
   \item{ws}{ 
-    The weight attributed to the sample. The default is to take the 
-    mean of the weights in the model, if there are any.
+    The weight attributed to the sample. This argument is obligatory
+    if \code{object} has weights.
   }
   \item{alpha}{
     The error tolerance level for the confidence interval to be reported.
   }
-  \item{ss}{
-    The estimated standard error of the sample measurements. The 
-    default is to take the residual standard error from the calibration.
+  \item{var.s}{
+    The estimated variance of the sample measurements. The default is to take
+    the residual standard error from the calibration and to adjust it
+    using \code{ws}, if applicable. This means that \code{var.s}
+    overrides \code{ws}.
   }
 }
 \value{
@@ -59,12 +61,13 @@
 \examples{
   data(massart97ex3)
   attach(massart97ex3)
-  yx <- split(y,factor(x))
-  s <- round(sapply(yx,sd),digits=2)
-  w <- round(1/(s^2),digits=3)
+  yx <- split(y, x)
+  ybar <- sapply(yx, mean)
+  s <- round(sapply(yx, sd), digits = 2)
+  w <- round(1 / (s^2), digits = 3)
   weights <- w[factor(x)]
-  m <- lm(y ~ x,w=weights)
+  m <- lm(y ~ x, w = weights)
 
-  inverse.predict(m,15,ws = 1.67)
+  inverse.predict(m, 15, ws = 1.67) # 5.9 +- 2.5
 }
 \keyword{manip}