diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2019-06-04 15:09:28 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2019-06-04 15:09:28 +0200 |
| commit | 95178837d3f91e84837628446b5fd468179af2b9 (patch) | |
| tree | 8b162d5a22b28b59ca9c6bb27bf8f9dfbeaefbae /docs/articles/web_only | |
| parent | 9a96391589fef9f80f9c6c4881cc48a509cb75f2 (diff) | |
Additional algorithm "d_c", more tests, docs
The new algorithm tries direct optimization of the likelihood, as well
as a three step procedure. In this way, we consistently get the
model with the highest likelihood for SFO, DFOP and HS for all 12
new test datasets.
Diffstat (limited to 'docs/articles/web_only')
31 files changed, 138 insertions, 131 deletions
diff --git a/docs/articles/web_only/FOCUS_Z.html b/docs/articles/web_only/FOCUS_Z.html index 9184fad5..555400df 100644 --- a/docs/articles/web_only/FOCUS_Z.html +++ b/docs/articles/web_only/FOCUS_Z.html @@ -30,7 +30,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.9.49.4</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.9.49.5</span> </span> </div> @@ -88,7 +88,7 @@ <h1>Example evaluation of FOCUS dataset Z</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2019-05-08</h4> + <h4 class="date">2019-06-04</h4> <div class="hidden name"><code>FOCUS_Z.Rmd</code></div> @@ -377,7 +377,7 @@ </div> <div class="pkgdown"> - <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p> + <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p> </div> </footer> </div> diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png Binary files differindex 0880ca60..471db177 100644 --- a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png +++ b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png Binary files differindex 1a92365e..3c983f21 100644 --- a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png +++ b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png Binary files differindex debf3cb8..0e0a78a9 100644 --- a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png +++ b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png Binary files differindex 89020a0a..d7dd85a5 100644 --- a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png +++ b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png Binary files differindex 8188c4cf..7764f4e2 100644 --- a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png +++ b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png Binary files differindex 8e13b498..d24b8a40 100644 --- a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png +++ b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png Binary files differindex 7d490baa..dd8c1e0a 100644 --- a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png +++ b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png Binary files differindex 4916ee4d..45a32027 100644 --- a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png +++ b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png Binary files differindex a11e0092..18832ed2 100644 --- a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png +++ b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png Binary files differindex 292c0690..0d3b4d1a 100644 --- a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png +++ b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png Binary files differindex acd197f2..898e6190 100644 --- a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png +++ b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png diff --git a/docs/articles/web_only/NAFTA_examples.html b/docs/articles/web_only/NAFTA_examples.html index 4d9e9b2d..7f3cc76b 100644 --- a/docs/articles/web_only/NAFTA_examples.html +++ b/docs/articles/web_only/NAFTA_examples.html @@ -30,7 +30,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.9.49.4</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.9.49.5</span> </span> </div> @@ -88,7 +88,7 @@ <h1>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">2019-05-08</h4> + <h4 class="date">2019-06-04</h4> <div class="hidden name"><code>NAFTA_examples.Rmd</code></div> @@ -308,16 +308,11 @@ <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"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb25-1" title="1">p8 <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p8"</span>]], <span class="dt">parms.ini =</span> <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/c">c</a></span>(<span class="dt">k__iore_parent_sink =</span> <span class="fl">1e-3</span>))</a></code></pre></div> -<pre><code>## Warning in summary.mkinfit(x): Could not calculate correlation; no -## covariance matrix - -## 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="cb29"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb29-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p8)</a></code></pre></div> +<div class="sourceCode" id="cb28"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb28-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p8)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p8-1.png" width="700"></p> -<div class="sourceCode" id="cb30"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb30-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p8)</a></code></pre></div> +<div class="sourceCode" id="cb29"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb29-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p8)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 1996.9408 444.9237 547.5616 @@ -327,11 +322,10 @@ ## ## Parameters: ## $SFO -## Estimate Pr(>t) Lower Upper -## parent_0 88.16549 NA NA NA -## k__iore_parent_sink 0.00100 NA NA NA -## k_parent_sink 0.00803 NA NA NA -## sigma 7.44786 NA NA NA +## Estimate Pr(>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 ## ## $IORE ## Estimate Pr(>t) Lower Upper @@ -341,13 +335,12 @@ ## sigma 3.52e+00 5.36e-10 2.67e+00 4.36e+00 ## ## $DFOP -## Estimate Pr(>t) Lower Upper -## parent_0 95.70619 NA NA NA -## k__iore_parent_sink 0.00100 NA NA NA -## k1 0.02500 NA NA NA -## k2 0.00273 NA NA NA -## g 0.58835 NA NA NA -## sigma 3.90001 NA NA NA +## Estimate Pr(>t) Lower Upper +## parent_0 95.70619 8.99e-32 91.87941 99.53298 +## k1 0.02500 5.25e-04 0.01422 0.04394 +## k2 0.00273 6.84e-03 0.00125 0.00597 +## g 0.58835 2.84e-06 0.36595 0.77970 +## sigma 3.90001 6.94e-10 2.96260 4.83741 ## ## ## DTx values: @@ -366,12 +359,12 @@ <div id="example-on-page-9-upper-panel" class="section level2"> <h2 class="hasAnchor"> <a href="#example-on-page-9-upper-panel" class="anchor"></a>Example on page 9, upper panel</h2> -<div class="sourceCode" id="cb32"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb32-1" title="1">p9a <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p9a"</span>]])</a></code></pre></div> +<div class="sourceCode" id="cb31"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb31-1" title="1">p9a <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p9a"</span>]])</a></code></pre></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="cb35"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb35-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p9a)</a></code></pre></div> +<div class="sourceCode" id="cb34"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb34-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p9a)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p9a-1.png" width="700"></p> -<div class="sourceCode" id="cb36"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb36-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p9a)</a></code></pre></div> +<div class="sourceCode" id="cb35"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb35-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p9a)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 839.35238 88.57064 9.93363 @@ -415,7 +408,7 @@ <div id="example-on-page-9-lower-panel" class="section level2"> <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="cb38"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb38-1" title="1">p9b <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p9b"</span>]])</a></code></pre></div> +<div class="sourceCode" id="cb37"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb37-1" title="1">p9b <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p9b"</span>]])</a></code></pre></div> <pre><code>## Warning in sqrt(diag(covar)): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in sqrt(diag(covar_notrans)): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in sqrt(1/diag(V)): NaNs wurden erzeugt</code></pre> @@ -423,9 +416,9 @@ ## 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="cb45"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb45-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p9b)</a></code></pre></div> +<div class="sourceCode" id="cb44"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb44-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p9b)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p9b-1.png" width="700"></p> -<div class="sourceCode" id="cb46"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb46-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p9b)</a></code></pre></div> +<div class="sourceCode" id="cb45"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb45-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p9b)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 35.64867 23.22334 35.64867 @@ -469,12 +462,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="cb48"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb48-1" title="1">p10 <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p10"</span>]])</a></code></pre></div> +<div class="sourceCode" id="cb47"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb47-1" title="1">p10 <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p10"</span>]])</a></code></pre></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="cb51"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb51-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p10)</a></code></pre></div> +<div class="sourceCode" id="cb50"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb50-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p10)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p10-1.png" width="700"></p> -<div class="sourceCode" id="cb52"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb52-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p10)</a></code></pre></div> +<div class="sourceCode" id="cb51"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb51-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p10)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 899.4089 336.4348 899.4089 @@ -522,12 +515,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="cb54"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb54-1" title="1">p11 <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p11"</span>]])</a></code></pre></div> +<div class="sourceCode" id="cb53"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb53-1" title="1">p11 <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p11"</span>]])</a></code></pre></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="cb57"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb57-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p11)</a></code></pre></div> +<div class="sourceCode" id="cb56"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb56-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p11)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p11-1.png" width="700"></p> -<div class="sourceCode" id="cb58"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb58-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p11)</a></code></pre></div> +<div class="sourceCode" id="cb57"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb57-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p11)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 579.6805 204.7932 144.7783 @@ -576,14 +569,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="cb60"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb60-1" title="1">p12a <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p12a"</span>]])</a></code></pre></div> +<div class="sourceCode" id="cb59"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb59-1" title="1">p12a <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p12a"</span>]])</a></code></pre></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="cb64"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb64-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p12a)</a></code></pre></div> +<div class="sourceCode" id="cb63"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb63-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p12a)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p12a-1.png" width="700"></p> -<div class="sourceCode" id="cb65"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb65-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p12a)</a></code></pre></div> +<div class="sourceCode" id="cb64"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb64-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p12a)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 695.4440 220.0685 695.4440 @@ -626,7 +619,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="cb67"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb67-1" title="1">p12b <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p12b"</span>]])</a></code></pre></div> +<div class="sourceCode" id="cb66"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb66-1" title="1">p12b <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p12b"</span>]])</a></code></pre></div> <pre><code>## Warning in sqrt(diag(covar)): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in qt(alpha/2, rdf): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in qt(1 - alpha/2, rdf): NaNs wurden erzeugt</code></pre> @@ -637,9 +630,9 @@ ## 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="cb77"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb77-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p12b)</a></code></pre></div> +<div class="sourceCode" id="cb76"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb76-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p12b)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p12b-1.png" width="700"></p> -<div class="sourceCode" id="cb78"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb78-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p12b)</a></code></pre></div> +<div class="sourceCode" id="cb77"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb77-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p12b)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 58.90242 19.06353 58.90242 @@ -682,16 +675,16 @@ <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="cb80"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb80-1" title="1">p13 <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p13"</span>]])</a></code></pre></div> +<div class="sourceCode" id="cb79"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb79-1" title="1">p13 <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p13"</span>]])</a></code></pre></div> <pre><code>## Warning in sqrt(diag(covar)): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in sqrt(1/diag(V)): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in cov2cor(ans$cov.unscaled): 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="cb86"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb86-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p13)</a></code></pre></div> +<div class="sourceCode" id="cb85"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb85-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p13)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p13-1.png" width="700"></p> -<div class="sourceCode" id="cb87"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb87-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p13)</a></code></pre></div> +<div class="sourceCode" id="cb86"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb86-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p13)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 174.5971 142.3951 174.5971 @@ -735,16 +728,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="cb89"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb89-1" title="1">p14 <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p14"</span>]])</a></code></pre></div> +<div class="sourceCode" id="cb88"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb88-1" title="1">p14 <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p14"</span>]])</a></code></pre></div> <pre><code>## Warning in sqrt(diag(covar)): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in sqrt(1/diag(V)): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in cov2cor(ans$cov.unscaled): 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="cb95"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb95-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p14)</a></code></pre></div> +<div class="sourceCode" id="cb94"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb94-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p14)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p14-1.png" width="700"></p> -<div class="sourceCode" id="cb96"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb96-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p14)</a></code></pre></div> +<div class="sourceCode" id="cb95"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb95-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p14)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 48.43249 28.67746 27.26248 @@ -788,7 +781,7 @@ <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="cb98"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb98-1" title="1">p15a <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p15a"</span>]])</a></code></pre></div> +<div class="sourceCode" id="cb97"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb97-1" title="1">p15a <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p15a"</span>]])</a></code></pre></div> <pre><code>## Warning in sqrt(diag(covar)): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in sqrt(diag(covar_notrans)): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in sqrt(1/diag(V)): NaNs wurden erzeugt</code></pre> @@ -796,9 +789,9 @@ ## 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="cb105"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb105-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p15a)</a></code></pre></div> +<div class="sourceCode" id="cb104"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb104-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p15a)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p15a-1.png" width="700"></p> -<div class="sourceCode" id="cb106"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb106-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p15a)</a></code></pre></div> +<div class="sourceCode" id="cb105"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb105-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p15a)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 245.5248 135.0132 245.5248 @@ -837,16 +830,16 @@ ## ## Representative half-life: ## [1] 41.33</code></pre> -<div class="sourceCode" id="cb108"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb108-1" title="1">p15b <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p15b"</span>]])</a></code></pre></div> +<div class="sourceCode" id="cb107"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb107-1" title="1">p15b <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p15b"</span>]])</a></code></pre></div> <pre><code>## Warning in sqrt(diag(covar)): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in sqrt(1/diag(V)): NaNs wurden erzeugt</code></pre> <pre><code>## Warning in cov2cor(ans$cov.unscaled): 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="cb114"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb114-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p15b)</a></code></pre></div> +<div class="sourceCode" id="cb113"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb113-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p15b)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p15b-1.png" width="700"></p> -<div class="sourceCode" id="cb115"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb115-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p15b)</a></code></pre></div> +<div class="sourceCode" id="cb114"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb114-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p15b)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 106.91629 68.55574 106.91629 @@ -890,14 +883,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="cb117"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb117-1" title="1">p16 <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p16"</span>]])</a></code></pre></div> +<div class="sourceCode" id="cb116"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb116-1" title="1">p16 <-<span class="st"> </span><span class="kw"><a href="../../reference/nafta.html">nafta</a></span>(NAFTA_SOP_Attachment[[<span class="st">"p16"</span>]])</a></code></pre></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="cb122"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb122-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p16)</a></code></pre></div> +<div class="sourceCode" id="cb121"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb121-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(p16)</a></code></pre></div> <p><img src="NAFTA_examples_files/figure-html/p16-1.png" width="700"></p> -<div class="sourceCode" id="cb123"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb123-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p16)</a></code></pre></div> +<div class="sourceCode" id="cb122"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb122-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/print">print</a></span>(p16)</a></code></pre></div> <pre><code>## Sums of squares: ## SFO IORE DFOP ## 3831.804 2062.008 1550.980 @@ -1010,7 +1003,7 @@ </div> <div class="pkgdown"> - <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p> + <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p> </div> </footer> </div> diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png Binary files differindex f84439e8..291b48e1 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png Binary files differindex 2f659bca..149cf24c 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png Binary files differindex 0b7a5d9f..85ea5f4e 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png Binary files differindex e68c8c83..0ae354c4 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png Binary files differindex 3f92349c..d0f89858 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png Binary files differindex 396828c3..84b53d01 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png Binary files differindex 110d26dc..a09b2e3d 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png Binary files differindex 776aeb36..5a51714c 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png Binary files differindex f7bd1704..36999356 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png Binary files differindex ee8350cc..596a33b2 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png Binary files differindex fd3e94ee..e6f9716e 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png Binary files differindex 87a06b4b..f8576168 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png Binary files differindex 3d667442..ef5e72ed 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png Binary files differindex c47a10b5..fa8621e7 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png Binary files differindex 870d6b98..aac3600b 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png Binary files differindex 57bf4014..cb52aecd 100644 --- a/docs/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png +++ b/docs/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png diff --git a/docs/articles/web_only/benchmarks.html b/docs/articles/web_only/benchmarks.html index a53f1927..43f8d238 100644 --- a/docs/articles/web_only/benchmarks.html +++ b/docs/articles/web_only/benchmarks.html @@ -30,7 +30,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.9.49.4</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.9.49.5</span> </span> </div> @@ -88,7 +88,7 @@ <h1>Benchmark timings for mkin on various systems</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2019-05-08</h4> + <h4 class="date">2019-06-04</h4> <div class="hidden name"><code>benchmarks.Rmd</code></div> @@ -115,32 +115,32 @@ <a class="sourceLine" id="cb1-12" title="12">}</a></code></pre></div> <div class="sourceCode" id="cb2"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb2-1" title="1"><span class="co"># Parent only</span></a> <a class="sourceLine" id="cb2-2" title="2">t1 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/c">c</a></span>(<span class="st">"SFO"</span>, <span class="st">"FOMC"</span>, <span class="st">"DFOP"</span>, <span class="st">"HS"</span>), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(FOCUS_<span class="dv">2006</span>_C, FOCUS_<span class="dv">2006</span>_D)))[[<span class="st">"elapsed"</span>]]</a> -<a class="sourceLine" id="cb2-3" title="3">t2 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/c">c</a></span>(<span class="st">"SFO"</span>, <span class="st">"FOMC"</span>, <span class="st">"DFOP"</span>, <span class="st">"HS"</span>), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(FOCUS_<span class="dv">2006</span>_C, FOCUS_<span class="dv">2006</span>_D), <span class="dt">error_model =</span> <span class="st">"tc"</span>))[[<span class="st">"elapsed"</span>]]</a> -<a class="sourceLine" id="cb2-4" title="4"></a> -<a class="sourceLine" id="cb2-5" title="5"><span class="co"># One metabolite</span></a> -<a class="sourceLine" id="cb2-6" title="6">SFO_SFO <-<span class="st"> </span><span class="kw"><a href="../../reference/mkinmod.html">mkinmod</a></span>(</a> -<a class="sourceLine" id="cb2-7" title="7"> <span class="dt">parent =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"m1"</span>),</a> -<a class="sourceLine" id="cb2-8" title="8"> <span class="dt">m1 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>))</a></code></pre></div> +<a class="sourceLine" id="cb2-3" title="3">t2 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/c">c</a></span>(<span class="st">"SFO"</span>, <span class="st">"FOMC"</span>, <span class="st">"DFOP"</span>, <span class="st">"HS"</span>), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(FOCUS_<span class="dv">2006</span>_C, FOCUS_<span class="dv">2006</span>_D), <span class="dt">error_model =</span> <span class="st">"tc"</span>))[[<span class="st">"elapsed"</span>]]</a></code></pre></div> +<pre><code>## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): Optimisation did not converge: +## iteration limit reached without convergence (10)</code></pre> +<div class="sourceCode" id="cb4"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb4-1" title="1"><span class="co"># One metabolite</span></a> +<a class="sourceLine" id="cb4-2" title="2">SFO_SFO <-<span class="st"> </span><span class="kw"><a href="../../reference/mkinmod.html">mkinmod</a></span>(</a> +<a class="sourceLine" id="cb4-3" title="3"> <span class="dt">parent =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"m1"</span>),</a> +<a class="sourceLine" id="cb4-4" title="4"> <span class="dt">m1 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>))</a></code></pre></div> <pre><code>## Successfully compiled differential equation model from auto-generated C code.</code></pre> -<div class="sourceCode" id="cb4"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb4-1" title="1">FOMC_SFO <-<span class="st"> </span><span class="kw"><a href="../../reference/mkinmod.html">mkinmod</a></span>(</a> -<a class="sourceLine" id="cb4-2" title="2"> <span class="dt">parent =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"FOMC"</span>, <span class="st">"m1"</span>),</a> -<a class="sourceLine" id="cb4-3" title="3"> <span class="dt">m1 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>))</a></code></pre></div> -<pre><code>## Successfully compiled differential equation model from auto-generated C code.</code></pre> -<div class="sourceCode" id="cb6"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb6-1" title="1">DFOP_SFO <-<span class="st"> </span><span class="kw"><a href="../../reference/mkinmod.html">mkinmod</a></span>(</a> +<div class="sourceCode" id="cb6"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb6-1" title="1">FOMC_SFO <-<span class="st"> </span><span class="kw"><a href="../../reference/mkinmod.html">mkinmod</a></span>(</a> <a class="sourceLine" id="cb6-2" title="2"> <span class="dt">parent =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"FOMC"</span>, <span class="st">"m1"</span>),</a> <a class="sourceLine" id="cb6-3" title="3"> <span class="dt">m1 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>))</a></code></pre></div> <pre><code>## Successfully compiled differential equation model from auto-generated C code.</code></pre> -<div class="sourceCode" id="cb8"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb8-1" title="1">t3 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_SFO, FOMC_SFO, DFOP_SFO), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(FOCUS_<span class="dv">2006</span>_D)))[[<span class="st">"elapsed"</span>]]</a></code></pre></div> +<div class="sourceCode" id="cb8"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb8-1" title="1">DFOP_SFO <-<span class="st"> </span><span class="kw"><a href="../../reference/mkinmod.html">mkinmod</a></span>(</a> +<a class="sourceLine" id="cb8-2" title="2"> <span class="dt">parent =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"FOMC"</span>, <span class="st">"m1"</span>),</a> +<a class="sourceLine" id="cb8-3" title="3"> <span class="dt">m1 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>))</a></code></pre></div> +<pre><code>## Successfully compiled differential equation model from auto-generated C code.</code></pre> +<div class="sourceCode" id="cb10"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb10-1" title="1">t3 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_SFO, FOMC_SFO, DFOP_SFO), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(FOCUS_<span class="dv">2006</span>_D)))[[<span class="st">"elapsed"</span>]]</a></code></pre></div> +<pre><code>## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): +## Observations with value of zero were removed from the data</code></pre> <pre><code>## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): -## Observations with value of zero were removed from the data - -## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): ## Observations with value of zero were removed from the data ## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): ## Observations with value of zero were removed from the data</code></pre> -<div class="sourceCode" id="cb10"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb10-1" title="1">t4 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_SFO, FOMC_SFO, DFOP_SFO), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/subset">subset</a></span>(FOCUS_<span class="dv">2006</span>_D, value <span class="op">!=</span><span class="st"> </span><span class="dv">0</span>)), <span class="dt">error_model =</span> <span class="st">"tc"</span>))[[<span class="st">"elapsed"</span>]]</a> -<a class="sourceLine" id="cb10-2" title="2">t5 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_SFO, FOMC_SFO, DFOP_SFO), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(FOCUS_<span class="dv">2006</span>_D), <span class="dt">error_model =</span> <span class="st">"obs"</span>))[[<span class="st">"elapsed"</span>]]</a></code></pre></div> +<div class="sourceCode" id="cb13"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb13-1" title="1">t4 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_SFO, FOMC_SFO, DFOP_SFO), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/subset">subset</a></span>(FOCUS_<span class="dv">2006</span>_D, value <span class="op">!=</span><span class="st"> </span><span class="dv">0</span>)), <span class="dt">error_model =</span> <span class="st">"tc"</span>))[[<span class="st">"elapsed"</span>]]</a> +<a class="sourceLine" id="cb13-2" title="2">t5 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_SFO, FOMC_SFO, DFOP_SFO), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(FOCUS_<span class="dv">2006</span>_D), <span class="dt">error_model =</span> <span class="st">"obs"</span>))[[<span class="st">"elapsed"</span>]]</a></code></pre></div> <pre><code>## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): ## Observations with value of zero were removed from the data @@ -149,117 +149,131 @@ ## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): ## Observations with value of zero were removed from the data</code></pre> -<div class="sourceCode" id="cb12"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb12-1" title="1"><span class="co"># Two metabolites, synthetic data</span></a> -<a class="sourceLine" id="cb12-2" title="2">m_synth_SFO_lin <-<span class="st"> </span><span class="kw"><a href="../../reference/mkinmod.html">mkinmod</a></span>(<span class="dt">parent =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"M1"</span>),</a> -<a class="sourceLine" id="cb12-3" title="3"> <span class="dt">M1 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"M2"</span>),</a> -<a class="sourceLine" id="cb12-4" title="4"> <span class="dt">M2 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>),</a> -<a class="sourceLine" id="cb12-5" title="5"> <span class="dt">use_of_ff =</span> <span class="st">"max"</span>, <span class="dt">quiet =</span> <span class="ot">TRUE</span>)</a> -<a class="sourceLine" id="cb12-6" title="6"></a> -<a class="sourceLine" id="cb12-7" title="7">m_synth_DFOP_par <-<span class="st"> </span><span class="kw"><a href="../../reference/mkinmod.html">mkinmod</a></span>(<span class="dt">parent =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"DFOP"</span>, <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/c">c</a></span>(<span class="st">"M1"</span>, <span class="st">"M2"</span>)),</a> -<a class="sourceLine" id="cb12-8" title="8"> <span class="dt">M1 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>),</a> -<a class="sourceLine" id="cb12-9" title="9"> <span class="dt">M2 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>),</a> -<a class="sourceLine" id="cb12-10" title="10"> <span class="dt">use_of_ff =</span> <span class="st">"max"</span>, <span class="dt">quiet =</span> <span class="ot">TRUE</span>)</a> -<a class="sourceLine" id="cb12-11" title="11"></a> -<a class="sourceLine" id="cb12-12" title="12">SFO_lin_a <-<span class="st"> </span>synthetic_data_for_UBA_<span class="dv">2014</span>[[<span class="dv">1</span>]]<span class="op">$</span>data</a> -<a class="sourceLine" id="cb12-13" title="13"></a> -<a class="sourceLine" id="cb12-14" title="14">DFOP_par_c <-<span class="st"> </span>synthetic_data_for_UBA_<span class="dv">2014</span>[[<span class="dv">12</span>]]<span class="op">$</span>data</a> -<a class="sourceLine" id="cb12-15" title="15"></a> -<a class="sourceLine" id="cb12-16" title="16">t6 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_SFO_lin), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_lin_a)))[<span class="st">"elapsed"</span>]</a> -<a class="sourceLine" id="cb12-17" title="17">t7 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_DFOP_par), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(DFOP_par_c)))[<span class="st">"elapsed"</span>]</a> -<a class="sourceLine" id="cb12-18" title="18"></a> -<a class="sourceLine" id="cb12-19" title="19">t8 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_SFO_lin), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_lin_a), <span class="dt">error_model =</span> <span class="st">"tc"</span>))[<span class="st">"elapsed"</span>]</a> -<a class="sourceLine" id="cb12-20" title="20">t9 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_DFOP_par), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(DFOP_par_c), <span class="dt">error_model =</span> <span class="st">"tc"</span>))[<span class="st">"elapsed"</span>]</a> -<a class="sourceLine" id="cb12-21" title="21"></a> -<a class="sourceLine" id="cb12-22" title="22">t10 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_SFO_lin), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_lin_a), <span class="dt">error_model =</span> <span class="st">"obs"</span>))[<span class="st">"elapsed"</span>]</a> -<a class="sourceLine" id="cb12-23" title="23">t11 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_DFOP_par), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(DFOP_par_c), <span class="dt">error_model =</span> <span class="st">"obs"</span>))[<span class="st">"elapsed"</span>]</a> -<a class="sourceLine" id="cb12-24" title="24"></a> -<a class="sourceLine" id="cb12-25" title="25">mkin_benchmarks[system_string, <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/paste">paste0</a></span>(<span class="st">"t"</span>, <span class="dv">1</span><span class="op">:</span><span class="dv">11</span>)] <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/c">c</a></span>(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11)</a> -<a class="sourceLine" id="cb12-26" title="26">mkin_benchmarks</a></code></pre></div> +<div class="sourceCode" id="cb15"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb15-1" title="1"><span class="co"># Two metabolites, synthetic data</span></a> +<a class="sourceLine" id="cb15-2" title="2">m_synth_SFO_lin <-<span class="st"> </span><span class="kw"><a href="../../reference/mkinmod.html">mkinmod</a></span>(<span class="dt">parent =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"M1"</span>),</a> +<a class="sourceLine" id="cb15-3" title="3"> <span class="dt">M1 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"M2"</span>),</a> +<a class="sourceLine" id="cb15-4" title="4"> <span class="dt">M2 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>),</a> +<a class="sourceLine" id="cb15-5" title="5"> <span class="dt">use_of_ff =</span> <span class="st">"max"</span>, <span class="dt">quiet =</span> <span class="ot">TRUE</span>)</a> +<a class="sourceLine" id="cb15-6" title="6"></a> +<a class="sourceLine" id="cb15-7" title="7">m_synth_DFOP_par <-<span class="st"> </span><span class="kw"><a href="../../reference/mkinmod.html">mkinmod</a></span>(<span class="dt">parent =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"DFOP"</span>, <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/c">c</a></span>(<span class="st">"M1"</span>, <span class="st">"M2"</span>)),</a> +<a class="sourceLine" id="cb15-8" title="8"> <span class="dt">M1 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>),</a> +<a class="sourceLine" id="cb15-9" title="9"> <span class="dt">M2 =</span> <span class="kw"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>),</a> +<a class="sourceLine" id="cb15-10" title="10"> <span class="dt">use_of_ff =</span> <span class="st">"max"</span>, <span class="dt">quiet =</span> <span class="ot">TRUE</span>)</a> +<a class="sourceLine" id="cb15-11" title="11"></a> +<a class="sourceLine" id="cb15-12" title="12">SFO_lin_a <-<span class="st"> </span>synthetic_data_for_UBA_<span class="dv">2014</span>[[<span class="dv">1</span>]]<span class="op">$</span>data</a> +<a class="sourceLine" id="cb15-13" title="13"></a> +<a class="sourceLine" id="cb15-14" title="14">DFOP_par_c <-<span class="st"> </span>synthetic_data_for_UBA_<span class="dv">2014</span>[[<span class="dv">12</span>]]<span class="op">$</span>data</a> +<a class="sourceLine" id="cb15-15" title="15"></a> +<a class="sourceLine" id="cb15-16" title="16">t6 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_SFO_lin), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_lin_a)))[<span class="st">"elapsed"</span>]</a> +<a class="sourceLine" id="cb15-17" title="17">t7 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_DFOP_par), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(DFOP_par_c)))[<span class="st">"elapsed"</span>]</a> +<a class="sourceLine" id="cb15-18" title="18"></a> +<a class="sourceLine" id="cb15-19" title="19">t8 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_SFO_lin), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_lin_a), <span class="dt">error_model =</span> <span class="st">"tc"</span>))[<span class="st">"elapsed"</span>]</a> +<a class="sourceLine" id="cb15-20" title="20">t9 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_DFOP_par), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(DFOP_par_c), <span class="dt">error_model =</span> <span class="st">"tc"</span>))[<span class="st">"elapsed"</span>]</a> +<a class="sourceLine" id="cb15-21" title="21"></a> +<a class="sourceLine" id="cb15-22" title="22">t10 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_SFO_lin), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(SFO_lin_a), <span class="dt">error_model =</span> <span class="st">"obs"</span>))[<span class="st">"elapsed"</span>]</a> +<a class="sourceLine" id="cb15-23" title="23">t11 <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/system.time">system.time</a></span>(<span class="kw">mmkin_bench</span>(<span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(m_synth_DFOP_par), <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/list">list</a></span>(DFOP_par_c), <span class="dt">error_model =</span> <span class="st">"obs"</span>))[<span class="st">"elapsed"</span>]</a> +<a class="sourceLine" id="cb15-24" title="24"></a> +<a class="sourceLine" id="cb15-25" title="25">mkin_benchmarks[system_string, <span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/paste">paste0</a></span>(<span class="st">"t"</span>, <span class="dv">1</span><span class="op">:</span><span class="dv">11</span>)] <-<span class="st"> </span><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/c">c</a></span>(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11)</a> +<a class="sourceLine" id="cb15-26" title="26">mkin_benchmarks</a></code></pre></div> <pre><code>## CPU ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 AMD Ryzen 7 1700 Eight-Core Processor ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 AMD Ryzen 7 1700 Eight-Core Processor ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 AMD Ryzen 7 1700 Eight-Core Processor ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 AMD Ryzen 7 1700 Eight-Core Processor ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 AMD Ryzen 7 1700 Eight-Core Processor +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 AMD Ryzen 7 1700 Eight-Core Processor ## OS ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 Linux ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 Linux ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 Linux ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 Linux ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 Linux +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 Linux ## mkin ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 0.9.48.1 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 0.9.49.1 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 0.9.49.2 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 0.9.49.3 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 0.9.49.4 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 0.9.49.5 ## t1 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 3.610 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 8.184 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 7.064 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 7.296 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 5.792 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 5.936 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 5.805 ## t2 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 11.019 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 22.889 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 12.558 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 21.239 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 17.398 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 20.545 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 35.748 ## t3 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 3.764 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 4.649 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 4.786 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 4.510 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.427 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.446 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 4.403 ## t4 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 14.347 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 13.789 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 8.461 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 13.805 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 16.104 -## t5 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 9.495 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 6.395 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 5.675 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 7.386 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 7.527 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 15.335 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 30.613 +## t5 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 9.495 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 6.395 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 5.675 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 7.386 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 6.002 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 10.309 ## t6 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 2.623 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 2.542 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 2.723 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 2.643 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 2.541 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 2.635 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 2.546 ## t7 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 4.587 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 4.128 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 4.478 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 4.374 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.308 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.259 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 4.214 ## t8 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 7.525 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 4.632 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 4.862 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 7.02 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.775 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.737 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 7.871 ## t9 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 16.621 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 8.171 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 7.618 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 11.124 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 11.116 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 7.763 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 15.738 ## t10 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 8.576 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 3.676 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 3.579 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 5.388 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 5.063 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 3.427 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 7.763 ## t11 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 31.267 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 5.636 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 5.574 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 7.365 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 7.784</code></pre> -<div class="sourceCode" id="cb14"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb14-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/save">save</a></span>(mkin_benchmarks, <span class="dt">file =</span> <span class="st">"~/git/mkin/vignettes/mkin_benchmarks.rda"</span>)</a></code></pre></div> +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 5.626 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.5 10.527</code></pre> +<div class="sourceCode" id="cb17"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb17-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/save">save</a></span>(mkin_benchmarks, <span class="dt">file =</span> <span class="st">"~/git/mkin/vignettes/mkin_benchmarks.rda"</span>)</a></code></pre></div> </div> </div> @@ -281,7 +295,7 @@ </div> <div class="pkgdown"> - <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p> + <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p> </div> </footer> </div> diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html index f296c8a4..f3062c66 100644 --- a/docs/articles/web_only/compiled_models.html +++ b/docs/articles/web_only/compiled_models.html @@ -30,7 +30,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.9.49.4</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.9.49.5</span> </span> </div> @@ -88,7 +88,7 @@ <h1>Performance benefit by using compiled model definitions in mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2019-05-08</h4> + <h4 class="date">2019-06-04</h4> <div class="hidden name"><code>compiled_models.Rmd</code></div> @@ -163,9 +163,9 @@ ## Warning in mkinfit(SFO_SFO, FOCUS_2006_D, solution_type = "deSolve", quiet ## = TRUE): Observations with value of zero were removed from the data</code></pre> <pre><code>## test replications elapsed relative user.self sys.self -## 3 deSolve, compiled 3 3.131 1.000 3.129 0 -## 1 deSolve, not compiled 3 28.306 9.041 28.290 0 -## 2 Eigenvalue based 3 4.361 1.393 4.358 0 +## 3 deSolve, compiled 3 3.053 1.000 3.052 0 +## 1 deSolve, not compiled 3 28.457 9.321 28.442 0 +## 2 Eigenvalue based 3 4.296 1.407 4.293 0 ## user.child sys.child ## 3 0 0 ## 1 0 0 @@ -214,16 +214,16 @@ ## Warning in mkinfit(FOMC_SFO, FOCUS_2006_D, quiet = TRUE): Observations with ## value of zero were removed from the data</code></pre> <pre><code>## test replications elapsed relative user.self sys.self -## 2 deSolve, compiled 3 5.023 1.000 5.021 0 -## 1 deSolve, not compiled 3 53.267 10.605 53.235 0 +## 2 deSolve, compiled 3 4.828 1.000 4.825 0 +## 1 deSolve, not compiled 3 53.153 11.009 53.125 0 ## user.child sys.child ## 2 0 0 ## 1 0 0</code></pre> <p>Here we get a performance benefit of a factor of 11 using the version of the differential equation model compiled from C code!</p> -<p>This vignette was built with mkin 0.9.49.4 on</p> +<p>This vignette was built with mkin 0.9.49.5 on</p> <pre><code>## R version 3.6.0 (2019-04-26) ## Platform: x86_64-pc-linux-gnu (64-bit) -## Running under: Debian GNU/Linux 9 (stretch)</code></pre> +## Running under: Debian GNU/Linux 10 (buster)</code></pre> <pre><code>## CPU model: AMD Ryzen 7 1700 Eight-Core Processor</code></pre> </div> </div> @@ -247,7 +247,7 @@ </div> <div class="pkgdown"> - <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p> + <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p> </div> </footer> </div> |
