From ef7ccf68e086bac3e75858bd4b97e3a2c6872aa1 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 28 Jun 2016 00:44:48 +0200 Subject: Avoid multicore fits in vignettes for passing CRAN checks Also a small fix to the FOCUS Z vignette, and an update of the static documentation generated by staticdocs. --- inst/web/mkinfit.html | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'inst/web/mkinfit.html') diff --git a/inst/web/mkinfit.html b/inst/web/mkinfit.html index 07987fc2..dd7f1831 100644 --- a/inst/web/mkinfit.html +++ b/inst/web/mkinfit.html @@ -2,7 +2,7 @@ -mkinfit. mkin 0.9.42 +mkinfit. mkin 0.9.43
- mkin 0.9.42 + mkin 0.9.43
  • Index
    • @@ -75,9 +75,9 @@ 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 err which is then passed - on to modFit. + can contain weights for each data point. Its name must be passed as a + further argument named err which is then passed on to + modFit.
    parms.ini
    @@ -323,17 +323,17 @@ fit <- mkinfit("FOMC", FOCUS_2006_C, quiet = TRUE) summary(fit)
-
mkin version: 0.9.42 -R version: 3.2.4 -Date of fit: Thu Mar 24 08:29:01 2016 -Date of summary: Thu Mar 24 08:29:01 2016 +
mkin version: 0.9.43 +R version: 3.3.1 +Date of fit: Tue Jun 28 01:17:26 2016 +Date of summary: Tue Jun 28 01:17:26 2016 Equations: d_parent = - (alpha/beta) * 1/((time/beta) + 1) * parent Model predictions using solution type analytical -Fitted with method Port using 64 model solutions performed in 0.195 s +Fitted with method Port using 64 model solutions performed in 0.457 s Weighting: none @@ -409,7 +409,7 @@ print(system.time(fit <- mkinfit(SFO_SFO, FOCUS_2006_D, solution_type = "eigen", quiet = TRUE)))
user system elapsed - 1.276 1.196 0.935 + 2.868 2.284 2.301
coef(fit)
@@ -473,9 +473,8 @@ m1 131.760712 437.69961 # 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) # ## End(Not run) ## Not run: -- cgit v1.2.1