Improve listing of weights in output, update NEWS

2 files changed, 9 insertions, 9 deletions

diff --git a/man/add_err.Rd b/man/add_err.Rd
index a0a5106f..a0068b59 100644
--- a/man/add_err.Rd
+++ b/man/add_err.Rd
@@ -76,11 +76,12 @@ d_SFO_SFO_err <- add_err(d_SFO_SFO, function(x) 10, n = 3, seed = 123456789 )
 names(d_SFO_SFO_err) <- paste("Dataset", 1:3)
 
 # Name the model in the list of models (with only one member in this case)
-# for nicer plotting later on
+# for nicer plotting later on.
 # Be quiet and use the faster Levenberg-Marquardt algorithm, as the datasets
-# are easy and examples are run often
+# are easy and examples are run often. Use only one core not to offend CRAN
+# checks
 f_SFO_SFO <- mmkin(list("SFO-SFO" = m_SFO_SFO), 
-                   d_SFO_SFO_err, 
+                   d_SFO_SFO_err, cores = 1,
                    quiet = TRUE, method.modFit = "Marq")
 
 plot(f_SFO_SFO)
diff --git a/man/mkinfit.Rd b/man/mkinfit.Rd
index e4041755..db2f7fda 100644
--- a/man/mkinfit.Rd
+++ b/man/mkinfit.Rd
@@ -51,9 +51,9 @@ mkinfit(mkinmod, observed,
     name of the observed variable for each data point. The second column must
     contain the times of observation, named "time".  The third column must be
     named "value" and contain the observed values. Optionally, a further column
-    can contain weights for each data point. If it is not named "err", its name
-    must be passed as a further argument named \code{err} which is then passed
-    on to \code{\link{modFit}}.
+    can contain weights for each data point. Its name must be passed as a
+    further argument named \code{err} which is then passed on to
+    \code{\link{modFit}}.
   }
   \item{parms.ini}{
     A named vector of initial values for the parameters, including parameters
@@ -303,9 +303,8 @@ f.irls <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, reweight.method = "obs")
 summary(f.irls)
 f.w.mean <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, weight = "mean")
 summary(f.w.mean)
-f.w.mean.irls <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, weight = "mean",
-                         reweight.method = "obs")
-summary(f.w.mean.irls)
+f.w.value <- mkinfit(SFO_SFO.ff, subset(FOCUS_2006_D, value != 0), err = "value")
+summary(f.w.value)
 }
 
 \dontrun{