diff options
Diffstat (limited to 'docs/articles')
-rw-r--r-- | docs/articles/FOCUS_D.html | 10 | ||||
-rw-r--r-- | docs/articles/FOCUS_L.html | 44 | ||||
-rw-r--r-- | docs/articles/mkin.html | 2 | ||||
-rw-r--r-- | docs/articles/twa.html | 2 | ||||
-rw-r--r-- | docs/articles/web_only/FOCUS_Z.html | 2 | ||||
-rw-r--r-- | docs/articles/web_only/compiled_models.html | 12 |
6 files changed, 36 insertions, 36 deletions
diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index b44462aa..b03e7612 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -84,7 +84,7 @@ <h1>Example evaluation of FOCUS Example Dataset D</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-09-18</h4> + <h4 class="date">2018-11-23</h4> <div class="hidden name"><code>FOCUS_D.Rmd</code></div> @@ -160,10 +160,10 @@ <p><img src="FOCUS_D_files/figure-html/plot_2-1.png" width="768"></p> <p>A comprehensive report of the results is obtained using the <code>summary</code> method for <code>mkinfit</code> objects.</p> <div class="sourceCode" id="cb10"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb10-1" data-line-number="1"><span class="kw">summary</span>(fit)</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.1 -## Date of fit: Fri Sep 14 17:17:43 2018 -## Date of summary: Fri Sep 14 17:17:44 2018 +## Date of fit: Fri Nov 23 19:58:46 2018 +## Date of summary: Fri Nov 23 19:58:47 2018 ## ## Equations: ## d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent @@ -171,7 +171,7 @@ ## ## Model predictions using solution type deSolve ## -## Fitted with method Port using 153 model solutions performed in 0.645 s +## Fitted with method Port using 153 model solutions performed in 0.736 s ## ## Weighting: none ## diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index ea49ae10..37b4306f 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -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-09-18</h4> + <h4 class="date">2018-11-23</h4> <div class="hidden name"><code>FOCUS_L.Rmd</code></div> @@ -110,15 +110,15 @@ <a class="sourceLine" id="cb2-2" data-line-number="2"><span class="kw">summary</span>(m.L1.SFO)</a></code></pre></div> <pre><code>## mkin version used for fitting: 0.9.47.6 ## R version used for fitting: 3.5.1 -## Date of fit: Tue Sep 18 15:18:12 2018 -## Date of summary: Tue Sep 18 15:18:12 2018 +## Date of fit: Fri Nov 23 19:58:49 2018 +## Date of summary: Fri Nov 23 19:58:49 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.084 s +## Fitted with method Port using 37 model solutions performed in 0.095 s ## ## Weighting: none ## @@ -201,15 +201,15 @@ <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">summary</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.6 ## R version used for fitting: 3.5.1 -## Date of fit: Tue Sep 18 15:18:14 2018 -## Date of summary: Tue Sep 18 15:18:14 2018 +## Date of fit: Fri Nov 23 19:58:51 2018 +## Date of summary: Fri Nov 23 19:58:51 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.321 s +## Fitted with method Port using 611 model solutions performed in 1.464 s ## ## Weighting: none ## @@ -296,15 +296,15 @@ <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">summary</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.6 ## R version used for fitting: 3.5.1 -## Date of fit: Tue Sep 18 15:18:14 2018 -## Date of summary: Tue Sep 18 15:18:14 2018 +## Date of fit: Fri Nov 23 19:58:51 2018 +## Date of summary: Fri Nov 23 19:58:51 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.169 s +## Fitted with method Port using 81 model solutions performed in 0.191 s ## ## Weighting: none ## @@ -367,8 +367,8 @@ <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">summary</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.6 ## R version used for fitting: 3.5.1 -## Date of fit: Tue Sep 18 15:18:15 2018 -## Date of summary: Tue Sep 18 15:18:15 2018 +## Date of fit: Fri Nov 23 19:58:52 2018 +## Date of summary: Fri Nov 23 19:58:52 2018 ## ## Equations: ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -377,7 +377,7 @@ ## ## Model predictions using solution type analytical ## -## Fitted with method Port using 336 model solutions performed in 0.739 s +## Fitted with method Port using 336 model solutions performed in 0.824 s ## ## Weighting: none ## @@ -459,8 +459,8 @@ <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">summary</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.6 ## R version used for fitting: 3.5.1 -## Date of fit: Tue Sep 18 15:18:16 2018 -## Date of summary: Tue Sep 18 15:18:16 2018 +## Date of fit: Fri Nov 23 19:58:53 2018 +## Date of summary: Fri Nov 23 19:58:54 2018 ## ## Equations: ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -469,7 +469,7 @@ ## ## Model predictions using solution type analytical ## -## Fitted with method Port using 137 model solutions performed in 0.301 s +## Fitted with method Port using 137 model solutions performed in 0.344 s ## ## Weighting: none ## @@ -560,15 +560,15 @@ <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">summary</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.6 ## R version used for fitting: 3.5.1 -## Date of fit: Tue Sep 18 15:18:17 2018 -## Date of summary: Tue Sep 18 15:18:17 2018 +## Date of fit: Fri Nov 23 19:58:54 2018 +## Date of summary: Fri Nov 23 19:58:54 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.107 s +## Fitted with method Port using 46 model solutions performed in 0.108 s ## ## Weighting: none ## @@ -620,15 +620,15 @@ <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">summary</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.6 ## R version used for fitting: 3.5.1 -## Date of fit: Tue Sep 18 15:18:17 2018 -## Date of summary: Tue Sep 18 15:18:17 2018 +## Date of fit: Fri Nov 23 19:58:54 2018 +## Date of summary: Fri Nov 23 19:58:54 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.139 s +## Fitted with method Port using 66 model solutions performed in 0.159 s ## ## Weighting: none ## diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html index e483043b..4ead1062 100644 --- a/docs/articles/mkin.html +++ b/docs/articles/mkin.html @@ -84,7 +84,7 @@ <h1>Introduction to mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-09-18</h4> + <h4 class="date">2018-11-23</h4> <div class="hidden name"><code>mkin.Rmd</code></div> diff --git a/docs/articles/twa.html b/docs/articles/twa.html index d9249f9d..8c053c10 100644 --- a/docs/articles/twa.html +++ b/docs/articles/twa.html @@ -84,7 +84,7 @@ <h1>Calculation of time weighted average concentrations with mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-09-18</h4> + <h4 class="date">2018-11-23</h4> <div class="hidden name"><code>twa.Rmd</code></div> diff --git a/docs/articles/web_only/FOCUS_Z.html b/docs/articles/web_only/FOCUS_Z.html index a3e743d1..5215e039 100644 --- a/docs/articles/web_only/FOCUS_Z.html +++ b/docs/articles/web_only/FOCUS_Z.html @@ -84,7 +84,7 @@ <h1>Example evaluation of FOCUS dataset Z</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-09-18</h4> + <h4 class="date">2018-11-23</h4> <div class="hidden name"><code>FOCUS_Z.Rmd</code></div> diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html index 684f28cb..85efff61 100644 --- a/docs/articles/web_only/compiled_models.html +++ b/docs/articles/web_only/compiled_models.html @@ -84,7 +84,7 @@ <h1>Performance benefit by using compiled model definitions in mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-09-18</h4> + <h4 class="date">2018-11-23</h4> <div class="hidden name"><code>compiled_models.Rmd</code></div> @@ -125,9 +125,9 @@ <a class="sourceLine" id="cb5-16" data-line-number="16">}</a></code></pre></div> <pre><code>## Lade nötiges Paket: rbenchmark</code></pre> <pre><code>## test replications elapsed relative user.self sys.self -## 3 deSolve, compiled 3 2.005 1.000 2.003 0 -## 1 deSolve, not compiled 3 15.480 7.721 15.474 0 -## 2 Eigenvalue based 3 2.460 1.227 2.459 0 +## 3 deSolve, compiled 3 2.284 1.000 2.282 0 +## 1 deSolve, not compiled 3 17.732 7.764 17.724 0 +## 2 Eigenvalue based 3 2.812 1.231 2.809 0 ## user.child sys.child ## 3 0 0 ## 1 0 0 @@ -156,8 +156,8 @@ <a class="sourceLine" id="cb8-16" data-line-number="16">}</a></code></pre></div> <pre><code>## Successfully compiled differential equation model from auto-generated C code.</code></pre> <pre><code>## test replications elapsed relative user.self sys.self -## 2 deSolve, compiled 3 3.524 1.00 3.523 0.000 -## 1 deSolve, not compiled 3 33.021 9.37 33.001 0.004 +## 2 deSolve, compiled 3 4.029 1.000 4.026 0 +## 1 deSolve, not compiled 3 37.760 9.372 37.744 0 ## user.child sys.child ## 2 0 0 ## 1 0 0</code></pre> |