Add the logistic model

1 files changed, 29 insertions, 29 deletions

diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html
index e3ca9aff..265dd96c 100644
--- a/docs/articles/FOCUS_L.html
+++ b/docs/articles/FOCUS_L.html
@@ -85,7 +85,7 @@
       <h1>Example evaluation of FOCUS Laboratory Data L1 to L3</h1>
                         <h4 class="author">Johannes Ranke</h4>
             
-            <h4 class="date">2019-01-31</h4>
+            <h4 class="date">2019-02-21</h4>
       
       
       <div class="hidden name"><code>FOCUS_L.Rmd</code></div>
@@ -109,17 +109,17 @@
 <p>Since mkin version 0.9-32 (July 2014), we can use shorthand notation like <code>"SFO"</code> for parent only degradation models. The following two lines fit the model and produce the summary report of the model fit. This covers the numerical analysis given in the FOCUS report.</p>
 <div class="sourceCode" id="cb2"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb2-1" data-line-number="1">m.L1.SFO &lt;-<span class="st"> </span><span class="kw"><a href="../reference/mkinfit.html">mkinfit</a></span>(<span class="st">"SFO"</span>, FOCUS_<span class="dv">2006</span>_L1_mkin, <span class="dt">quiet =</span> <span class="ot">TRUE</span>)</a>
 <a class="sourceLine" id="cb2-2" data-line-number="2"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></span>(m.L1.SFO)</a></code></pre></div>
-<pre><code>## mkin version used for fitting:    0.9.47.5 
+<pre><code>## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 16:52:39 2019 
-## Date of summary: Thu Jan 31 16:52:39 2019 
+## Date of fit:     Thu Feb 21 14:32:06 2019 
+## Date of summary: Thu Feb 21 14:32:06 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 37 model solutions performed in 0.094 s
+## Fitted with method Port using 37 model solutions performed in 0.097 s
 ## 
 ## Weighting: none
 ## 
@@ -200,17 +200,17 @@
 <a class="sourceLine" id="cb6-2" data-line-number="2"><span class="kw"><a href="https://www.rdocumentation.org/packages/graphics/topics/plot">plot</a></span>(m.L1.FOMC, <span class="dt">show_errmin =</span> <span class="ot">TRUE</span>, <span class="dt">main =</span> <span class="st">"FOCUS L1 - FOMC"</span>)</a></code></pre></div>
 <p><img src="FOCUS_L_files/figure-html/unnamed-chunk-6-1.png" width="576"></p>
 <div class="sourceCode" id="cb7"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb7-1" data-line-number="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></span>(m.L1.FOMC, <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>
-<pre><code>## mkin version used for fitting:    0.9.47.5 
+<pre><code>## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 16:52:41 2019 
-## Date of summary: Thu Jan 31 16:52:41 2019 
+## Date of fit:     Thu Feb 21 14:32:08 2019 
+## Date of summary: Thu Feb 21 14:32:08 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 611 model solutions performed in 1.49 s
+## Fitted with method Port using 611 model solutions performed in 1.547 s
 ## 
 ## Weighting: none
 ## 
@@ -295,17 +295,17 @@
 <a class="sourceLine" id="cb11-3" data-line-number="3">     <span class="dt">main =</span> <span class="st">"FOCUS L2 - FOMC"</span>)</a></code></pre></div>
 <p><img src="FOCUS_L_files/figure-html/unnamed-chunk-9-1.png" width="672"></p>
 <div class="sourceCode" id="cb12"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb12-1" data-line-number="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></span>(m.L2.FOMC, <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>
-<pre><code>## mkin version used for fitting:    0.9.47.5 
+<pre><code>## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 16:52:42 2019 
-## Date of summary: Thu Jan 31 16:52:42 2019 
+## Date of fit:     Thu Feb 21 14:32:08 2019 
+## Date of summary: Thu Feb 21 14:32:08 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 81 model solutions performed in 0.198 s
+## Fitted with method Port using 81 model solutions performed in 0.201 s
 ## 
 ## Weighting: none
 ## 
@@ -366,10 +366,10 @@
 <a class="sourceLine" id="cb14-3" data-line-number="3">     <span class="dt">main =</span> <span class="st">"FOCUS L2 - DFOP"</span>)</a></code></pre></div>
 <p><img src="FOCUS_L_files/figure-html/unnamed-chunk-10-1.png" width="672"></p>
 <div class="sourceCode" id="cb15"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb15-1" data-line-number="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></span>(m.L2.DFOP, <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>
-<pre><code>## mkin version used for fitting:    0.9.47.5 
+<pre><code>## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 16:52:43 2019 
-## Date of summary: Thu Jan 31 16:52:43 2019 
+## Date of fit:     Thu Feb 21 14:32:09 2019 
+## Date of summary: Thu Feb 21 14:32:09 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -378,7 +378,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 336 model solutions performed in 0.839 s
+## Fitted with method Port using 336 model solutions performed in 0.86 s
 ## 
 ## Weighting: none
 ## 
@@ -458,10 +458,10 @@
 <p>The objects returned by mmkin are arranged like a matrix, with models as a row index and datasets as a column index.</p>
 <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="cb21"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb21-1" data-line-number="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></span>(mm.L3[[<span class="st">"DFOP"</span>, <span class="dv">1</span>]])</a></code></pre></div>
-<pre><code>## mkin version used for fitting:    0.9.47.5 
+<pre><code>## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 16:52:44 2019 
-## Date of summary: Thu Jan 31 16:52:44 2019 
+## Date of fit:     Thu Feb 21 14:32:10 2019 
+## Date of summary: Thu Feb 21 14:32:11 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -470,7 +470,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 137 model solutions performed in 0.341 s
+## Fitted with method Port using 137 model solutions performed in 0.351 s
 ## 
 ## Weighting: none
 ## 
@@ -559,17 +559,17 @@
 <p><img src="FOCUS_L_files/figure-html/unnamed-chunk-15-1.png" width="700"></p>
 <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="cb26"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb26-1" data-line-number="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></span>(mm.L4[[<span class="st">"SFO"</span>, <span class="dv">1</span>]], <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>
-<pre><code>## mkin version used for fitting:    0.9.47.5 
+<pre><code>## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 16:52:44 2019 
-## Date of summary: Thu Jan 31 16:52:45 2019 
+## Date of fit:     Thu Feb 21 14:32:11 2019 
+## Date of summary: Thu Feb 21 14:32:11 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 46 model solutions performed in 0.11 s
+## Fitted with method Port using 46 model solutions performed in 0.113 s
 ## 
 ## Weighting: none
 ## 
@@ -619,17 +619,17 @@
 ##        DT50 DT90
 ## parent  106  352</code></pre>
 <div class="sourceCode" id="cb28"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb28-1" data-line-number="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></span>(mm.L4[[<span class="st">"FOMC"</span>, <span class="dv">1</span>]], <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>
-<pre><code>## mkin version used for fitting:    0.9.47.5 
+<pre><code>## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 16:52:45 2019 
-## Date of summary: Thu Jan 31 16:52:45 2019 
+## Date of fit:     Thu Feb 21 14:32:11 2019 
+## Date of summary: Thu Feb 21 14:32:11 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 66 model solutions performed in 0.162 s
+## Fitted with method Port using 66 model solutions performed in 0.168 s
 ## 
 ## Weighting: none
 ##