From dd65f3503e9d091c82aedcf91635fcf40f778bf9 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 14 Sep 2018 06:41:44 +0200 Subject: Static documentation rebuilt by pkgdown Also update test log --- docs/reference/mkinfit.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'docs/reference/mkinfit.html') diff --git a/docs/reference/mkinfit.html b/docs/reference/mkinfit.html index f9c6c117..b1c42168 100644 --- a/docs/reference/mkinfit.html +++ b/docs/reference/mkinfit.html @@ -71,7 +71,7 @@ mkin - 0.9.47.2 + 0.9.47.3 @@ -161,7 +161,7 @@ transform_rates = TRUE, transform_fractions = TRUE, plot = FALSE, quiet = FALSE, err = NULL, - weight = c("none", "std", "mean", "tc"), + weight = c("none", "manual", "std", "mean", "tc"), tc = c(sigma_low = 0.5, rsd_high = 0.07), scaleVar = FALSE, atol = 1e-8, rtol = 1e-10, n.outtimes = 100, @@ -326,7 +326,8 @@ weight

only if err=NULL: how to weight the residuals, one of "none", "std", "mean", see details of modCost, or "tc" for the - two component error model.

+ two component error model. The option "manual" is available for + the case that err!=NULL, but it is not necessary to specify it.

tc @@ -431,17 +432,17 @@

Examples

# Use shorthand notation for parent only degradation
 fit <- mkinfit("FOMC", FOCUS_2006_C, quiet = TRUE)
-summary(fit)
#> mkin version used for fitting:    0.9.47.2 
+summary(fit)
#> mkin version used for fitting:    0.9.47.3 
 #> R version used for fitting:       3.5.1 
-#> Date of fit:     Thu Sep  6 13:35:36 2018 
-#> Date of summary: Thu Sep  6 13:35:36 2018 
+#> Date of fit:     Fri Sep 14 06:39:09 2018 
+#> Date of summary: Fri Sep 14 06:39:09 2018 
 #> 
 #> Equations:
 #> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 #> 
 #> Model predictions using solution type analytical 
 #> 
-#> Fitted with method Port using 64 model solutions performed in 0.144 s
+#> Fitted with method Port using 64 model solutions performed in 0.157 s
 #> 
 #> Weighting: none
 #> 
@@ -510,7 +511,7 @@
   m1 = mkinsub("SFO"))
#> Successfully compiled differential equation model from auto-generated C code.
# Fit the model to the FOCUS example dataset D using defaults
 print(system.time(fit <- mkinfit(SFO_SFO, FOCUS_2006_D,
                            solution_type = "eigen", quiet = TRUE)))
#>        User      System verstrichen 
-#>       0.919       0.000       0.920 
coef(fit)
#>          parent_0 log_k_parent_sink   log_k_parent_m1     log_k_m1_sink 
+#>       0.892       0.000       0.892 
coef(fit)
#>          parent_0 log_k_parent_sink   log_k_parent_m1     log_k_m1_sink 
 #>          99.59848          -3.03822          -2.98030          -5.24750 
endpoints(fit)
#> $ff
 #> parent_sink   parent_m1     m1_sink 
 #>    0.485524    0.514476    1.000000 
-- 
cgit v1.2.1