From 0b98c459c30a0629a728acf6b311de035c55fb64 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 18 Jul 2018 15:18:30 +0200 Subject: Correct references to the Rocke and Lorenzato model Rename 'sigma_rl' to 'sigma_twocomp' as the Rocke and Lorenzato model assumes lognormal distribution for large y. Rebuild static documentation. --- docs/reference/mkinfit.html | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'docs/reference/mkinfit.html') diff --git a/docs/reference/mkinfit.html b/docs/reference/mkinfit.html index d0b54098..9e59c7e6 100644 --- a/docs/reference/mkinfit.html +++ b/docs/reference/mkinfit.html @@ -71,7 +71,7 @@ mkin - 0.9.47.1 + 0.9.47.2 @@ -367,11 +367,14 @@ reweight.tol or up to the maximum number of iterations specified by reweight.max.iter. The second reweighting method is called "tc" (two-component error model). - When using this method, the two components of the error model according - to Rocke and Lorenzato (1995) are estimated from the fit and the resulting + When using this method, the two components an error model similar to + Rocke and Lorenzato (1995) are estimated from the fit and the resulting variances are used for weighting the residuals in each iteration until convergence of these components or up to the maximum number of iterations - specified.

+ specified. Note that this method deviates from the model by Rocke and + Lorenzato, as their model implies that the errors follow a lognormal + distribution for large values, not a normal distribution as assumed by this + method.

reweight.tol @@ -427,17 +430,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.1 
-#> R version used for fitting:       3.5.0 
-#> Date of fit:     Wed Jun  6 01:21:36 2018 
-#> Date of summary: Wed Jun  6 01:21:36 2018 
+summary(fit)
#> mkin version used for fitting:    0.9.47.2 
+#> R version used for fitting:       3.5.1 
+#> Date of fit:     Wed Jul 18 15:16:04 2018 
+#> Date of summary: Wed Jul 18 15:16:04 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.143 s
+#> Fitted with method Port using 64 model solutions performed in 0.134 s
 #> 
 #> Weighting: none
 #> 
@@ -506,7 +509,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.927       0.000       0.929 
coef(fit)
#>          parent_0 log_k_parent_sink   log_k_parent_m1     log_k_m1_sink 
+#>       0.863       0.000       0.864 
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