aboutsummaryrefslogtreecommitdiff
path: root/docs/dev/articles
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2020-10-08 09:31:35 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2020-10-08 09:31:35 +0200
commitbc3825ae2d12c18ea3d3caf17eb23c93fef180b8 (patch)
tree112e70a29db2fb35dd624af20f4d400c579b0283 /docs/dev/articles
parentc7635af214729d2dc15dd8fbee2ebe6bc64493a4 (diff)
Fix issues for release
Diffstat (limited to 'docs/dev/articles')
-rw-r--r--docs/dev/articles/FOCUS_D.html31
-rw-r--r--docs/dev/articles/FOCUS_L.html222
-rw-r--r--docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-15-1.pngbin38623 -> 38622 bytes
-rw-r--r--docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.pngbin23884 -> 23881 bytes
-rw-r--r--docs/dev/articles/mkin.html10
-rw-r--r--docs/dev/articles/mkin_files/figure-html/unnamed-chunk-2-1.pngbin116136 -> 116140 bytes
-rw-r--r--docs/dev/articles/twa.html4
-rw-r--r--docs/dev/articles/web_only/FOCUS_Z.html62
-rw-r--r--docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.pngbin133239 -> 133233 bytes
-rw-r--r--docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.pngbin132494 -> 132503 bytes
-rw-r--r--docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.pngbin99564 -> 99562 bytes
-rw-r--r--docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.pngbin22623 -> 22624 bytes
-rw-r--r--docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.pngbin133000 -> 133001 bytes
-rw-r--r--docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.pngbin110758 -> 110760 bytes
-rw-r--r--docs/dev/articles/web_only/NAFTA_examples.html430
-rw-r--r--docs/dev/articles/web_only/benchmarks.html46
-rw-r--r--docs/dev/articles/web_only/compiled_models.html18
17 files changed, 417 insertions, 406 deletions
diff --git a/docs/dev/articles/FOCUS_D.html b/docs/dev/articles/FOCUS_D.html
index 7d5dd732..02701431 100644
--- a/docs/dev/articles/FOCUS_D.html
+++ b/docs/dev/articles/FOCUS_D.html
@@ -101,7 +101,7 @@
<h1 data-toc-skip>Example evaluation of FOCUS Example Dataset D</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2020-05-27</h4>
+ <h4 class="date">2020-10-08</h4>
<small class="dont-index">Source: <a href="http://github.com/jranke/mkin/blob/master/vignettes/FOCUS_D.rmd"><code>vignettes/FOCUS_D.rmd</code></a></small>
<div class="hidden name"><code>FOCUS_D.rmd</code></div>
@@ -171,18 +171,20 @@
<div class="sourceCode" id="cb7"><html><body><pre class="r"><span class="no">fit</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../reference/mkinfit.html">mkinfit</a></span>(<span class="no">SFO_SFO</span>, <span class="no">FOCUS_2006_D</span>, <span class="kw">quiet</span> <span class="kw">=</span> <span class="fl">TRUE</span>)</pre></body></html></div>
<pre><code>## Warning in mkinfit(SFO_SFO, FOCUS_2006_D, quiet = TRUE): Observations with value
## of zero were removed from the data</code></pre>
+<pre><code>## Warning in mkinfit(SFO_SFO, FOCUS_2006_D, quiet = TRUE): Shapiro-Wilk test for
+## standardized residuals: p = 0.0165</code></pre>
<p>A plot of the fit including a residual plot for both observed variables is obtained using the <code>plot_sep</code> method for <code>mkinfit</code> objects, which shows separate graphs for all compounds and their residuals.</p>
-<div class="sourceCode" id="cb9"><html><body><pre class="r"><span class="fu"><a href="../reference/plot.mkinfit.html">plot_sep</a></span>(<span class="no">fit</span>, <span class="kw">lpos</span> <span class="kw">=</span> <span class="fu"><a href="https://rdrr.io/r/base/c.html">c</a></span>(<span class="st">"topright"</span>, <span class="st">"bottomright"</span>))</pre></body></html></div>
+<div class="sourceCode" id="cb10"><html><body><pre class="r"><span class="fu"><a href="../reference/plot.mkinfit.html">plot_sep</a></span>(<span class="no">fit</span>, <span class="kw">lpos</span> <span class="kw">=</span> <span class="fu"><a href="https://rdrr.io/r/base/c.html">c</a></span>(<span class="st">"topright"</span>, <span class="st">"bottomright"</span>))</pre></body></html></div>
<p><img src="FOCUS_D_files/figure-html/plot-1.png" width="768"></p>
<p>Confidence intervals for the parameter estimates are obtained using the <code>mkinparplot</code> function.</p>
-<div class="sourceCode" id="cb10"><html><body><pre class="r"><span class="fu"><a href="../reference/mkinparplot.html">mkinparplot</a></span>(<span class="no">fit</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb11"><html><body><pre class="r"><span class="fu"><a href="../reference/mkinparplot.html">mkinparplot</a></span>(<span class="no">fit</span>)</pre></body></html></div>
<p><img src="FOCUS_D_files/figure-html/plot_2-1.png" width="768"></p>
<p>A comprehensive report of the results is obtained using the <code>summary</code> method for <code>mkinfit</code> objects.</p>
-<div class="sourceCode" id="cb11"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">fit</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb12"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">fit</span>)</pre></body></html></div>
<pre><code>## mkin version used for fitting: 0.9.50.3
-## R version used for fitting: 4.0.0
-## Date of fit: Wed May 27 07:51:36 2020
-## Date of summary: Wed May 27 07:51:37 2020
+## R version used for fitting: 4.0.2
+## Date of fit: Thu Oct 8 09:14:03 2020
+## Date of summary: Thu Oct 8 09:14:03 2020
##
## Equations:
## d_parent/dt = - k_parent * parent
@@ -190,7 +192,7 @@
##
## Model predictions using solution type analytical
##
-## Fitted using 421 model solutions performed in 0.173 s
+## Fitted using 421 model solutions performed in 0.171 s
##
## Error model: Constant variance
##
@@ -214,6 +216,11 @@
## value type
## m1_0 0 state
##
+##
+## Warning(s):
+## Observations with value of zero were removed from the data
+## Shapiro-Wilk test for standardized residuals: p = 0.0165
+##
## Results:
##
## AIC BIC logLik
@@ -229,11 +236,11 @@
##
## Parameter correlation:
## parent_0 log_k_parent log_k_m1 f_parent_ilr_1 sigma
-## parent_0 1.000e+00 5.174e-01 -1.688e-01 -5.471e-01 -3.190e-07
+## parent_0 1.000e+00 5.174e-01 -1.688e-01 -5.471e-01 -3.214e-07
## log_k_parent 5.174e-01 1.000e+00 -3.263e-01 -5.426e-01 3.168e-07
-## log_k_m1 -1.688e-01 -3.263e-01 1.000e+00 7.478e-01 -1.406e-07
-## f_parent_ilr_1 -5.471e-01 -5.426e-01 7.478e-01 1.000e+00 -1.587e-10
-## sigma -3.190e-07 3.168e-07 -1.406e-07 -1.587e-10 1.000e+00
+## log_k_m1 -1.688e-01 -3.263e-01 1.000e+00 7.478e-01 -1.410e-07
+## f_parent_ilr_1 -5.471e-01 -5.426e-01 7.478e-01 1.000e+00 5.093e-10
+## sigma -3.214e-07 3.168e-07 -1.410e-07 5.093e-10 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
diff --git a/docs/dev/articles/FOCUS_L.html b/docs/dev/articles/FOCUS_L.html
index d69815ab..ffc0bebf 100644
--- a/docs/dev/articles/FOCUS_L.html
+++ b/docs/dev/articles/FOCUS_L.html
@@ -101,7 +101,7 @@
<h1 data-toc-skip>Example evaluation of FOCUS Laboratory Data L1 to L3</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2020-05-27</h4>
+ <h4 class="date">2020-10-08</h4>
<small class="dont-index">Source: <a href="http://github.com/jranke/mkin/blob/master/vignettes/FOCUS_L.rmd"><code>vignettes/FOCUS_L.rmd</code></a></small>
<div class="hidden name"><code>FOCUS_L.rmd</code></div>
@@ -126,30 +126,30 @@
<div class="sourceCode" id="cb2"><html><body><pre class="r"><span class="no">m.L1.SFO</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../reference/mkinfit.html">mkinfit</a></span>(<span class="st">"SFO"</span>, <span class="no">FOCUS_2006_L1_mkin</span>, <span class="kw">quiet</span> <span class="kw">=</span> <span class="fl">TRUE</span>)
<span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">m.L1.SFO</span>)</pre></body></html></div>
<pre><code>## mkin version used for fitting: 0.9.50.3
-## R version used for fitting: 4.0.0
-## Date of fit: Wed May 27 07:51:39 2020
-## Date of summary: Wed May 27 07:51:39 2020
+## R version used for fitting: 4.0.2
+## Date of fit: Thu Oct 8 09:14:05 2020
+## Date of summary: Thu Oct 8 09:14:05 2020
##
## Equations:
-## d_parent/dt = - k_parent_sink * parent
+## d_parent/dt = - k_parent * parent
##
## Model predictions using solution type analytical
##
-## Fitted using 133 model solutions performed in 0.031 s
+## Fitted using 133 model solutions performed in 0.032 s
##
## Error model: Constant variance
##
## Error model algorithm: OLS
##
## Starting values for parameters to be optimised:
-## value type
-## parent_0 89.85 state
-## k_parent_sink 0.10 deparm
+## value type
+## parent_0 89.85 state
+## k_parent 0.10 deparm
##
## Starting values for the transformed parameters actually optimised:
-## value lower upper
-## parent_0 89.850000 -Inf Inf
-## log_k_parent_sink -2.302585 -Inf Inf
+## value lower upper
+## parent_0 89.850000 -Inf Inf
+## log_k_parent -2.302585 -Inf Inf
##
## Fixed parameter values:
## None
@@ -160,25 +160,25 @@
## 93.88778 96.5589 -43.94389
##
## Optimised, transformed parameters with symmetric confidence intervals:
-## Estimate Std. Error Lower Upper
-## parent_0 92.470 1.28200 89.740 95.200
-## log_k_parent_sink -2.347 0.03763 -2.428 -2.267
-## sigma 2.780 0.46330 1.792 3.767
+## Estimate Std. Error Lower Upper
+## parent_0 92.470 1.28200 89.740 95.200
+## log_k_parent -2.347 0.03763 -2.428 -2.267
+## sigma 2.780 0.46330 1.792 3.767
##
## Parameter correlation:
-## parent_0 log_k_parent_sink sigma
-## parent_0 1.000e+00 6.186e-01 -1.712e-09
-## log_k_parent_sink 6.186e-01 1.000e+00 -3.237e-09
-## sigma -1.712e-09 -3.237e-09 1.000e+00
+## parent_0 log_k_parent sigma
+## parent_0 1.000e+00 6.186e-01 -1.516e-09
+## log_k_parent 6.186e-01 1.000e+00 -3.124e-09
+## sigma -1.516e-09 -3.124e-09 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
## t-test (unrealistically) based on the assumption of normal distribution
## for estimators of untransformed parameters.
-## Estimate t value Pr(&gt;t) Lower Upper
-## parent_0 92.47000 72.13 8.824e-21 89.74000 95.2000
-## k_parent_sink 0.09561 26.57 2.487e-14 0.08824 0.1036
-## sigma 2.78000 6.00 1.216e-05 1.79200 3.7670
+## Estimate t value Pr(&gt;t) Lower Upper
+## parent_0 92.47000 72.13 8.824e-21 89.74000 95.2000
+## k_parent 0.09561 26.57 2.487e-14 0.08824 0.1036
+## sigma 2.78000 6.00 1.216e-05 1.79200 3.7670
##
## FOCUS Chi2 error levels in percent:
## err.min n.optim df
@@ -227,21 +227,16 @@
<pre><code>## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
## doubtful</code></pre>
<pre><code>## mkin version used for fitting: 0.9.50.3
-## R version used for fitting: 4.0.0
-## Date of fit: Wed May 27 07:51:39 2020
-## Date of summary: Wed May 27 07:51:39 2020
-##
-##
-## Warning: Optimisation did not converge:
-## false convergence (8)
-##
+## R version used for fitting: 4.0.2
+## Date of fit: Thu Oct 8 09:14:05 2020
+## Date of summary: Thu Oct 8 09:14:05 2020
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted using 899 model solutions performed in 0.204 s
+## Fitted using 380 model solutions performed in 0.088 s
##
## Error model: Constant variance
##
@@ -262,34 +257,39 @@
## Fixed parameter values:
## None
##
+##
+## Warning(s):
+## Optimisation did not converge:
+## false convergence (8)
+##
## Results:
##
## AIC BIC logLik
-## 95.88835 99.44984 -43.94418
+## 95.88778 99.44927 -43.94389
##
## Optimised, transformed parameters with symmetric confidence intervals:
## Estimate Std. Error Lower Upper
-## parent_0 92.47 1.2800 89.730 95.220
-## log_alpha 10.58 NaN NaN NaN
-## log_beta 12.93 NaN NaN NaN
-## sigma 2.78 0.4507 1.813 3.747
+## parent_0 92.47 1.2820 89.720 95.220
+## log_alpha 16.92 NaN NaN NaN
+## log_beta 19.26 NaN NaN NaN
+## sigma 2.78 0.4501 1.814 3.745
##
## Parameter correlation:
-## parent_0 log_alpha log_beta sigma
-## parent_0 1.00000 NaN NaN 0.01452
-## log_alpha NaN 1 NaN NaN
-## log_beta NaN NaN 1 NaN
-## sigma 0.01452 NaN NaN 1.00000
+## parent_0 log_alpha log_beta sigma
+## parent_0 1.000000 NaN NaN 0.002218
+## log_alpha NaN 1 NaN NaN
+## log_beta NaN NaN 1 NaN
+## sigma 0.002218 NaN NaN 1.000000
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
## t-test (unrealistically) based on the assumption of normal distribution
## for estimators of untransformed parameters.
-## Estimate t value Pr(&gt;t) Lower Upper
-## parent_0 92.47 72.13000 1.052e-19 89.730 95.220
-## alpha 39440.00 0.02397 4.906e-01 NA NA
-## beta 412500.00 0.02397 4.906e-01 NA NA
-## sigma 2.78 6.00000 1.628e-05 1.813 3.747
+## Estimate t value Pr(&gt;t) Lower Upper
+## parent_0 9.247e+01 NA NA 89.720 95.220
+## alpha 2.223e+07 NA NA NA NA
+## beta 2.325e+08 NA NA NA NA
+## sigma 2.780e+00 NA NA 1.814 3.745
##
## FOCUS Chi2 error levels in percent:
## err.min n.optim df
@@ -297,8 +297,8 @@
## parent 3.619 3 6
##
## Estimated disappearance times:
-## DT50 DT90 DT50back
-## parent 7.249 24.08 7.249</code></pre>
+## DT50 DT90 DT50back
+## parent 7.25 24.08 7.25</code></pre>
<p>We get a warning that the default optimisation algorithm <code>Port</code> did not converge, which is an indication that the model is overparameterised, <em>i.e.</em> contains too many parameters that are ill-defined as a consequence.</p>
<p>And in fact, due to the higher number of parameters, and the lower number of degrees of freedom of the fit, the <span class="math inline">\(\chi^2\)</span> error level is actually higher for the FOMC model (3.6%) than for the SFO model (3.4%). Additionally, the parameters <code>log_alpha</code> and <code>log_beta</code> internally fitted in the model have excessive confidence intervals, that span more than 25 orders of magnitude (!) when backtransformed to the scale of <code>alpha</code> and <code>beta</code>. Also, the t-test for significant difference from zero does not indicate such a significant difference, with p-values greater than 0.1, and finally, the parameter correlation of <code>log_alpha</code> and <code>log_beta</code> is 1.000, clearly indicating that the model is overparameterised.</p>
<p>The <span class="math inline">\(\chi^2\)</span> error levels reported in Appendix 3 and Appendix 7 to the FOCUS kinetics report are rounded to integer percentages and partly deviate by one percentage point from the results calculated by mkin. The reason for this is not known. However, mkin gives the same <span class="math inline">\(\chi^2\)</span> error levels as the kinfit package and the calculation routines of the kinfit package have been extensively compared to the results obtained by the KinGUI software, as documented in the kinfit package vignette. KinGUI was the first widely used standard package in this field. Also, the calculation of <span class="math inline">\(\chi^2\)</span> error levels was compared with KinGUII, CAKE and DegKin manager in a project sponsored by the German Umweltbundesamt <span class="citation">(Ranke 2014)</span>.</p>
@@ -335,16 +335,16 @@
<p><img src="FOCUS_L_files/figure-html/unnamed-chunk-9-1.png" width="672"></p>
<div class="sourceCode" id="cb17"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">m.L2.FOMC</span>, <span class="kw">data</span> <span class="kw">=</span> <span class="fl">FALSE</span>)</pre></body></html></div>
<pre><code>## mkin version used for fitting: 0.9.50.3
-## R version used for fitting: 4.0.0
-## Date of fit: Wed May 27 07:51:40 2020
-## Date of summary: Wed May 27 07:51:40 2020
+## R version used for fitting: 4.0.2
+## Date of fit: Thu Oct 8 09:14:06 2020
+## Date of summary: Thu Oct 8 09:14:06 2020
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted using 239 model solutions performed in 0.048 s
+## Fitted using 239 model solutions performed in 0.049 s
##
## Error model: Constant variance
##
@@ -379,10 +379,10 @@
##
## Parameter correlation:
## parent_0 log_alpha log_beta sigma
-## parent_0 1.000e+00 -1.151e-01 -2.085e-01 -7.637e-09
+## parent_0 1.000e+00 -1.151e-01 -2.085e-01 -7.436e-09
## log_alpha -1.151e-01 1.000e+00 9.741e-01 -1.617e-07
-## log_beta -2.085e-01 9.741e-01 1.000e+00 -1.387e-07
-## sigma -7.637e-09 -1.617e-07 -1.387e-07 1.000e+00
+## log_beta -2.085e-01 9.741e-01 1.000e+00 -1.386e-07
+## sigma -7.436e-09 -1.617e-07 -1.386e-07 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
@@ -414,9 +414,9 @@
<p><img src="FOCUS_L_files/figure-html/unnamed-chunk-10-1.png" width="672"></p>
<div class="sourceCode" id="cb20"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">m.L2.DFOP</span>, <span class="kw">data</span> <span class="kw">=</span> <span class="fl">FALSE</span>)</pre></body></html></div>
<pre><code>## mkin version used for fitting: 0.9.50.3
-## R version used for fitting: 4.0.0
-## Date of fit: Wed May 27 07:51:40 2020
-## Date of summary: Wed May 27 07:51:40 2020
+## R version used for fitting: 4.0.2
+## Date of fit: Thu Oct 8 09:14:06 2020
+## Date of summary: Thu Oct 8 09:14:06 2020
##
## Equations:
## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -425,7 +425,7 @@
##
## Model predictions using solution type analytical
##
-## Fitted using 572 model solutions performed in 0.131 s
+## Fitted using 572 model solutions performed in 0.136 s
##
## Error model: Constant variance
##
@@ -456,18 +456,18 @@
## Optimised, transformed parameters with symmetric confidence intervals:
## Estimate Std. Error Lower Upper
## parent_0 93.9500 9.998e-01 91.5900 96.3100
-## log_k1 3.1370 2.376e+03 -5616.0000 5622.0000
+## log_k1 3.1370 2.376e+03 -5615.0000 5622.0000
## log_k2 -1.0880 6.285e-02 -1.2370 -0.9394
## g_ilr -0.2821 7.033e-02 -0.4484 -0.1158
## sigma 1.4140 2.886e-01 0.7314 2.0960
##
## Parameter correlation:
## parent_0 log_k1 log_k2 g_ilr sigma
-## parent_0 1.000e+00 5.155e-07 2.371e-09 2.665e-01 -6.849e-09
-## log_k1 5.155e-07 1.000e+00 8.434e-05 -1.659e-04 -7.791e-06
-## log_k2 2.371e-09 8.434e-05 1.000e+00 -7.903e-01 -1.262e-08
-## g_ilr 2.665e-01 -1.659e-04 -7.903e-01 1.000e+00 3.241e-08
-## sigma -6.849e-09 -7.791e-06 -1.262e-08 3.241e-08 1.000e+00
+## parent_0 1.000e+00 5.157e-07 2.376e-09 2.665e-01 -6.837e-09
+## log_k1 5.157e-07 1.000e+00 8.434e-05 -1.659e-04 -7.786e-06
+## log_k2 2.376e-09 8.434e-05 1.000e+00 -7.903e-01 -1.263e-08
+## g_ilr 2.665e-01 -1.659e-04 -7.903e-01 1.000e+00 3.248e-08
+## sigma -6.837e-09 -7.786e-06 -1.263e-08 3.248e-08 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
@@ -486,8 +486,8 @@
## parent 2.53 4 2
##
## Estimated disappearance times:
-## DT50 DT90 DT50_k1 DT50_k2
-## parent 0.5335 5.311 0.03009 2.058</code></pre>
+## DT50 DT90 DT50back DT50_k1 DT50_k2
+## parent 0.5335 5.311 1.599 0.03009 2.058</code></pre>
<p>Here, the DFOP model is clearly the best-fit model for dataset L2 based on the chi^2 error level criterion. However, the failure to calculate the covariance matrix indicates that the parameter estimates correlate excessively. Therefore, the FOMC model may be preferred for this dataset.</p>
</div>
</div>
@@ -517,9 +517,9 @@
<p>We can extract the summary and plot for <em>e.g.</em> the DFOP fit, using square brackets for indexing which will result in the use of the summary and plot functions working on mkinfit objects.</p>
<div class="sourceCode" id="cb24"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">mm.L3</span><span class="kw">[[</span><span class="st">"DFOP"</span>, <span class="fl">1</span>]])</pre></body></html></div>
<pre><code>## mkin version used for fitting: 0.9.50.3
-## R version used for fitting: 4.0.0
-## Date of fit: Wed May 27 07:51:41 2020
-## Date of summary: Wed May 27 07:51:41 2020
+## R version used for fitting: 4.0.2
+## Date of fit: Thu Oct 8 09:14:07 2020
+## Date of summary: Thu Oct 8 09:14:07 2020
##
## Equations:
## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -528,7 +528,7 @@
##
## Model predictions using solution type analytical
##
-## Fitted using 373 model solutions performed in 0.079 s
+## Fitted using 373 model solutions performed in 0.086 s
##
## Error model: Constant variance
##
@@ -566,11 +566,11 @@
##
## Parameter correlation:
## parent_0 log_k1 log_k2 g_ilr sigma
-## parent_0 1.000e+00 1.732e-01 2.282e-02 4.009e-01 -6.872e-07
-## log_k1 1.732e-01 1.000e+00 4.945e-01 -5.809e-01 3.200e-07
-## log_k2 2.282e-02 4.945e-01 1.000e+00 -6.812e-01 7.673e-07
-## g_ilr 4.009e-01 -5.809e-01 -6.812e-01 1.000e+00 -8.731e-07
-## sigma -6.872e-07 3.200e-07 7.673e-07 -8.731e-07 1.000e+00
+## parent_0 1.000e+00 1.732e-01 2.282e-02 4.009e-01 -6.868e-07
+## log_k1 1.732e-01 1.000e+00 4.945e-01 -5.809e-01 3.175e-07
+## log_k2 2.282e-02 4.945e-01 1.000e+00 -6.812e-01 7.631e-07
+## g_ilr 4.009e-01 -5.809e-01 -6.812e-01 1.000e+00 -8.694e-07
+## sigma -6.868e-07 3.175e-07 7.631e-07 -8.694e-07 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
@@ -589,8 +589,8 @@
## parent 2.225 4 4
##
## Estimated disappearance times:
-## DT50 DT90 DT50_k1 DT50_k2
-## parent 7.464 123 1.343 50.37
+## DT50 DT90 DT50back DT50_k1 DT50_k2
+## parent 7.464 123 37.03 1.343 50.37
##
## Data:
## time variable observed predicted residual
@@ -626,30 +626,30 @@
<p>The <span class="math inline">\(\chi^2\)</span> error level of 3.3% as well as the plot suggest that the SFO model fits very well. The error level at which the <span class="math inline">\(\chi^2\)</span> test passes is slightly lower for the FOMC model. However, the difference appears negligible.</p>
<div class="sourceCode" id="cb29"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">mm.L4</span><span class="kw">[[</span><span class="st">"SFO"</span>, <span class="fl">1</span>]], <span class="kw">data</span> <span class="kw">=</span> <span class="fl">FALSE</span>)</pre></body></html></div>
<pre><code>## mkin version used for fitting: 0.9.50.3
-## R version used for fitting: 4.0.0
-## Date of fit: Wed May 27 07:51:41 2020
-## Date of summary: Wed May 27 07:51:41 2020
+## R version used for fitting: 4.0.2
+## Date of fit: Thu Oct 8 09:14:07 2020
+## Date of summary: Thu Oct 8 09:14:07 2020
##
## Equations:
-## d_parent/dt = - k_parent_sink * parent
+## d_parent/dt = - k_parent * parent
##
## Model predictions using solution type analytical
##
-## Fitted using 142 model solutions performed in 0.028 s
+## Fitted using 142 model solutions performed in 0.03 s
##
## Error model: Constant variance
##
## Error model algorithm: OLS
##
## Starting values for parameters to be optimised:
-## value type
-## parent_0 96.6 state
-## k_parent_sink 0.1 deparm
+## value type
+## parent_0 96.6 state
+## k_parent 0.1 deparm
##
## Starting values for the transformed parameters actually optimised:
-## value lower upper
-## parent_0 96.600000 -Inf Inf
-## log_k_parent_sink -2.302585 -Inf Inf
+## value lower upper
+## parent_0 96.600000 -Inf Inf
+## log_k_parent -2.302585 -Inf Inf
##
## Fixed parameter values:
## None
@@ -660,25 +660,25 @@
## 47.12133 47.35966 -20.56067
##
## Optimised, transformed parameters with symmetric confidence intervals:
-## Estimate Std. Error Lower Upper
-## parent_0 96.440 1.69900 92.070 100.800
-## log_k_parent_sink -5.030 0.07059 -5.211 -4.848
-## sigma 3.162 0.79050 1.130 5.194
+## Estimate Std. Error Lower Upper
+## parent_0 96.440 1.69900 92.070 100.800
+## log_k_parent -5.030 0.07059 -5.211 -4.848
+## sigma 3.162 0.79050 1.130 5.194
##
## Parameter correlation:
-## parent_0 log_k_parent_sink sigma
-## parent_0 1.000e+00 5.938e-01 3.440e-07
-## log_k_parent_sink 5.938e-01 1.000e+00 5.885e-07
-## sigma 3.440e-07 5.885e-07 1.000e+00
+## parent_0 log_k_parent sigma
+## parent_0 1.000e+00 5.938e-01 3.387e-07
+## log_k_parent 5.938e-01 1.000e+00 5.830e-07
+## sigma 3.387e-07 5.830e-07 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
## t-test (unrealistically) based on the assumption of normal distribution
## for estimators of untransformed parameters.
-## Estimate t value Pr(&gt;t) Lower Upper
-## parent_0 96.440000 56.77 1.604e-08 92.070000 1.008e+02
-## k_parent_sink 0.006541 14.17 1.578e-05 0.005455 7.842e-03
-## sigma 3.162000 4.00 5.162e-03 1.130000 5.194e+00
+## Estimate t value Pr(&gt;t) Lower Upper
+## parent_0 96.440000 56.77 1.604e-08 92.070000 1.008e+02
+## k_parent 0.006541 14.17 1.578e-05 0.005455 7.842e-03
+## sigma 3.162000 4.00 5.162e-03 1.130000 5.194e+00
##
## FOCUS Chi2 error levels in percent:
## err.min n.optim df
@@ -690,16 +690,16 @@
## parent 106 352</code></pre>
<div class="sourceCode" id="cb31"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">mm.L4</span><span class="kw">[[</span><span class="st">"FOMC"</span>, <span class="fl">1</span>]], <span class="kw">data</span> <span class="kw">=</span> <span class="fl">FALSE</span>)</pre></body></html></div>
<pre><code>## mkin version used for fitting: 0.9.50.3
-## R version used for fitting: 4.0.0
-## Date of fit: Wed May 27 07:51:41 2020
-## Date of summary: Wed May 27 07:51:41 2020
+## R version used for fitting: 4.0.2
+## Date of fit: Thu Oct 8 09:14:07 2020
+## Date of summary: Thu Oct 8 09:14:07 2020
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted using 224 model solutions performed in 0.044 s
+## Fitted using 224 model solutions performed in 0.046 s
##
## Error model: Constant variance
##
@@ -734,10 +734,10 @@
##
## Parameter correlation:
## parent_0 log_alpha log_beta sigma
-## parent_0 1.000e+00 -4.696e-01 -5.543e-01 -2.563e-07
-## log_alpha -4.696e-01 1.000e+00 9.889e-01 4.066e-08
-## log_beta -5.543e-01 9.889e-01 1.000e+00 6.818e-08
-## sigma -2.563e-07 4.066e-08 6.818e-08 1.000e+00
+## parent_0 1.000e+00 -4.696e-01 -5.543e-01 -2.456e-07
+## log_alpha -4.696e-01 1.000e+00 9.889e-01 2.169e-08
+## log_beta -5.543e-01 9.889e-01 1.000e+00 4.910e-08
+## sigma -2.456e-07 2.169e-08 4.910e-08 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
diff --git a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-15-1.png b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-15-1.png
index 2e5071d9..db54326e 100644
--- a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-15-1.png
+++ b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-15-1.png
Binary files differ
diff --git a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png
index 16235059..bfa271dd 100644
--- a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png
+++ b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png
Binary files differ
diff --git a/docs/dev/articles/mkin.html b/docs/dev/articles/mkin.html
index 4cc06a43..6865fe96 100644
--- a/docs/dev/articles/mkin.html
+++ b/docs/dev/articles/mkin.html
@@ -101,7 +101,7 @@
<h1 data-toc-skip>Introduction to mkin</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2020-05-27</h4>
+ <h4 class="date">2020-10-08</h4>
<small class="dont-index">Source: <a href="http://github.com/jranke/mkin/blob/master/vignettes/mkin.rmd"><code>vignettes/mkin.rmd</code></a></small>
<div class="hidden name"><code>mkin.rmd</code></div>
@@ -110,7 +110,7 @@
-<p><a href="http://www.jrwb.de">Wissenschaftlicher Berater, Kronacher Str. 12, 79639 Grenzach-Wyhlen, Germany</a><br><a href="http://chem.uft.uni-bremen.de/ranke">Privatdozent at the University of Bremen</a></p>
+<p><a href="https://www.jrwb.de">Wissenschaftlicher Berater, Kronacher Str. 12, 79639 Grenzach-Wyhlen, Germany</a><br><a href="http://chem.uft.uni-bremen.de/ranke/">Privatdozent at the University of Bremen</a></p>
<div id="abstract" class="section level1">
<h1 class="hasAnchor">
<a href="#abstract" class="anchor"></a>Abstract</h1>
@@ -151,7 +151,7 @@
<p>Many approaches are possible regarding the evaluation of chemical degradation data.</p>
<p>The <code>mkin</code> package <span class="citation">(Ranke 2019)</span> implements the approach recommended in the kinetics report provided by the FOrum for Co-ordination of pesticide fate models and their USe <span class="citation">(FOCUS Work Group on Degradation Kinetics 2006, 2014)</span> for simple decline data series, data series with transformation products, commonly termed metabolites, and for data series for more than one compartment. It is also possible to include back reactions, so equilibrium reactions and equilibrium partitioning can be specified, although this oftentimes leads to an overparameterisation of the model.</p>
<p>When the first <code>mkin</code> code was published in 2010, the most commonly used tools for fitting more complex kinetic degradation models to experimental data were KinGUI <span class="citation">(Schäfer et al. 2007)</span>, a MATLAB based tool with a graphical user interface that was specifically tailored to the task and included some output as proposed by the FOCUS Kinetics Workgroup, and ModelMaker, a general purpose compartment based tool providing infrastructure for fitting dynamic simulation models based on differential equations to data.</p>
-<p>The code was first uploaded to the BerliOS platform. When this was taken down, the version control history was imported into the R-Forge site (see <em>e.g.</em> <a href="http://cgit.jrwb.de/mkin/commit/?id=30cbb4092f6d2d3beff5800603374a0d009ad770">the initial commit on 11 May 2010</a>), where the code is still occasionally updated.</p>
+<p>The code was first uploaded to the BerliOS platform. When this was taken down, the version control history was imported into the R-Forge site (see <em>e.g.</em> <a href="https://cgit.jrwb.de/mkin/commit/?id=30cbb4092f6d2d3beff5800603374a0d009ad770">the initial commit on 11 May 2010</a>), where the code is still occasionally updated.</p>
<p>At that time, the R package <code>FME</code> (Flexible Modelling Environment) <span class="citation">(Soetaert and Petzoldt 2010)</span> was already available, and provided a good basis for developing a package specifically tailored to the task. The remaining challenge was to make it as easy as possible for the users (including the author of this vignette) to specify the system of differential equations and to include the output requested by the FOCUS guidance, such as the relative standard deviation that has to be assumed for the residuals, such that the <span class="math inline">\(\chi^2\)</span> goodness-of-fit test as defined by the FOCUS kinetics workgroup would pass using an significance level <span class="math inline">\(\alpha\)</span> of 0.05. This relative error, expressed as a percentage, is often termed <span class="math inline">\(\chi^2\)</span> error level or similar.</p>
<p>Also, <code>mkin</code> introduced using analytical solutions for parent only kinetics for improved optimization speed. Later, Eigenvalue based solutions were introduced to <code>mkin</code> for the case of linear differential equations (<em>i.e.</em> where the FOMC or DFOP models were not used for the parent compound), greatly improving the optimization speed for these cases. This, however, has become somehow obsolete, as the use of compiled code described below gives even smaller execution times.</p>
<p>The possibility to specify back-reactions and a biphasic model (SFORB) for metabolites were present in <code>mkin</code> from the very beginning.</p>
@@ -161,7 +161,7 @@
<p>Soon after the publication of <code>mkin</code>, two derived tools were published, namely KinGUII (available from Bayer Crop Science) and CAKE (commissioned to Tessella by Syngenta), which added a graphical user interface (GUI), and added fitting by iteratively reweighted least squares (IRLS) and characterisation of likely parameter distributions by Markov Chain Monte Carlo (MCMC) sampling.</p>
<p>CAKE focuses on a smooth use experience, sacrificing some flexibility in the model definition, originally allowing only two primary metabolites in parallel. The current version 3.3 of CAKE release in March 2016 uses a basic scheme for up to six metabolites in a flexible arrangement, but does not support back-reactions (non-instantaneous equilibria) or biphasic kinetics for metabolites.</p>
<p>KinGUI offers an even more flexible widget for specifying complex kinetic models. Back-reactions (non-instantaneous equilibria) were supported early on, but until 2014, only simple first-order models could be specified for transformation products. Starting with KinGUII version 2.1, biphasic modelling of metabolites was also available in KinGUII.</p>
-<p>A further graphical user interface (GUI) that has recently been brought to a decent degree of maturity is the browser based GUI named <code>gmkin</code>. Please see its <a href="https://pkgdown.jrwb.de/gmkin">documentation page</a> and <a href="https://pkgdown.jrwb.de/gmkin/articles/gmkin_manual.html">manual</a> for further information.</p>
+<p>A further graphical user interface (GUI) that has recently been brought to a decent degree of maturity is the browser based GUI named <code>gmkin</code>. Please see its <a href="https://pkgdown.jrwb.de/gmkin/">documentation page</a> and <a href="https://pkgdown.jrwb.de/gmkin/articles/gmkin_manual.html">manual</a> for further information.</p>
<p>A comparison of scope, usability and numerical results obtained with these tools has been recently been published by <span class="citation">Ranke, Wöltjen, and Meinecke (2018)</span>.</p>
</div>
<div id="recent-developments" class="section level2">
@@ -227,7 +227,7 @@
<p>Schäfer, D., B. Mikolasch, P. Rainbird, and B. Harvey. 2007. “KinGUI: A New Kinetic Software Tool for Evaluations According to FOCUS Degradation Kinetics.” In <em>Proceedings of the Xiii Symposium Pesticide Chemistry</em>, edited by Del Re A. A. M., Capri E., Fragoulis G., and Trevisan M., 916–23. Piacenza.</p>
</div>
<div id="ref-soetaert2010">
-<p>Soetaert, Karline, and Thomas Petzoldt. 2010. “Inverse Modelling, Sensitivity and Monte Carlo Analysis in R Using Package FME.” <em>Journal of Statistical Software</em> 33 (3): 1–28. <a href="http://www.jstatsoft.org/v33/i03/" class="uri">http://www.jstatsoft.org/v33/i03/</a>.</p>
+<p>Soetaert, Karline, and Thomas Petzoldt. 2010. “Inverse Modelling, Sensitivity and Monte Carlo Analysis in R Using Package FME.” <em>Journal of Statistical Software</em> 33 (3): 1–28. <a href="https://www.jstatsoft.org/v33/i03/" class="uri">https://www.jstatsoft.org/v33/i03/</a>.</p>
</div>
</div>
</div>
diff --git a/docs/dev/articles/mkin_files/figure-html/unnamed-chunk-2-1.png b/docs/dev/articles/mkin_files/figure-html/unnamed-chunk-2-1.png
index 62ea16f2..bdc067c1 100644
--- a/docs/dev/articles/mkin_files/figure-html/unnamed-chunk-2-1.png
+++ b/docs/dev/articles/mkin_files/figure-html/unnamed-chunk-2-1.png
Binary files differ
diff --git a/docs/dev/articles/twa.html b/docs/dev/articles/twa.html
index 29be6c95..d1093e13 100644
--- a/docs/dev/articles/twa.html
+++ b/docs/dev/articles/twa.html
@@ -101,7 +101,7 @@
<h1 data-toc-skip>Calculation of time weighted average concentrations with mkin</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2020-05-27</h4>
+ <h4 class="date">2020-10-08</h4>
<small class="dont-index">Source: <a href="http://github.com/jranke/mkin/blob/master/vignettes/twa.rmd"><code>vignettes/twa.rmd</code></a></small>
<div class="hidden name"><code>twa.rmd</code></div>
@@ -141,7 +141,7 @@
<p><span class="math display">\[f_\textrm{twa} = \frac{1}{t} \left(
\frac{1}{k_1} \left( 1 - e^{- k_1 t_b} \right) +
\frac{e^{- k_1 t_b}}{k_2} \left( 1 - e^{- k_2 (t - t_b)} \right) \right) \]</span></p>
-<p>Note that a method for calculating maximum moving window time weighted average concentrations for a model fitted by ‘mkinfit’ or from parent decline model parameters is included in the <code><a href="../reference/max_twa_parent.html">max_twa_parent()</a></code> function. If the same is needed for metabolites, the function <code><a href="https://rdrr.io/pkg/pfm/man/max_twa.html">pfm::max_twa()</a></code> from the ‘pfm’ package can be used.</p>
+<p>Note that a method for calculating maximum moving window time weighted average concentrations for a model fitted by ‘mkinfit’ or from parent decline model parameters is included in the <code><a href="../reference/max_twa_parent.html">max_twa_parent()</a></code> function. If the same is needed for metabolites, the function <code><a href="https://pkgdown.jrwb.de/pfm/reference/max_twa.html">pfm::max_twa()</a></code> from the ‘pfm’ package can be used.</p>
<div id="refs" class="references">
<div id="ref-FOCUSkinetics2014">
<p>FOCUS Work Group on Degradation Kinetics. 2014. <em>Generic Guidance for Estimating Persistence and Degradation Kinetics from Environmental Fate Studies on Pesticides in Eu Registration</em>. 1.1 ed. <a href="http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics" class="uri">http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics</a>.</p>
diff --git a/docs/dev/articles/web_only/FOCUS_Z.html b/docs/dev/articles/web_only/FOCUS_Z.html
index 270232d7..763ca9be 100644
--- a/docs/dev/articles/web_only/FOCUS_Z.html
+++ b/docs/dev/articles/web_only/FOCUS_Z.html
@@ -101,7 +101,7 @@
<h1 data-toc-skip>Example evaluation of FOCUS dataset Z</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2020-05-27</h4>
+ <h4 class="date">2020-10-08</h4>
<small class="dont-index">Source: <a href="http://github.com/jranke/mkin/blob/master/vignettes/web_only/FOCUS_Z.rmd"><code>vignettes/web_only/FOCUS_Z.rmd</code></a></small>
<div class="hidden name"><code>FOCUS_Z.rmd</code></div>
@@ -217,25 +217,25 @@
<div class="sourceCode" id="cb33"><html><body><pre class="r"><span class="fu"><a href="../../reference/plot.mkinfit.html">plot_sep</a></span>(<span class="no">m.Z.FOCUS</span>)</pre></body></html></div>
<p><img src="FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png" width="700"></p>
<div class="sourceCode" id="cb34"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">m.Z.FOCUS</span>, <span class="kw">data</span> <span class="kw">=</span> <span class="fl">FALSE</span>)$<span class="no">bpar</span></pre></body></html></div>
-<pre><code>## Estimate se_notrans t value Pr(&gt;t) Lower Upper
-## Z0_0 96.840695 1.994285 48.5591 4.0254e-42 92.828744 100.85265
-## k_Z0 2.215467 0.118463 18.7018 1.0417e-23 1.989524 2.46707
-## k_Z1 0.478325 0.028259 16.9265 6.2441e-22 0.424725 0.53869
-## k_Z2 0.451638 0.042139 10.7177 1.6309e-14 0.374346 0.54489
-## k_Z3 0.058692 0.015245 3.8498 1.7807e-04 0.034806 0.09897
-## f_Z2_to_Z3 0.471484 0.058348 8.0805 9.6599e-11 0.357736 0.58827
-## sigma 3.984431 0.383402 10.3923 4.5576e-14 3.213126 4.75574</code></pre>
+<pre><code>## Estimate se_notrans t value Pr(&gt;t) Lower Upper
+## Z0_0 96.838721 1.994275 48.5584 4.0283e-42 92.826878 100.850563
+## k_Z0 2.215400 0.118459 18.7019 1.0414e-23 1.989462 2.466998
+## k_Z1 0.478301 0.028257 16.9267 6.2411e-22 0.424705 0.538662
+## k_Z2 0.451623 0.042138 10.7176 1.6313e-14 0.374336 0.544867
+## k_Z3 0.058694 0.015246 3.8499 1.7804e-04 0.034809 0.098967
+## f_Z2_to_Z3 0.471510 0.058352 8.0804 9.6640e-11 0.357775 0.588283
+## sigma 3.984431 0.383402 10.3923 4.5575e-14 3.213126 4.755736</code></pre>
<div class="sourceCode" id="cb36"><html><body><pre class="r"><span class="fu"><a href="../../reference/endpoints.html">endpoints</a></span>(<span class="no">m.Z.FOCUS</span>)</pre></body></html></div>
<pre><code>## $ff
## Z2_Z3 Z2_sink
-## 0.47148 0.52852
+## 0.47151 0.52849
##
## $distimes
## DT50 DT90
-## Z0 0.31287 1.0393
-## Z1 1.44911 4.8138
-## Z2 1.53474 5.0983
-## Z3 11.80989 39.2316</code></pre>
+## Z0 0.31288 1.0394
+## Z1 1.44919 4.8141
+## Z2 1.53479 5.0985
+## Z3 11.80955 39.2305</code></pre>
<p>This fit corresponds to the final result chosen in Appendix 7 of the FOCUS report. Confidence intervals returned by mkin are based on internally transformed parameters, however.</p>
</div>
<div id="using-the-sforb-model" class="section level1">
@@ -277,51 +277,57 @@
<span class="kw">quiet</span> <span class="kw">=</span> <span class="fl">TRUE</span>)</pre></body></html></div>
<pre><code>## Warning in mkinfit(Z.mkin.4, FOCUS_2006_Z_mkin, parms.ini = m.Z.mkin.
## 3$bparms.ode, : Observations with value of zero were removed from the data</code></pre>
-<div class="sourceCode" id="cb54"><html><body><pre class="r"><span class="fu"><a href="../../reference/plot.mkinfit.html">plot_sep</a></span>(<span class="no">m.Z.mkin.4</span>)</pre></body></html></div>
+<pre><code>## Warning in mkinfit(Z.mkin.4, FOCUS_2006_Z_mkin, parms.ini = m.Z.mkin.
+## 3$bparms.ode, : Shapiro-Wilk test for standardized residuals: p = 0.0449</code></pre>
+<div class="sourceCode" id="cb55"><html><body><pre class="r"><span class="fu"><a href="../../reference/plot.mkinfit.html">plot_sep</a></span>(<span class="no">m.Z.mkin.4</span>)</pre></body></html></div>
<p><img src="FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png" width="700"></p>
<p>The error level of the fit, but especially of metabolite Z3, can be improved if the SFORB model is chosen for this metabolite, as this model is capable of representing the tailing of the metabolite decline phase.</p>
-<div class="sourceCode" id="cb55"><html><body><pre class="r"><span class="no">Z.mkin.5</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/mkinmod.html">mkinmod</a></span>(<span class="kw">Z0</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFORB"</span>, <span class="st">"Z1"</span>, <span class="kw">sink</span> <span class="kw">=</span> <span class="fl">FALSE</span>),
+<div class="sourceCode" id="cb56"><html><body><pre class="r"><span class="no">Z.mkin.5</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/mkinmod.html">mkinmod</a></span>(<span class="kw">Z0</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFORB"</span>, <span class="st">"Z1"</span>, <span class="kw">sink</span> <span class="kw">=</span> <span class="fl">FALSE</span>),
<span class="kw">Z1</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"Z2"</span>, <span class="kw">sink</span> <span class="kw">=</span> <span class="fl">FALSE</span>),
<span class="kw">Z2</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"Z3"</span>),
<span class="kw">Z3</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFORB"</span>))</pre></body></html></div>
<pre><code>## Successfully compiled differential equation model from auto-generated C code.</code></pre>
-<div class="sourceCode" id="cb57"><html><body><pre class="r"><span class="no">m.Z.mkin.5</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/mkinfit.html">mkinfit</a></span>(<span class="no">Z.mkin.5</span>, <span class="no">FOCUS_2006_Z_mkin</span>,
+<div class="sourceCode" id="cb58"><html><body><pre class="r"><span class="no">m.Z.mkin.5</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/mkinfit.html">mkinfit</a></span>(<span class="no">Z.mkin.5</span>, <span class="no">FOCUS_2006_Z_mkin</span>,
<span class="kw">parms.ini</span> <span class="kw">=</span> <span class="no">m.Z.mkin.4</span>$<span class="no">bparms.ode</span>[<span class="fl">1</span>:<span class="fl">4</span>],
<span class="kw">quiet</span> <span class="kw">=</span> <span class="fl">TRUE</span>)</pre></body></html></div>
<pre><code>## Warning in mkinfit(Z.mkin.5, FOCUS_2006_Z_mkin, parms.ini = m.Z.mkin.
## 4$bparms.ode[1:4], : Observations with value of zero were removed from the data</code></pre>
-<div class="sourceCode" id="cb59"><html><body><pre class="r"><span class="fu"><a href="../../reference/plot.mkinfit.html">plot_sep</a></span>(<span class="no">m.Z.mkin.5</span>)</pre></body></html></div>
+<pre><code>## Warning in mkinfit(Z.mkin.5, FOCUS_2006_Z_mkin, parms.ini = m.Z.mkin.
+## 4$bparms.ode[1:4], : Shapiro-Wilk test for standardized residuals: p = 0.00785</code></pre>
+<div class="sourceCode" id="cb61"><html><body><pre class="r"><span class="fu"><a href="../../reference/plot.mkinfit.html">plot_sep</a></span>(<span class="no">m.Z.mkin.5</span>)</pre></body></html></div>
<p><img src="FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png" width="700"></p>
<p>The summary view of the backtransformed parameters shows that we get no confidence intervals due to overparameterisation. As the optimized is excessively small, it seems reasonable to fix it to zero.</p>
-<div class="sourceCode" id="cb60"><html><body><pre class="r"><span class="no">m.Z.mkin.5a</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/mkinfit.html">mkinfit</a></span>(<span class="no">Z.mkin.5</span>, <span class="no">FOCUS_2006_Z_mkin</span>,
+<div class="sourceCode" id="cb62"><html><body><pre class="r"><span class="no">m.Z.mkin.5a</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/mkinfit.html">mkinfit</a></span>(<span class="no">Z.mkin.5</span>, <span class="no">FOCUS_2006_Z_mkin</span>,
<span class="kw">parms.ini</span> <span class="kw">=</span> <span class="fu"><a href="https://rdrr.io/r/base/c.html">c</a></span>(<span class="no">m.Z.mkin.5</span>$<span class="no">bparms.ode</span>[<span class="fl">1</span>:<span class="fl">7</span>],
<span class="kw">k_Z3_bound_free</span> <span class="kw">=</span> <span class="fl">0</span>),
<span class="kw">fixed_parms</span> <span class="kw">=</span> <span class="st">"k_Z3_bound_free"</span>,
<span class="kw">quiet</span> <span class="kw">=</span> <span class="fl">TRUE</span>)</pre></body></html></div>
<pre><code>## Warning in mkinfit(Z.mkin.5, FOCUS_2006_Z_mkin, parms.ini = c(m.Z.mkin.
## 5$bparms.ode[1:7], : Observations with value of zero were removed from the data</code></pre>
-<div class="sourceCode" id="cb62"><html><body><pre class="r"><span class="fu"><a href="../../reference/plot.mkinfit.html">plot_sep</a></span>(<span class="no">m.Z.mkin.5a</span>)</pre></body></html></div>
+<pre><code>## Warning in mkinfit(Z.mkin.5, FOCUS_2006_Z_mkin, parms.ini = c(m.Z.mkin.
+## 5$bparms.ode[1:7], : Shapiro-Wilk test for standardized residuals: p = 0.00785</code></pre>
+<div class="sourceCode" id="cb65"><html><body><pre class="r"><span class="fu"><a href="../../reference/plot.mkinfit.html">plot_sep</a></span>(<span class="no">m.Z.mkin.5a</span>)</pre></body></html></div>
<p><img src="FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png" width="700"></p>
<p>As expected, the residual plots for Z0 and Z3 are more random than in the case of the all SFO model for which they were shown above. In conclusion, the model is proposed as the best-fit model for the dataset from Appendix 7 of the FOCUS report.</p>
<p>A graphical representation of the confidence intervals can finally be obtained.</p>
-<div class="sourceCode" id="cb63"><html><body><pre class="r"><span class="fu"><a href="../../reference/mkinparplot.html">mkinparplot</a></span>(<span class="no">m.Z.mkin.5a</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb66"><html><body><pre class="r"><span class="fu"><a href="../../reference/mkinparplot.html">mkinparplot</a></span>(<span class="no">m.Z.mkin.5a</span>)</pre></body></html></div>
<p><img src="FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png" width="700"></p>
<p>The endpoints obtained with this model are</p>
-<div class="sourceCode" id="cb64"><html><body><pre class="r"><span class="fu"><a href="../../reference/endpoints.html">endpoints</a></span>(<span class="no">m.Z.mkin.5a</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb67"><html><body><pre class="r"><span class="fu"><a href="../../reference/endpoints.html">endpoints</a></span>(<span class="no">m.Z.mkin.5a</span>)</pre></body></html></div>
<pre><code>## $ff
## Z0_free Z2_Z3 Z2_sink Z3_free
## 1.00000 0.53656 0.46344 1.00000
##
## $SFORB
## Z0_b1 Z0_b2 Z3_b1 Z3_b2
-## 2.4471337 0.0075125 0.0800071 0.0000000
+## 2.4471358 0.0075126 0.0800073 0.0000000
##
## $distimes
-## DT50 DT90 DT50_Z0_b1 DT50_Z0_b2 DT50_Z3_b1 DT50_Z3_b2
-## Z0 0.3043 1.1848 0.28325 92.266 NA NA
-## Z1 1.5148 5.0320 NA NA NA NA
-## Z2 1.6414 5.4526 NA NA NA NA
-## Z3 NA NA NA NA 8.6636 Inf</code></pre>
+## DT50 DT90 DT50back DT50_Z0_b1 DT50_Z0_b2 DT50_Z3_b1 DT50_Z3_b2
+## Z0 0.3043 1.1848 0.35666 0.28325 92.265 NA NA
+## Z1 1.5148 5.0320 NA NA NA NA NA
+## Z2 1.6414 5.4526 NA NA NA NA NA
+## Z3 NA NA NA NA NA 8.6636 Inf</code></pre>
<p>It is clear the degradation rate of Z3 towards the end of the experiment is very low as DT50_Z3_b2 (the second Eigenvalue of the system of two differential equations representing the SFORB system for Z3, corresponding to the slower rate constant of the DFOP model) is reported to be infinity. However, this appears to be a feature of the data.</p>
</div>
<div id="references" class="section level1">
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png
index 96738dd0..d3702fb6 100644
--- a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png
+++ b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png
Binary files differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png
index 4f3c2554..4a6fce4f 100644
--- a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png
+++ b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png
Binary files differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png
index b8c3ed26..dd6537b7 100644
--- a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png
+++ b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png
Binary files differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png
index 132a7317..b986c30b 100644
--- a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png
+++ b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png
Binary files differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png
index b25bf26a..47d806c0 100644
--- a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png
+++ b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png
Binary files differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png
index dd5d89cd..0c698299 100644
--- a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png
+++ b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png
Binary files differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples.html b/docs/dev/articles/web_only/NAFTA_examples.html
index 12499452..09f40a7f 100644
--- a/docs/dev/articles/web_only/NAFTA_examples.html
+++ b/docs/dev/articles/web_only/NAFTA_examples.html
@@ -101,7 +101,7 @@
<h1 data-toc-skip>Evaluation of example datasets from Attachment 1 to the US EPA SOP for the NAFTA guidance</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2020-05-27</h4>
+ <h4 class="date">2020-10-08</h4>
<small class="dont-index">Source: <a href="http://github.com/jranke/mkin/blob/master/vignettes/web_only/NAFTA_examples.rmd"><code>vignettes/web_only/NAFTA_examples.rmd</code></a></small>
<div class="hidden name"><code>NAFTA_examples.rmd</code></div>
@@ -138,23 +138,23 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 95.8401 4.67e-21 92.245 99.4357
-## k_parent_sink 0.0102 3.92e-12 0.009 0.0117
-## sigma 4.8230 3.81e-06 3.214 6.4318
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 95.8401 4.67e-21 92.245 99.4357
+## k_parent 0.0102 3.92e-12 0.009 0.0117
+## sigma 4.8230 3.81e-06 3.214 6.4318
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 1.01e+02 NA 9.91e+01 1.02e+02
-## k__iore_parent_sink 1.54e-05 NA 4.08e-06 5.84e-05
-## N_parent 2.57e+00 NA 2.25e+00 2.89e+00
-## sigma 1.68e+00 NA 1.12e+00 2.24e+00
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 1.01e+02 NA 9.91e+01 1.02e+02
+## k__iore_parent 1.54e-05 NA 4.08e-06 5.84e-05
+## N_parent 2.57e+00 NA 2.25e+00 2.89e+00
+## sigma 1.68e+00 NA 1.12e+00 2.24e+00
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
## parent_0 9.99e+01 1.41e-26 98.8116 101.0810
## k1 2.67e-02 5.05e-06 0.0243 0.0295
-## k2 2.86e-12 5.00e-01 0.0000 Inf
+## k2 2.17e-12 5.00e-01 0.0000 Inf
## g 6.47e-01 3.67e-06 0.6248 0.6677
## sigma 1.27e+00 8.91e-06 0.8395 1.6929
##
@@ -163,7 +163,7 @@
## DT50 DT90 DT50_rep
## SFO 67.7 2.25e+02 6.77e+01
## IORE 58.2 1.07e+03 3.22e+02
-## DFOP 55.5 4.42e+11 2.42e+11
+## DFOP 55.5 5.83e+11 3.20e+11
##
## Representative half-life:
## [1] 321.51</code></pre>
@@ -186,23 +186,23 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 96.497 2.32e-24 94.85271 98.14155
-## k_parent_sink 0.008 3.42e-14 0.00737 0.00869
-## sigma 2.295 1.22e-05 1.47976 3.11036
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 96.497 2.32e-24 94.85271 98.14155
+## k_parent 0.008 3.42e-14 0.00737 0.00869
+## sigma 2.295 1.22e-05 1.47976 3.11036
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 9.85e+01 1.17e-28 9.79e+01 9.92e+01
-## k__iore_parent_sink 1.53e-04 6.50e-03 7.21e-05 3.26e-04
-## N_parent 1.94e+00 5.88e-13 1.76e+00 2.12e+00
-## sigma 7.49e-01 1.63e-05 4.82e-01 1.02e+00
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 9.85e+01 1.17e-28 9.79e+01 9.92e+01
+## k__iore_parent 1.53e-04 6.50e-03 7.21e-05 3.26e-04
+## N_parent 1.94e+00 5.88e-13 1.76e+00 2.12e+00
+## sigma 7.49e-01 1.63e-05 4.82e-01 1.02e+00
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
## parent_0 9.84e+01 1.24e-27 97.8078 98.9187
## k1 1.55e-02 4.10e-04 0.0143 0.0167
-## k2 1.16e-11 5.00e-01 0.0000 Inf
+## k2 1.04e-11 5.00e-01 0.0000 Inf
## g 6.89e-01 2.92e-03 0.6626 0.7142
## sigma 6.48e-01 2.38e-05 0.4147 0.8813
##
@@ -211,7 +211,7 @@
## DT50 DT90 DT50_rep
## SFO 86.6 2.88e+02 8.66e+01
## IORE 85.5 7.17e+02 2.16e+02
-## DFOP 83.6 9.80e+10 5.98e+10
+## DFOP 83.6 1.09e+11 6.67e+10
##
## Representative half-life:
## [1] 215.87</code></pre>
@@ -234,23 +234,23 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 94.7759 7.29e-24 92.3478 97.2039
-## k_parent_sink 0.0179 8.02e-16 0.0166 0.0194
-## sigma 3.0696 3.81e-06 2.0456 4.0936
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 94.7759 7.29e-24 92.3478 97.2039
+## k_parent 0.0179 8.02e-16 0.0166 0.0194
+## sigma 3.0696 3.81e-06 2.0456 4.0936
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 97.12446 2.63e-26 95.62461 98.62431
-## k__iore_parent_sink 0.00252 1.95e-03 0.00134 0.00472
-## N_parent 1.49587 4.07e-13 1.33896 1.65279
-## sigma 1.59698 5.05e-06 1.06169 2.13227
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 97.12446 2.63e-26 95.62461 98.62431
+## k__iore_parent 0.00252 1.95e-03 0.00134 0.00472
+## N_parent 1.49587 4.07e-13 1.33896 1.65279
+## sigma 1.59698 5.05e-06 1.06169 2.13227
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
## parent_0 9.66e+01 1.57e-25 95.3476 97.8979
## k1 2.55e-02 7.33e-06 0.0233 0.0278
-## k2 4.90e-11 5.00e-01 0.0000 Inf
+## k2 3.88e-11 5.00e-01 0.0000 Inf
## g 8.61e-01 7.55e-06 0.8314 0.8867
## sigma 1.46e+00 6.93e-06 0.9661 1.9483
##
@@ -259,7 +259,7 @@
## DT50 DT90 DT50_rep
## SFO 38.6 1.28e+02 3.86e+01
## IORE 34.0 1.77e+02 5.32e+01
-## DFOP 34.1 6.66e+09 1.41e+10
+## DFOP 34.1 8.42e+09 1.79e+10
##
## Representative half-life:
## [1] 53.17</code></pre>
@@ -282,23 +282,23 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 96.41796 4.80e-53 93.32245 99.51347
-## k_parent_sink 0.00735 7.64e-21 0.00641 0.00843
-## sigma 7.94557 1.83e-15 6.46713 9.42401
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 96.41796 4.80e-53 93.32245 99.51347
+## k_parent 0.00735 7.64e-21 0.00641 0.00843
+## sigma 7.94557 1.83e-15 6.46713 9.42401
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 9.92e+01 NA 9.55e+01 1.03e+02
-## k__iore_parent_sink 1.60e-05 NA 1.45e-07 1.77e-03
-## N_parent 2.45e+00 NA 1.35e+00 3.54e+00
-## sigma 7.42e+00 NA 6.04e+00 8.80e+00
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 9.92e+01 NA 9.55e+01 1.03e+02
+## k__iore_parent 1.60e-05 NA 1.45e-07 1.77e-03
+## N_parent 2.45e+00 NA 1.35e+00 3.54e+00
+## sigma 7.42e+00 NA 6.04e+00 8.80e+00
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
## parent_0 9.89e+01 9.44e-49 95.4640 102.2573
## k1 1.81e-02 1.75e-01 0.0116 0.0281
-## k2 1.97e-10 5.00e-01 0.0000 Inf
+## k2 2.30e-10 5.00e-01 0.0000 Inf
## g 6.06e-01 2.19e-01 0.4826 0.7178
## sigma 7.40e+00 2.97e-15 6.0201 8.7754
##
@@ -307,7 +307,7 @@
## DT50 DT90 DT50_rep
## SFO 94.3 3.13e+02 9.43e+01
## IORE 96.7 1.51e+03 4.55e+02
-## DFOP 96.4 6.97e+09 3.52e+09
+## DFOP 96.4 5.95e+09 3.01e+09
##
## Representative half-life:
## [1] 454.55</code></pre>
@@ -320,7 +320,7 @@
<h2 class="hasAnchor">
<a href="#example-on-page-8" class="anchor"></a>Example on page 8</h2>
<p>For this dataset, the IORE fit does not converge when the default starting values used by mkin for the IORE model are used. Therefore, a lower value for the rate constant is used here.</p>
-<div class="sourceCode" id="cb25"><html><body><pre class="r"><span class="no">p8</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p8"</span>]], <span class="kw">parms.ini</span> <span class="kw">=</span> <span class="fu"><a href="https://rdrr.io/r/base/c.html">c</a></span>(<span class="kw">k__iore_parent_sink</span> <span class="kw">=</span> <span class="fl">1e-3</span>))</pre></body></html></div>
+<div class="sourceCode" id="cb25"><html><body><pre class="r"><span class="no">p8</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p8"</span>]], <span class="kw">parms.ini</span> <span class="kw">=</span> <span class="fu"><a href="https://rdrr.io/r/base/c.html">c</a></span>(<span class="kw">k__iore_parent</span> <span class="kw">=</span> <span class="fl">1e-3</span>))</pre></body></html></div>
<pre><code>## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</code></pre>
<pre><code>## The half-life obtained from the IORE model may be used</code></pre>
<div class="sourceCode" id="cb28"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p8</span>)</pre></body></html></div>
@@ -335,17 +335,17 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 88.16549 6.53e-29 83.37344 92.95754
-## k_parent_sink 0.00803 1.67e-13 0.00674 0.00957
-## sigma 7.44786 4.17e-10 5.66209 9.23363
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 88.16549 6.53e-29 83.37344 92.95754
+## k_parent 0.00803 1.67e-13 0.00674 0.00957
+## sigma 7.44786 4.17e-10 5.66209 9.23363
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 9.77e+01 7.03e-35 9.44e+01 1.01e+02
-## k__iore_parent_sink 6.14e-05 3.20e-02 2.12e-05 1.78e-04
-## N_parent 2.27e+00 4.23e-18 2.00e+00 2.54e+00
-## sigma 3.52e+00 5.36e-10 2.67e+00 4.36e+00
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 9.77e+01 7.03e-35 9.44e+01 1.01e+02
+## k__iore_parent 6.14e-05 3.20e-02 2.12e-05 1.78e-04
+## N_parent 2.27e+00 4.23e-18 2.00e+00 2.54e+00
+## sigma 3.52e+00 5.36e-10 2.67e+00 4.36e+00
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
@@ -387,23 +387,23 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 88.1933 3.06e-12 79.9447 96.4419
-## k_parent_sink 0.0409 2.07e-07 0.0324 0.0516
-## sigma 7.2429 3.92e-05 4.4768 10.0090
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 88.1933 3.06e-12 79.9447 96.4419
+## k_parent 0.0409 2.07e-07 0.0324 0.0516
+## sigma 7.2429 3.92e-05 4.4768 10.0090
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 9.89e+01 1.12e-16 9.54e+01 1.02e+02
-## k__iore_parent_sink 1.93e-05 1.13e-01 3.49e-06 1.06e-04
-## N_parent 2.91e+00 1.45e-09 2.50e+00 3.32e+00
-## sigma 2.35e+00 5.31e-05 1.45e+00 3.26e+00
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 9.89e+01 1.12e-16 9.54e+01 1.02e+02
+## k__iore_parent 1.93e-05 1.13e-01 3.49e-06 1.06e-04
+## N_parent 2.91e+00 1.45e-09 2.50e+00 3.32e+00
+## sigma 2.35e+00 5.31e-05 1.45e+00 3.26e+00
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
## parent_0 9.85e+01 2.54e-20 97.390 99.672
## k1 1.38e-01 3.52e-05 0.131 0.146
-## k2 6.02e-13 5.00e-01 0.000 Inf
+## k2 6.69e-13 5.00e-01 0.000 Inf
## g 6.52e-01 8.13e-06 0.642 0.661
## sigma 7.88e-01 6.13e-02 0.481 1.095
##
@@ -412,7 +412,7 @@
## DT50 DT90 DT50_rep
## SFO 16.9 5.63e+01 1.69e+01
## IORE 11.6 3.37e+02 1.01e+02
-## DFOP 10.5 2.07e+12 1.15e+12
+## DFOP 10.5 1.86e+12 1.04e+12
##
## Representative half-life:
## [1] 101.43</code></pre>
@@ -422,16 +422,11 @@
<h2 class="hasAnchor">
<a href="#example-on-page-9-lower-panel" class="anchor"></a>Example on page 9, lower panel</h2>
<div class="sourceCode" id="cb37"><html><body><pre class="r"><span class="no">p9b</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p9b"</span>]])</pre></body></html></div>
-<pre><code>## Warning in sqrt(diag(covar)): NaNs produced</code></pre>
-<pre><code>## Warning in sqrt(diag(covar_notrans)): NaNs produced</code></pre>
-<pre><code>## Warning in sqrt(1/diag(V)): NaNs produced</code></pre>
-<pre><code>## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
-## doubtful</code></pre>
<pre><code>## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</code></pre>
<pre><code>## The half-life obtained from the IORE model may be used</code></pre>
-<div class="sourceCode" id="cb44"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p9b</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb40"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p9b</span>)</pre></body></html></div>
<p><img src="NAFTA_examples_files/figure-html/p9b-1.png" width="700"></p>
-<div class="sourceCode" id="cb45"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p9b</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb41"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p9b</span>)</pre></body></html></div>
<pre><code>## Sums of squares:
## SFO IORE DFOP
## 35.64867 23.22334 35.64867
@@ -441,24 +436,24 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 94.7123 2.15e-19 93.178 96.2464
-## k_parent_sink 0.0389 4.47e-14 0.037 0.0408
-## sigma 1.5957 1.28e-04 0.932 2.2595
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 94.7123 2.15e-19 93.178 96.2464
+## k_parent 0.0389 4.47e-14 0.037 0.0408
+## sigma 1.5957 1.28e-04 0.932 2.2595
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 93.863 2.32e-18 92.4565 95.269
-## k__iore_parent_sink 0.127 1.85e-02 0.0504 0.321
-## N_parent 0.711 1.88e-05 0.4843 0.937
-## sigma 1.288 1.76e-04 0.7456 1.830
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 93.863 2.32e-18 92.4565 95.269
+## k__iore_parent 0.127 1.85e-02 0.0504 0.321
+## N_parent 0.711 1.88e-05 0.4843 0.937
+## sigma 1.288 1.76e-04 0.7456 1.830
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
## parent_0 94.7123 1.61e-16 93.1355 96.2891
## k1 0.0389 1.43e-06 0.0312 0.0485
## k2 0.0389 6.67e-03 0.0186 0.0812
-## g 0.7742 NaN NA NA
+## g 0.7742 5.00e-01 0.0000 1.0000
## sigma 1.5957 2.50e-04 0.9135 2.2779
##
##
@@ -475,12 +470,12 @@
<div id="example-on-page-10" class="section level2">
<h2 class="hasAnchor">
<a href="#example-on-page-10" class="anchor"></a>Example on page 10</h2>
-<div class="sourceCode" id="cb47"><html><body><pre class="r"><span class="no">p10</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p10"</span>]])</pre></body></html></div>
+<div class="sourceCode" id="cb43"><html><body><pre class="r"><span class="no">p10</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p10"</span>]])</pre></body></html></div>
<pre><code>## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</code></pre>
<pre><code>## The half-life obtained from the IORE model may be used</code></pre>
-<div class="sourceCode" id="cb50"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p10</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb46"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p10</span>)</pre></body></html></div>
<p><img src="NAFTA_examples_files/figure-html/p10-1.png" width="700"></p>
-<div class="sourceCode" id="cb51"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p10</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb47"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p10</span>)</pre></body></html></div>
<pre><code>## Sums of squares:
## SFO IORE DFOP
## 899.4089 336.4348 899.4089
@@ -490,25 +485,25 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 101.7315 6.42e-11 91.9259 111.5371
-## k_parent_sink 0.0495 1.70e-07 0.0404 0.0607
-## sigma 8.0152 1.28e-04 4.6813 11.3491
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 101.7315 6.42e-11 91.9259 111.5371
+## k_parent 0.0495 1.70e-07 0.0404 0.0607
+## sigma 8.0152 1.28e-04 4.6813 11.3491
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 96.86 3.32e-12 90.848 102.863
-## k__iore_parent_sink 2.96 7.91e-02 0.687 12.761
-## N_parent 0.00 5.00e-01 -0.372 0.372
-## sigma 4.90 1.77e-04 2.837 6.968
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 96.86 3.32e-12 90.848 102.863
+## k__iore_parent 2.96 7.91e-02 0.687 12.761
+## N_parent 0.00 5.00e-01 -0.372 0.372
+## sigma 4.90 1.77e-04 2.837 6.968
##
## $DFOP
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 101.7315 1.41e-09 91.6534 111.8097
-## k1 0.0495 6.42e-04 0.0301 0.0814
-## k2 0.0495 1.66e-02 0.0200 0.1225
-## g 0.6634 5.00e-01 0.0000 1.0000
-## sigma 8.0152 2.50e-04 4.5886 11.4418
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 101.7315 1.41e-09 91.6534 111.810
+## k1 0.0495 6.48e-04 0.0303 0.081
+## k2 0.0495 1.67e-02 0.0201 0.122
+## g 0.6634 5.00e-01 0.0000 1.000
+## sigma 8.0152 2.50e-04 4.5886 11.442
##
##
## DTx values:
@@ -528,12 +523,12 @@
<div id="example-on-page-11" class="section level2">
<h2 class="hasAnchor">
<a href="#example-on-page-11" class="anchor"></a>Example on page 11</h2>
-<div class="sourceCode" id="cb53"><html><body><pre class="r"><span class="no">p11</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p11"</span>]])</pre></body></html></div>
+<div class="sourceCode" id="cb49"><html><body><pre class="r"><span class="no">p11</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p11"</span>]])</pre></body></html></div>
<pre><code>## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</code></pre>
<pre><code>## The half-life obtained from the IORE model may be used</code></pre>
-<div class="sourceCode" id="cb56"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p11</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb52"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p11</span>)</pre></body></html></div>
<p><img src="NAFTA_examples_files/figure-html/p11-1.png" width="700"></p>
-<div class="sourceCode" id="cb57"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p11</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb53"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p11</span>)</pre></body></html></div>
<pre><code>## Sums of squares:
## SFO IORE DFOP
## 579.6805 204.7932 144.7783
@@ -543,17 +538,17 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 96.15820 4.83e-13 90.24934 1.02e+02
-## k_parent_sink 0.00321 4.71e-05 0.00222 4.64e-03
-## sigma 6.43473 1.28e-04 3.75822 9.11e+00
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 96.15820 4.83e-13 90.24934 1.02e+02
+## k_parent 0.00321 4.71e-05 0.00222 4.64e-03
+## sigma 6.43473 1.28e-04 3.75822 9.11e+00
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 1.05e+02 NA 9.90e+01 1.10e+02
-## k__iore_parent_sink 3.11e-17 NA 1.35e-20 7.18e-14
-## N_parent 8.36e+00 NA 6.62e+00 1.01e+01
-## sigma 3.82e+00 NA 2.21e+00 5.44e+00
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 1.05e+02 NA 9.90e+01 1.10e+02
+## k__iore_parent 3.11e-17 NA 1.35e-20 7.18e-14
+## N_parent 8.36e+00 NA 6.62e+00 1.01e+01
+## sigma 3.82e+00 NA 2.21e+00 5.44e+00
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
@@ -571,7 +566,7 @@
## DFOP 4.21e+11 2.64e+12 9.56e+11
##
## Representative half-life:
-## [1] 41148169</code></pre>
+## [1] 41148171</code></pre>
<p>In this case, the DFOP fit reported for PestDF resulted in a negative value for the slower rate constant, which is not possible in mkin. The other results are in agreement.</p>
</div>
</div>
@@ -582,14 +577,14 @@
<div id="example-on-page-12-upper-panel" class="section level2">
<h2 class="hasAnchor">
<a href="#example-on-page-12-upper-panel" class="anchor"></a>Example on page 12, upper panel</h2>
-<div class="sourceCode" id="cb59"><html><body><pre class="r"><span class="no">p12a</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p12a"</span>]])</pre></body></html></div>
+<div class="sourceCode" id="cb55"><html><body><pre class="r"><span class="no">p12a</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p12a"</span>]])</pre></body></html></div>
<pre><code>## Warning in summary.mkinfit(x): Could not calculate correlation; no covariance
## matrix</code></pre>
<pre><code>## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</code></pre>
<pre><code>## The half-life obtained from the IORE model may be used</code></pre>
-<div class="sourceCode" id="cb63"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p12a</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb59"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p12a</span>)</pre></body></html></div>
<p><img src="NAFTA_examples_files/figure-html/p12a-1.png" width="700"></p>
-<div class="sourceCode" id="cb64"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p12a</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb60"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p12a</span>)</pre></body></html></div>
<pre><code>## Sums of squares:
## SFO IORE DFOP
## 695.4440 220.0685 695.4440
@@ -599,23 +594,23 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 100.521 8.75e-12 92.461 108.581
-## k_parent_sink 0.124 3.61e-08 0.104 0.148
-## sigma 7.048 1.28e-04 4.116 9.980
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 100.521 8.75e-12 92.461 108.581
+## k_parent 0.124 3.61e-08 0.104 0.148
+## sigma 7.048 1.28e-04 4.116 9.980
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 96.823 NA NA NA
-## k__iore_parent_sink 2.436 NA NA NA
-## N_parent 0.263 NA NA NA
-## sigma 3.965 NA NA NA
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 96.823 NA NA NA
+## k__iore_parent 2.436 NA NA NA
+## N_parent 0.263 NA NA NA
+## sigma 3.965 NA NA NA
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
## parent_0 100.521 2.74e-10 92.2366 108.805
-## k1 0.124 5.74e-06 0.0958 0.161
-## k2 0.124 6.61e-02 0.0319 0.484
+## k1 0.124 5.75e-06 0.0958 0.161
+## k2 0.124 6.72e-02 0.0319 0.484
## g 0.877 5.00e-01 0.0000 1.000
## sigma 7.048 2.50e-04 4.0349 10.061
##
@@ -632,7 +627,7 @@
<div id="example-on-page-12-lower-panel" class="section level2">
<h2 class="hasAnchor">
<a href="#example-on-page-12-lower-panel" class="anchor"></a>Example on page 12, lower panel</h2>
-<div class="sourceCode" id="cb66"><html><body><pre class="r"><span class="no">p12b</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p12b"</span>]])</pre></body></html></div>
+<div class="sourceCode" id="cb62"><html><body><pre class="r"><span class="no">p12b</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p12b"</span>]])</pre></body></html></div>
<pre><code>## Warning in sqrt(diag(covar)): NaNs produced</code></pre>
<pre><code>## Warning in qt(alpha/2, rdf): NaNs produced</code></pre>
<pre><code>## Warning in qt(1 - alpha/2, rdf): NaNs produced</code></pre>
@@ -643,9 +638,9 @@
## doubtful</code></pre>
<pre><code>## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</code></pre>
<pre><code>## The half-life obtained from the IORE model may be used</code></pre>
-<div class="sourceCode" id="cb76"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p12b</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb72"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p12b</span>)</pre></body></html></div>
<p><img src="NAFTA_examples_files/figure-html/p12b-1.png" width="700"></p>
-<div class="sourceCode" id="cb77"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p12b</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb73"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p12b</span>)</pre></body></html></div>
<pre><code>## Sums of squares:
## SFO IORE DFOP
## 58.90242 19.06353 58.90242
@@ -655,17 +650,17 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 97.6840 0.00039 85.9388 109.4292
-## k_parent_sink 0.0589 0.00261 0.0431 0.0805
-## sigma 3.4323 0.04356 -1.2377 8.1023
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 97.6840 0.00039 85.9388 109.4292
+## k_parent 0.0589 0.00261 0.0431 0.0805
+## sigma 3.4323 0.04356 -1.2377 8.1023
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 95.523 0.0055 74.539157 116.51
-## k__iore_parent_sink 0.333 0.1433 0.000717 154.57
-## N_parent 0.568 0.0677 -0.989464 2.13
-## sigma 1.953 0.0975 -5.893100 9.80
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 95.523 0.0055 74.539157 116.51
+## k__iore_parent 0.333 0.1433 0.000717 154.57
+## N_parent 0.568 0.0677 -0.989464 2.13
+## sigma 1.953 0.0975 -5.893100 9.80
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
@@ -688,16 +683,12 @@
<div id="example-on-page-13" class="section level2">
<h2 class="hasAnchor">
<a href="#example-on-page-13" class="anchor"></a>Example on page 13</h2>
-<div class="sourceCode" id="cb79"><html><body><pre class="r"><span class="no">p13</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p13"</span>]])</pre></body></html></div>
-<pre><code>## Warning in sqrt(diag(covar)): NaNs produced</code></pre>
-<pre><code>## Warning in sqrt(1/diag(V)): NaNs produced</code></pre>
-<pre><code>## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
-## doubtful</code></pre>
+<div class="sourceCode" id="cb75"><html><body><pre class="r"><span class="no">p13</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p13"</span>]])</pre></body></html></div>
<pre><code>## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</code></pre>
<pre><code>## The half-life obtained from the IORE model may be used</code></pre>
-<div class="sourceCode" id="cb85"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p13</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb78"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p13</span>)</pre></body></html></div>
<p><img src="NAFTA_examples_files/figure-html/p13-1.png" width="700"></p>
-<div class="sourceCode" id="cb86"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p13</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb79"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p13</span>)</pre></body></html></div>
<pre><code>## Sums of squares:
## SFO IORE DFOP
## 174.5971 142.3951 174.5971
@@ -707,24 +698,24 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 92.73500 5.99e-17 89.61936 95.85065
-## k_parent_sink 0.00258 2.42e-09 0.00223 0.00299
-## sigma 3.41172 7.07e-05 2.05455 4.76888
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 92.73500 5.99e-17 89.61936 95.85065
+## k_parent 0.00258 2.42e-09 0.00223 0.00299
+## sigma 3.41172 7.07e-05 2.05455 4.76888
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 91.6016 6.34e-16 88.53086 94.672
-## k__iore_parent_sink 0.0396 2.36e-01 0.00207 0.759
-## N_parent 0.3541 1.46e-01 -0.35153 1.060
-## sigma 3.0811 9.64e-05 1.84296 4.319
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 91.6016 6.34e-16 88.53086 94.672
+## k__iore_parent 0.0396 2.36e-01 0.00207 0.759
+## N_parent 0.3541 1.46e-01 -0.35153 1.060
+## sigma 3.0811 9.64e-05 1.84296 4.319
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
## parent_0 92.73500 9.25e-15 8.95e+01 9.59e+01
-## k1 0.00258 4.28e-01 1.70e-08 3.92e+02
+## k1 0.00258 4.28e-01 1.45e-08 4.61e+02
## k2 0.00258 3.69e-08 2.20e-03 3.03e-03
-## g 0.00442 5.00e-01 NA NA
+## g 0.00442 5.00e-01 0.00e+00 1.00e+00
## sigma 3.41172 1.35e-04 2.02e+00 4.80e+00
##
##
@@ -741,16 +732,16 @@
<div id="dt50-not-observed-in-the-study-and-dfop-problems-in-pestdf" class="section level1">
<h1 class="hasAnchor">
<a href="#dt50-not-observed-in-the-study-and-dfop-problems-in-pestdf" class="anchor"></a>DT50 not observed in the study and DFOP problems in PestDF</h1>
-<div class="sourceCode" id="cb88"><html><body><pre class="r"><span class="no">p14</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p14"</span>]])</pre></body></html></div>
+<div class="sourceCode" id="cb81"><html><body><pre class="r"><span class="no">p14</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p14"</span>]])</pre></body></html></div>
<pre><code>## Warning in sqrt(diag(covar)): NaNs produced</code></pre>
<pre><code>## Warning in sqrt(1/diag(V)): NaNs produced</code></pre>
<pre><code>## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
## doubtful</code></pre>
<pre><code>## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</code></pre>
<pre><code>## The half-life obtained from the IORE model may be used</code></pre>
-<div class="sourceCode" id="cb94"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p14</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb87"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p14</span>)</pre></body></html></div>
<p><img src="NAFTA_examples_files/figure-html/p14-1.png" width="700"></p>
-<div class="sourceCode" id="cb95"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p14</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb88"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p14</span>)</pre></body></html></div>
<pre><code>## Sums of squares:
## SFO IORE DFOP
## 48.43249 28.67746 27.26248
@@ -760,23 +751,23 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 99.47124 2.06e-30 98.42254 1.01e+02
-## k_parent_sink 0.00279 3.75e-15 0.00256 3.04e-03
-## sigma 1.55616 3.81e-06 1.03704 2.08e+00
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 99.47124 2.06e-30 98.42254 1.01e+02
+## k_parent 0.00279 3.75e-15 0.00256 3.04e-03
+## sigma 1.55616 3.81e-06 1.03704 2.08e+00
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 1.00e+02 NA NaN NaN
-## k__iore_parent_sink 9.44e-08 NA NaN NaN
-## N_parent 3.31e+00 NA NaN NaN
-## sigma 1.20e+00 NA 0.796 1.6
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 1.00e+02 NA NaN NaN
+## k__iore_parent 9.44e-08 NA NaN NaN
+## N_parent 3.31e+00 NA NaN NaN
+## sigma 1.20e+00 NA 0.796 1.6
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
## parent_0 1.00e+02 2.96e-28 99.40280 101.2768
## k1 9.53e-03 1.20e-01 0.00638 0.0143
-## k2 7.29e-12 5.00e-01 0.00000 Inf
+## k2 7.70e-12 5.00e-01 0.00000 Inf
## g 3.98e-01 2.19e-01 0.30481 0.4998
## sigma 1.17e+00 7.68e-06 0.77406 1.5610
##
@@ -785,7 +776,7 @@
## DT50 DT90 DT50_rep
## SFO 2.48e+02 8.25e+02 2.48e+02
## IORE 4.34e+02 2.22e+04 6.70e+03
-## DFOP 2.54e+10 2.46e+11 9.51e+10
+## DFOP 2.41e+10 2.33e+11 9.00e+10
##
## Representative half-life:
## [1] 6697.44</code></pre>
@@ -794,17 +785,16 @@
<div id="n-is-less-than-1-and-dfop-fraction-parameter-is-below-zero" class="section level1">
<h1 class="hasAnchor">
<a href="#n-is-less-than-1-and-dfop-fraction-parameter-is-below-zero" class="anchor"></a>N is less than 1 and DFOP fraction parameter is below zero</h1>
-<div class="sourceCode" id="cb97"><html><body><pre class="r"><span class="no">p15a</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p15a"</span>]])</pre></body></html></div>
+<div class="sourceCode" id="cb90"><html><body><pre class="r"><span class="no">p15a</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p15a"</span>]])</pre></body></html></div>
<pre><code>## Warning in sqrt(diag(covar)): NaNs produced</code></pre>
-<pre><code>## Warning in sqrt(diag(covar_notrans)): NaNs produced</code></pre>
<pre><code>## Warning in sqrt(1/diag(V)): NaNs produced</code></pre>
<pre><code>## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
## doubtful</code></pre>
<pre><code>## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</code></pre>
<pre><code>## The half-life obtained from the IORE model may be used</code></pre>
-<div class="sourceCode" id="cb104"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p15a</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb96"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p15a</span>)</pre></body></html></div>
<p><img src="NAFTA_examples_files/figure-html/p15a-1.png" width="700"></p>
-<div class="sourceCode" id="cb105"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p15a</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb97"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p15a</span>)</pre></body></html></div>
<pre><code>## Sums of squares:
## SFO IORE DFOP
## 245.5248 135.0132 245.5248
@@ -814,25 +804,25 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 97.96751 2.00e-15 94.32049 101.615
-## k_parent_sink 0.00952 4.93e-09 0.00824 0.011
-## sigma 4.18778 1.28e-04 2.44588 5.930
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 97.96751 2.00e-15 94.32049 101.615
+## k_parent 0.00952 4.93e-09 0.00824 0.011
+## sigma 4.18778 1.28e-04 2.44588 5.930
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 95.874 2.94e-15 92.937 98.811
-## k__iore_parent_sink 0.629 2.11e-01 0.044 8.982
-## N_parent 0.000 5.00e-01 -0.642 0.642
-## sigma 3.105 1.78e-04 1.795 4.416
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 95.874 2.94e-15 92.937 98.811
+## k__iore_parent 0.629 2.11e-01 0.044 8.982
+## N_parent 0.000 5.00e-01 -0.642 0.642
+## sigma 3.105 1.78e-04 1.795 4.416
##
## $DFOP
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 97.96752 2.85e-13 94.21914 101.7159
-## k1 0.00952 6.80e-02 0.00277 0.0327
-## k2 0.00952 3.82e-06 0.00902 0.0100
-## g 0.17247 NaN NA NA
-## sigma 4.18778 2.50e-04 2.39747 5.9781
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 97.96752 NA 94.21914 101.7159
+## k1 0.00952 NA 0.00241 0.0377
+## k2 0.00952 NA 0.00747 0.0121
+## g 0.17247 NA NA NA
+## sigma 4.18778 NA 2.39747 5.9781
##
##
## DTx values:
@@ -843,16 +833,16 @@
##
## Representative half-life:
## [1] 41.33</code></pre>
-<div class="sourceCode" id="cb107"><html><body><pre class="r"><span class="no">p15b</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p15b"</span>]])</pre></body></html></div>
+<div class="sourceCode" id="cb99"><html><body><pre class="r"><span class="no">p15b</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p15b"</span>]])</pre></body></html></div>
<pre><code>## Warning in sqrt(diag(covar)): NaNs produced</code></pre>
<pre><code>## Warning in sqrt(1/diag(V)): NaNs produced</code></pre>
<pre><code>## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
## doubtful</code></pre>
<pre><code>## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</code></pre>
<pre><code>## The half-life obtained from the IORE model may be used</code></pre>
-<div class="sourceCode" id="cb113"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p15b</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb105"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p15b</span>)</pre></body></html></div>
<p><img src="NAFTA_examples_files/figure-html/p15b-1.png" width="700"></p>
-<div class="sourceCode" id="cb114"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p15b</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb106"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p15b</span>)</pre></body></html></div>
<pre><code>## Sums of squares:
## SFO IORE DFOP
## 106.91629 68.55574 106.91629
@@ -862,25 +852,25 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 1.01e+02 3.06e-17 98.31594 1.03e+02
-## k_parent_sink 4.86e-03 2.48e-10 0.00435 5.42e-03
-## sigma 2.76e+00 1.28e-04 1.61402 3.91e+00
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 1.01e+02 3.06e-17 98.31594 1.03e+02
+## k_parent 4.86e-03 2.48e-10 0.00435 5.42e-03
+## sigma 2.76e+00 1.28e-04 1.61402 3.91e+00
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 99.83 1.81e-16 97.51349 102.14
-## k__iore_parent_sink 0.38 3.22e-01 0.00352 41.05
-## N_parent 0.00 5.00e-01 -1.07695 1.08
-## sigma 2.21 2.57e-04 1.23245 3.19
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 99.83 1.81e-16 97.51348 102.14
+## k__iore_parent 0.38 3.22e-01 0.00352 41.05
+## N_parent 0.00 5.00e-01 -1.07696 1.08
+## sigma 2.21 2.57e-04 1.23245 3.19
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
-## parent_0 1.01e+02 NA 9.82e+01 1.04e+02
-## k1 4.86e-03 NA 6.75e-04 3.49e-02
-## k2 4.86e-03 NA 3.37e-03 6.99e-03
+## parent_0 1.01e+02 NA 98.24464 1.04e+02
+## k1 4.86e-03 NA 0.00068 3.47e-02
+## k2 4.86e-03 NA 0.00338 6.99e-03
## g 1.50e-01 NA NA NA
-## sigma 2.76e+00 NA 1.58e+00 3.94e+00
+## sigma 2.76e+00 NA 1.58208 3.94e+00
##
##
## DTx values:
@@ -896,14 +886,14 @@
<div id="the-dfop-fraction-parameter-is-greater-than-1" class="section level1">
<h1 class="hasAnchor">
<a href="#the-dfop-fraction-parameter-is-greater-than-1" class="anchor"></a>The DFOP fraction parameter is greater than 1</h1>
-<div class="sourceCode" id="cb116"><html><body><pre class="r"><span class="no">p16</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p16"</span>]])</pre></body></html></div>
+<div class="sourceCode" id="cb108"><html><body><pre class="r"><span class="no">p16</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/nafta.html">nafta</a></span>(<span class="no">NAFTA_SOP_Attachment</span><span class="kw">[[</span><span class="st">"p16"</span>]])</pre></body></html></div>
<pre><code>## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</code></pre>
<pre><code>## The representative half-life of the IORE model is longer than the one corresponding</code></pre>
<pre><code>## to the terminal degradation rate found with the DFOP model.</code></pre>
<pre><code>## The representative half-life obtained from the DFOP model may be used</code></pre>
-<div class="sourceCode" id="cb121"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p16</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb113"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/plot.html">plot</a></span>(<span class="no">p16</span>)</pre></body></html></div>
<p><img src="NAFTA_examples_files/figure-html/p16-1.png" width="700"></p>
-<div class="sourceCode" id="cb122"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p16</span>)</pre></body></html></div>
+<div class="sourceCode" id="cb114"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="no">p16</span>)</pre></body></html></div>
<pre><code>## Sums of squares:
## SFO IORE DFOP
## 3831.804 2062.008 1550.980
@@ -913,22 +903,22 @@
##
## Parameters:
## $SFO
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 71.953 2.33e-13 60.509 83.40
-## k_parent_sink 0.159 4.86e-05 0.102 0.25
-## sigma 11.302 1.25e-08 8.308 14.30
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 71.953 2.33e-13 60.509 83.40
+## k_parent 0.159 4.86e-05 0.102 0.25
+## sigma 11.302 1.25e-08 8.308 14.30
##
## $IORE
-## Estimate Pr(&gt;t) Lower Upper
-## parent_0 8.74e+01 2.48e-16 7.72e+01 97.52972
-## k__iore_parent_sink 4.55e-04 2.16e-01 3.48e-05 0.00595
-## N_parent 2.70e+00 1.21e-08 1.99e+00 3.40046
-## sigma 8.29e+00 1.61e-08 6.09e+00 10.49062
+## Estimate Pr(&gt;t) Lower Upper
+## parent_0 8.74e+01 2.48e-16 7.72e+01 97.52972
+## k__iore_parent 4.55e-04 2.16e-01 3.48e-05 0.00595
+## N_parent 2.70e+00 1.21e-08 1.99e+00 3.40046
+## sigma 8.29e+00 1.61e-08 6.09e+00 10.49062
##
## $DFOP
## Estimate Pr(&gt;t) Lower Upper
## parent_0 88.5333 7.40e-18 79.9836 97.083
-## k1 18.5561 5.00e-01 0.0000 Inf
+## k1 18.5560 5.00e-01 0.0000 Inf
## k2 0.0776 1.41e-05 0.0518 0.116
## g 0.4733 1.41e-09 0.3674 0.582
## sigma 7.1902 2.11e-08 5.2785 9.102
diff --git a/docs/dev/articles/web_only/benchmarks.html b/docs/dev/articles/web_only/benchmarks.html
index 9e53f113..30b7a879 100644
--- a/docs/dev/articles/web_only/benchmarks.html
+++ b/docs/dev/articles/web_only/benchmarks.html
@@ -101,7 +101,7 @@
<h1 data-toc-skip>Benchmark timings for mkin</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2020-05-27</h4>
+ <h4 class="date">2020-10-08</h4>
<small class="dont-index">Source: <a href="http://github.com/jranke/mkin/blob/master/vignettes/web_only/benchmarks.rmd"><code>vignettes/web_only/benchmarks.rmd</code></a></small>
<div class="hidden name"><code>benchmarks.rmd</code></div>
@@ -132,13 +132,20 @@
<span class="no">DFOP_SFO</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/mkinmod.html">mkinmod</a></span>(
<span class="kw">parent</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"FOMC"</span>, <span class="st">"m1"</span>),
<span class="kw">m1</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>))
-<span class="no">t3</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_SFO</span>, <span class="no">FOMC_SFO</span>, <span class="no">DFOP_SFO</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">FOCUS_D</span>)))<span class="kw">[[</span><span class="st">"elapsed"</span>]]
-<span class="no">t4</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_SFO</span>, <span class="no">FOMC_SFO</span>, <span class="no">DFOP_SFO</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">FOCUS_D</span>),
+<span class="no">t3</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_SFO</span>, <span class="no">FOMC_SFO</span>, <span class="no">DFOP_SFO</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">FOCUS_D</span>)))<span class="kw">[[</span><span class="st">"elapsed"</span>]]</pre></body></html></div>
+<pre><code>## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...):
+## Shapiro-Wilk test for standardized residuals: p = 0.0165</code></pre>
+<pre><code>## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...):
+## Shapiro-Wilk test for standardized residuals: p = 0.0499
+
+## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...):
+## Shapiro-Wilk test for standardized residuals: p = 0.0499</code></pre>
+<div class="sourceCode" id="cb5"><html><body><pre class="r"><span class="no">t4</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_SFO</span>, <span class="no">FOMC_SFO</span>, <span class="no">DFOP_SFO</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">FOCUS_D</span>),
<span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"tc"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]]
<span class="no">t5</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_SFO</span>, <span class="no">FOMC_SFO</span>, <span class="no">DFOP_SFO</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">FOCUS_D</span>),
<span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"obs"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]]</pre></body></html></div>
<p>Two metabolites, synthetic data:</p>
-<div class="sourceCode" id="cb3"><html><body><pre class="r"><span class="no">m_synth_SFO_lin</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/mkinmod.html">mkinmod</a></span>(<span class="kw">parent</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"M1"</span>),
+<div class="sourceCode" id="cb6"><html><body><pre class="r"><span class="no">m_synth_SFO_lin</span> <span class="kw">&lt;-</span> <span class="fu"><a href="../../reference/mkinmod.html">mkinmod</a></span>(<span class="kw">parent</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"M1"</span>),
<span class="kw">M1</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"M2"</span>),
<span class="kw">M2</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>),
<span class="kw">use_of_ff</span> <span class="kw">=</span> <span class="st">"max"</span>, <span class="kw">quiet</span> <span class="kw">=</span> <span class="fl">TRUE</span>)
@@ -153,9 +160,10 @@
<span class="no">DFOP_par_c</span> <span class="kw">&lt;-</span> <span class="no">synthetic_data_for_UBA_2014</span><span class="kw">[[</span><span class="fl">12</span>]]$<span class="no">data</span>
<span class="no">t6</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_SFO_lin</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_lin_a</span>)))<span class="kw">[[</span><span class="st">"elapsed"</span>]]
-<span class="no">t7</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_DFOP_par</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">DFOP_par_c</span>)))<span class="kw">[[</span><span class="st">"elapsed"</span>]]
-
-<span class="no">t8</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_SFO_lin</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_lin_a</span>),
+<span class="no">t7</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_DFOP_par</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">DFOP_par_c</span>)))<span class="kw">[[</span><span class="st">"elapsed"</span>]]</pre></body></html></div>
+<pre><code>## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...):
+## Shapiro-Wilk test for standardized residuals: p = 0.000174</code></pre>
+<div class="sourceCode" id="cb8"><html><body><pre class="r"><span class="no">t8</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_SFO_lin</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_lin_a</span>),
<span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"tc"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]]
<span class="no">t9</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_DFOP_par</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">DFOP_par_c</span>),
<span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"tc"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]]
@@ -164,7 +172,7 @@
<span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"obs"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]]
<span class="no">t11</span> <span class="kw">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_DFOP_par</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">DFOP_par_c</span>),
<span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"obs"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]]</pre></body></html></div>
-<div class="sourceCode" id="cb4"><html><body><pre class="r"><span class="no">mkin_benchmarks</span>[<span class="no">system_string</span>, <span class="fu"><a href="https://rdrr.io/r/base/paste.html">paste0</a></span>(<span class="st">"t"</span>, <span class="fl">1</span>:<span class="fl">11</span>)] <span class="kw">&lt;-</span>
+<div class="sourceCode" id="cb9"><html><body><pre class="r"><span class="no">mkin_benchmarks</span>[<span class="no">system_string</span>, <span class="fu"><a href="https://rdrr.io/r/base/paste.html">paste0</a></span>(<span class="st">"t"</span>, <span class="fl">1</span>:<span class="fl">11</span>)] <span class="kw">&lt;-</span>
<span class="fu"><a href="https://rdrr.io/r/base/c.html">c</a></span>(<span class="no">t1</span>, <span class="no">t2</span>, <span class="no">t3</span>, <span class="no">t4</span>, <span class="no">t5</span>, <span class="no">t6</span>, <span class="no">t7</span>, <span class="no">t8</span>, <span class="no">t9</span>, <span class="no">t10</span>, <span class="no">t11</span>)
<span class="fu"><a href="https://rdrr.io/r/base/save.html">save</a></span>(<span class="no">mkin_benchmarks</span>, <span class="kw">file</span> <span class="kw">=</span> <span class="st">"~/git/mkin/vignettes/web_only/mkin_benchmarks.rda"</span>)</pre></body></html></div>
</div>
@@ -216,8 +224,8 @@
</tr>
<tr class="odd">
<td align="left">0.9.50.3</td>
-<td align="right">1.746</td>
-<td align="right">3.716</td>
+<td align="right">1.707</td>
+<td align="right">4.062</td>
</tr>
</tbody>
</table>
@@ -272,9 +280,9 @@
</tr>
<tr class="odd">
<td align="left">0.9.50.3</td>
-<td align="right">1.385</td>
-<td align="right">6.562</td>
-<td align="right">2.736</td>
+<td align="right">1.372</td>
+<td align="right">6.233</td>
+<td align="right">2.779</td>
</tr>
</tbody>
</table>
@@ -350,12 +358,12 @@
</tr>
<tr class="odd">
<td align="left">0.9.50.3</td>
-<td align="right">0.760</td>
-<td align="right">1.226</td>
-<td align="right">1.455</td>
-<td align="right">4.198</td>
-<td align="right">2.007</td>
-<td align="right">2.976</td>
+<td align="right">0.768</td>
+<td align="right">1.235</td>
+<td align="right">1.302</td>
+<td align="right">2.921</td>
+<td align="right">2.078</td>
+<td align="right">3.040</td>
</tr>
</tbody>
</table>
diff --git a/docs/dev/articles/web_only/compiled_models.html b/docs/dev/articles/web_only/compiled_models.html
index 997e90ea..055d0646 100644
--- a/docs/dev/articles/web_only/compiled_models.html
+++ b/docs/dev/articles/web_only/compiled_models.html
@@ -101,7 +101,7 @@
<h1 data-toc-skip>Performance benefit by using compiled model definitions in mkin</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2020-05-27</h4>
+ <h4 class="date">2020-10-08</h4>
<small class="dont-index">Source: <a href="http://github.com/jranke/mkin/blob/master/vignettes/web_only/compiled_models.rmd"><code>vignettes/web_only/compiled_models.rmd</code></a></small>
<div class="hidden name"><code>compiled_models.rmd</code></div>
@@ -153,10 +153,10 @@
<span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="st">"R package rbenchmark is not available"</span>)
}</pre></body></html></div>
<pre><code>## test replications relative elapsed
-## 4 analytical 1 1.000 0.201
-## 3 deSolve, compiled 1 1.711 0.344
-## 2 Eigenvalue based 1 1.960 0.394
-## 1 deSolve, not compiled 1 39.881 8.016</code></pre>
+## 4 analytical 1 1.000 0.195
+## 3 deSolve, compiled 1 1.769 0.345
+## 2 Eigenvalue based 1 2.087 0.407
+## 1 deSolve, not compiled 1 42.656 8.318</code></pre>
<p>We see that using the compiled model is by more than a factor of 10 faster than using deSolve without compiled code.</p>
</div>
<div id="model-without-analytical-solution" class="section level2">
@@ -182,11 +182,11 @@
}</pre></body></html></div>
<pre><code>## Successfully compiled differential equation model from auto-generated C code.</code></pre>
<pre><code>## test replications relative elapsed
-## 2 deSolve, compiled 1 1.000 0.467
-## 1 deSolve, not compiled 1 30.244 14.124</code></pre>
-<p>Here we get a performance benefit of a factor of 30 using the version of the differential equation model compiled from C code!</p>
+## 2 deSolve, compiled 1 1.000 0.474
+## 1 deSolve, not compiled 1 30.909 14.651</code></pre>
+<p>Here we get a performance benefit of a factor of 31 using the version of the differential equation model compiled from C code!</p>
<p>This vignette was built with mkin 0.9.50.3 on</p>
-<pre><code>## R version 4.0.0 (2020-04-24)
+<pre><code>## R version 4.0.2 (2020-06-22)
## Platform: x86_64-pc-linux-gnu (64-bit)
## Running under: Debian GNU/Linux 10 (buster)</code></pre>
<pre><code>## CPU model: AMD Ryzen 7 1700 Eight-Core Processor</code></pre>

Contact - Imprint