diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2018-07-18 15:18:30 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2018-07-18 15:58:46 +0200 |
| commit | 0b98c459c30a0629a728acf6b311de035c55fb64 (patch) | |
| tree | f146faf4802da38862aa14b0268265f3fad9ba34 /docs/articles/FOCUS_L.html | |
| parent | d3ed95f2a0a43ed74b02ea90e35d043ed4e1e72f (diff) | |
Correct references to the Rocke and Lorenzato model
Rename 'sigma_rl' to 'sigma_twocomp' as the Rocke and Lorenzato model assumes lognormal distribution for large y.
Rebuild static documentation.
Diffstat (limited to 'docs/articles/FOCUS_L.html')
| -rw-r--r-- | docs/articles/FOCUS_L.html | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index fcd0719d..72c293b9 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -29,7 +29,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="Released package">0.9.47.1</span> + <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="Released package">0.9.47.2</span> </span> </div> @@ -84,7 +84,7 @@ <h1>Example evaluation of FOCUS Laboratory Data L1 to L3</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-06-06</h4> + <h4 class="date">2018-07-18</h4> <div class="hidden name"><code>FOCUS_L.Rmd</code></div> @@ -109,16 +109,16 @@ FOCUS_<span class="dv">2006</span>_L1_mkin <-<span class="st"> </span><span c <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">m.L1.SFO <-<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>) <span class="kw">summary</span>(m.L1.SFO)</code></pre></div> <pre><code>## mkin version used for fitting: 0.9.47.1 -## R version used for fitting: 3.5.0 -## Date of fit: Wed Jun 6 01:21:52 2018 -## Date of summary: Wed Jun 6 01:21:52 2018 +## R version used for fitting: 3.5.1 +## Date of fit: Wed Jul 18 15:16:17 2018 +## Date of summary: Wed Jul 18 15:16:17 2018 ## ## 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.081 s ## ## Weighting: none ## @@ -200,16 +200,16 @@ FOCUS_<span class="dv">2006</span>_L1_mkin <-<span class="st"> </span><span c <p><img src="FOCUS_L_files/figure-html/unnamed-chunk-6-1.png" width="576"></p> <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(m.L1.FOMC, <span class="dt">data =</span> <span class="ot">FALSE</span>)</code></pre></div> <pre><code>## mkin version used for fitting: 0.9.47.1 -## R version used for fitting: 3.5.0 -## Date of fit: Wed Jun 6 01:21:53 2018 -## Date of summary: Wed Jun 6 01:21:53 2018 +## R version used for fitting: 3.5.1 +## Date of fit: Wed Jul 18 15:16:19 2018 +## Date of summary: Wed Jul 18 15:16:19 2018 ## ## 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.369 s +## Fitted with method Port using 611 model solutions performed in 1.304 s ## ## Weighting: none ## @@ -295,16 +295,16 @@ FOCUS_<span class="dv">2006</span>_L2_mkin <-<span class="st"> </span><span c <p><img src="FOCUS_L_files/figure-html/unnamed-chunk-9-1.png" width="672"></p> <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(m.L2.FOMC, <span class="dt">data =</span> <span class="ot">FALSE</span>)</code></pre></div> <pre><code>## mkin version used for fitting: 0.9.47.1 -## R version used for fitting: 3.5.0 -## Date of fit: Wed Jun 6 01:21:54 2018 -## Date of summary: Wed Jun 6 01:21:54 2018 +## R version used for fitting: 3.5.1 +## Date of fit: Wed Jul 18 15:16:19 2018 +## Date of summary: Wed Jul 18 15:16:19 2018 ## ## 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.173 s +## Fitted with method Port using 81 model solutions performed in 0.175 s ## ## Weighting: none ## @@ -366,9 +366,9 @@ FOCUS_<span class="dv">2006</span>_L2_mkin <-<span class="st"> </span><span c <p><img src="FOCUS_L_files/figure-html/unnamed-chunk-10-1.png" width="672"></p> <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(m.L2.DFOP, <span class="dt">data =</span> <span class="ot">FALSE</span>)</code></pre></div> <pre><code>## mkin version used for fitting: 0.9.47.1 -## R version used for fitting: 3.5.0 -## Date of fit: Wed Jun 6 01:21:55 2018 -## Date of summary: Wed Jun 6 01:21:55 2018 +## R version used for fitting: 3.5.1 +## Date of fit: Wed Jul 18 15:16:20 2018 +## Date of summary: Wed Jul 18 15:16:20 2018 ## ## Equations: ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -377,7 +377,7 @@ FOCUS_<span class="dv">2006</span>_L2_mkin <-<span class="st"> </span><span c ## ## Model predictions using solution type analytical ## -## Fitted with method Port using 336 model solutions performed in 0.76 s +## Fitted with method Port using 336 model solutions performed in 0.721 s ## ## Weighting: none ## @@ -458,9 +458,9 @@ mm.L3 <-<span class="st"> </span><span class="kw"><a href="../reference/mmkin <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"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(mm.L3[[<span class="st">"DFOP"</span>, <span class="dv">1</span>]])</code></pre></div> <pre><code>## mkin version used for fitting: 0.9.47.1 -## R version used for fitting: 3.5.0 -## Date of fit: Wed Jun 6 01:21:56 2018 -## Date of summary: Wed Jun 6 01:21:56 2018 +## R version used for fitting: 3.5.1 +## Date of fit: Wed Jul 18 15:16:21 2018 +## Date of summary: Wed Jul 18 15:16:21 2018 ## ## Equations: ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -469,7 +469,7 @@ mm.L3 <-<span class="st"> </span><span class="kw"><a href="../reference/mmkin ## ## Model predictions using solution type analytical ## -## Fitted with method Port using 137 model solutions performed in 0.33 s +## Fitted with method Port using 137 model solutions performed in 0.294 s ## ## Weighting: none ## @@ -559,16 +559,16 @@ mm.L4 <-<span class="st"> </span><span class="kw"><a href="../reference/mmkin <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"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(mm.L4[[<span class="st">"SFO"</span>, <span class="dv">1</span>]], <span class="dt">data =</span> <span class="ot">FALSE</span>)</code></pre></div> <pre><code>## mkin version used for fitting: 0.9.47.1 -## R version used for fitting: 3.5.0 -## Date of fit: Wed Jun 6 01:21:56 2018 -## Date of summary: Wed Jun 6 01:21:57 2018 +## R version used for fitting: 3.5.1 +## Date of fit: Wed Jul 18 15:16:22 2018 +## Date of summary: Wed Jul 18 15:16:22 2018 ## ## 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.099 s +## Fitted with method Port using 46 model solutions performed in 0.092 s ## ## Weighting: none ## @@ -619,16 +619,16 @@ mm.L4 <-<span class="st"> </span><span class="kw"><a href="../reference/mmkin ## parent 106 352</code></pre> <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(mm.L4[[<span class="st">"FOMC"</span>, <span class="dv">1</span>]], <span class="dt">data =</span> <span class="ot">FALSE</span>)</code></pre></div> <pre><code>## mkin version used for fitting: 0.9.47.1 -## R version used for fitting: 3.5.0 -## Date of fit: Wed Jun 6 01:21:57 2018 -## Date of summary: Wed Jun 6 01:21:57 2018 +## R version used for fitting: 3.5.1 +## Date of fit: Wed Jul 18 15:16:22 2018 +## Date of summary: Wed Jul 18 15:16:22 2018 ## ## 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.146 s +## Fitted with method Port using 66 model solutions performed in 0.137 s ## ## Weighting: none ## |