From 798195d367111e592e5247309b90fac29ed7ddfd Mon Sep 17 00:00:00 2001
From: Johannes Ranke
Date: Wed, 3 Jul 2019 16:45:09 +0200
Subject: Update DESCRIPTION, improve NEWS
Static documentation rebuilt by pkgdown
---
docs/reference/mkinfit.html | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
(limited to 'docs/reference/mkinfit.html')
diff --git a/docs/reference/mkinfit.html b/docs/reference/mkinfit.html
index 700b6805..3e20fc5d 100644
--- a/docs/reference/mkinfit.html
+++ b/docs/reference/mkinfit.html
@@ -334,7 +334,7 @@ Per default, parameters in the kinetic models are internally transformed in
The algorithm "direct" will directly minimize the negative
log-likelihood.
The algorithm "twostep" will minimize the negative log-likelihood
- after an initial unweighted leas squares optimisation step.
+ after an initial unweighted least squares optimisation step.
The algorithm "threestep" starts with unweighted least squares,
then optimizes only the error model using the degradation model
parameters found, and then minimizes the negative log-likelihood
@@ -399,15 +399,15 @@ Per default, parameters in the kinetic models are internally transformed in
fit <- mkinfit("FOMC", FOCUS_2006_C, quiet = TRUE)
summary(fit)
#> mkin version used for fitting: 0.9.49.5
#> R version used for fitting: 3.6.0
-#> Date of fit: Wed Jun 5 15:08:20 2019
-#> Date of summary: Wed Jun 5 15:08:20 2019
+#> Date of fit: Wed Jul 3 16:36:58 2019
+#> Date of summary: Wed Jul 3 16:36:58 2019
#>
#> Equations:
#> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
#>
#> Model predictions using solution type analytical
#>
-#> Fitted using 222 model solutions performed in 0.469 s
+#> Fitted using 222 model solutions performed in 0.46 s
#>
#> Error model: Constant variance
#>
@@ -481,7 +481,7 @@ Per default, parameters in the kinetic models are internally transformed in
m1 = mkinsub(
"SFO"))
#> Successfully compiled differential equation model from auto-generated C code.
#> Warning: Observations with value of zero were removed from the data
#> User System verstrichen
-#> 1.579 0.000 1.581
#> NULL
#> $ff
+#> 1.497 0.000 1.499
#> NULL
#> $ff
#> parent_sink parent_m1 m1_sink
#> 0.485524 0.514476 1.000000
#>
@@ -553,7 +553,7 @@ Per default, parameters in the kinetic models are internally transformed in
#> Sum of squared residuals at call 126: 371.2134
#> Sum of squared residuals at call 135: 371.2134
#> Negative log-likelihood at call 145: 97.22429
#> Optimisation successfully terminated.
#> User System verstrichen
-#> 1.159 0.000 1.160
#> NULL
#> $ff
+#> 1.079 0.000 1.079
#> NULL
#> $ff
#> parent_sink parent_m1 m1_sink
#> 0.485524 0.514476 1.000000
#>
@@ -585,8 +585,8 @@ Per default, parameters in the kinetic models are internally transformed in
SFO_SFO.ff <- mkinmod(
parent = mkinsub(
"SFO",
"m1"),
m1 = mkinsub(
"SFO"),
use_of_ff = "max")
#> Successfully compiled differential equation model from auto-generated C code.
f.noweight <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, quiet = TRUE)
#> Warning: Observations with value of zero were removed from the data
#> mkin version used for fitting: 0.9.49.5
#> R version used for fitting: 3.6.0
-#> Date of fit: Wed Jun 5 15:08:36 2019
-#> Date of summary: Wed Jun 5 15:08:36 2019
+#> Date of fit: Wed Jul 3 16:37:14 2019
+#> Date of summary: Wed Jul 3 16:37:14 2019
#>
#> Equations:
#> d_parent/dt = - k_parent * parent
@@ -594,7 +594,7 @@ Per default, parameters in the kinetic models are internally transformed in
#>
#> Model predictions using solution type deSolve
#>
-#> Fitted using 421 model solutions performed in 1.181 s
+#> Fitted using 421 model solutions performed in 1.107 s
#>
#> Error model: Constant variance
#>
@@ -704,8 +704,8 @@ Per default, parameters in the kinetic models are internally transformed in
#> 120 m1 25.15 28.78984 -3.640e+00
#> 120 m1 33.31 28.78984 4.520e+00
f.obs <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, error_model = "obs", quiet = TRUE)
#> Warning: Observations with value of zero were removed from the data
#> mkin version used for fitting: 0.9.49.5
#> R version used for fitting: 3.6.0
-#> Date of fit: Wed Jun 5 15:08:39 2019
-#> Date of summary: Wed Jun 5 15:08:39 2019
+#> Date of fit: Wed Jul 3 16:37:17 2019
+#> Date of summary: Wed Jul 3 16:37:17 2019
#>
#> Equations:
#> d_parent/dt = - k_parent * parent
@@ -713,7 +713,7 @@ Per default, parameters in the kinetic models are internally transformed in
#>
#> Model predictions using solution type deSolve
#>
-#> Fitted using 979 model solutions performed in 2.672 s
+#> Fitted using 979 model solutions performed in 2.612 s
#>
#> Error model: Variance unique to each observed variable
#>
@@ -836,8 +836,8 @@ Per default, parameters in the kinetic models are internally transformed in
#> 120 m1 25.15 28.80429 -3.654e+00
#> 120 m1 33.31 28.80429 4.506e+00
f.tc <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, error_model = "tc", quiet = TRUE)
#> Warning: Observations with value of zero were removed from the data
#> mkin version used for fitting: 0.9.49.5
#> R version used for fitting: 3.6.0
-#> Date of fit: Wed Jun 5 15:08:50 2019
-#> Date of summary: Wed Jun 5 15:08:50 2019
+#> Date of fit: Wed Jul 3 16:37:26 2019
+#> Date of summary: Wed Jul 3 16:37:26 2019
#>
#> Equations:
#> d_parent/dt = - k_parent * parent
@@ -845,7 +845,7 @@ Per default, parameters in the kinetic models are internally transformed in
#>
#> Model predictions using solution type deSolve
#>
-#> Fitted using 2289 model solutions performed in 10.959 s
+#> Fitted using 2289 model solutions performed in 9.522 s
#>
#> Error model: Two-component variance function
#>
--
cgit v1.2.1