diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2018-03-21 18:16:52 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2018-03-21 18:16:52 +0100 |
commit | 6ea7bc3614b9a303f7c38dd63b9f80b8d0ebd95e (patch) | |
tree | c8d79386f9f01c8ddfe218435860d997ba6af01a /docs/articles | |
parent | b88bc151196d66d876fbc11059fc8cd365ef5534 (diff) |
Static documentation rebuilt by pkgdown
Diffstat (limited to 'docs/articles')
-rw-r--r-- | docs/articles/FOCUS_D.html | 2 | ||||
-rw-r--r-- | docs/articles/FOCUS_L.html | 56 | ||||
-rw-r--r-- | docs/articles/FOCUS_Z.html | 2 | ||||
-rw-r--r-- | docs/articles/compiled_models.html | 14 | ||||
-rw-r--r-- | docs/articles/mkin.html | 2 | ||||
-rw-r--r-- | docs/articles/twa.html | 2 |
6 files changed, 39 insertions, 39 deletions
diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index a8002acd..a83c2f44 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -80,7 +80,7 @@ <h1>Example evaluation of FOCUS Example Dataset D</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-11</h4> + <h4 class="date">2018-03-21</h4> </div> diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index a23876ec..08e144bd 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -80,7 +80,7 @@ <h1>Example evaluation of FOCUS Laboratory Data L1 to L3</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-11</h4> + <h4 class="date">2018-03-21</h4> </div> @@ -102,16 +102,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: 0.9.46.3 -## R version: 3.4.3 -## Date of fit: Sun Mar 11 22:11:58 2018 -## Date of summary: Sun Mar 11 22:11:58 2018 +## R version: 3.4.4 +## Date of fit: Wed Mar 21 18:16:03 2018 +## Date of summary: Wed Mar 21 18:16:03 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.235 s +## Fitted with method Port using 37 model solutions performed in 0.257 s ## ## Weighting: none ## @@ -193,16 +193,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: 0.9.46.3 -## R version: 3.4.3 -## Date of fit: Sun Mar 11 22:12:01 2018 -## Date of summary: Sun Mar 11 22:12:01 2018 +## R version: 3.4.4 +## Date of fit: Wed Mar 21 18:16:05 2018 +## Date of summary: Wed Mar 21 18:16:05 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.458 s +## Fitted with method Port using 611 model solutions performed in 1.404 s ## ## Weighting: none ## @@ -288,16 +288,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: 0.9.46.3 -## R version: 3.4.3 -## Date of fit: Sun Mar 11 22:12:01 2018 -## Date of summary: Sun Mar 11 22:12:01 2018 +## R version: 3.4.4 +## Date of fit: Wed Mar 21 18:16:06 2018 +## Date of summary: Wed Mar 21 18:16:06 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.158 s +## Fitted with method Port using 81 model solutions performed in 0.168 s ## ## Weighting: none ## @@ -359,9 +359,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: 0.9.46.3 -## R version: 3.4.3 -## Date of fit: Sun Mar 11 22:12:02 2018 -## Date of summary: Sun Mar 11 22:12:02 2018 +## R version: 3.4.4 +## Date of fit: Wed Mar 21 18:16:06 2018 +## Date of summary: Wed Mar 21 18:16:06 2018 ## ## Equations: ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -370,7 +370,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.681 s +## Fitted with method Port using 336 model solutions performed in 0.719 s ## ## Weighting: none ## @@ -451,9 +451,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: 0.9.46.3 -## R version: 3.4.3 -## Date of fit: Sun Mar 11 22:12:03 2018 -## Date of summary: Sun Mar 11 22:12:03 2018 +## R version: 3.4.4 +## Date of fit: Wed Mar 21 18:16:07 2018 +## Date of summary: Wed Mar 21 18:16:07 2018 ## ## Equations: ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -462,7 +462,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.272 s +## Fitted with method Port using 137 model solutions performed in 0.283 s ## ## Weighting: none ## @@ -552,9 +552,9 @@ 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: 0.9.46.3 -## R version: 3.4.3 -## Date of fit: Sun Mar 11 22:12:04 2018 -## Date of summary: Sun Mar 11 22:12:04 2018 +## R version: 3.4.4 +## Date of fit: Wed Mar 21 18:16:08 2018 +## Date of summary: Wed Mar 21 18:16:08 2018 ## ## Equations: ## d_parent/dt = - k_parent_sink * parent @@ -612,16 +612,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: 0.9.46.3 -## R version: 3.4.3 -## Date of fit: Sun Mar 11 22:12:04 2018 -## Date of summary: Sun Mar 11 22:12:04 2018 +## R version: 3.4.4 +## Date of fit: Wed Mar 21 18:16:08 2018 +## Date of summary: Wed Mar 21 18:16:08 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.13 s +## Fitted with method Port using 66 model solutions performed in 0.138 s ## ## Weighting: none ## diff --git a/docs/articles/FOCUS_Z.html b/docs/articles/FOCUS_Z.html index 78a00062..a2b88caa 100644 --- a/docs/articles/FOCUS_Z.html +++ b/docs/articles/FOCUS_Z.html @@ -80,7 +80,7 @@ <h1>Example evaluation of FOCUS dataset Z</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-11</h4> + <h4 class="date">2018-03-21</h4> </div> diff --git a/docs/articles/compiled_models.html b/docs/articles/compiled_models.html index 8923acac..19cb806b 100644 --- a/docs/articles/compiled_models.html +++ b/docs/articles/compiled_models.html @@ -80,7 +80,7 @@ <h1>Performance benefit by using compiled model definitions in mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-11</h4> + <h4 class="date">2018-03-21</h4> </div> @@ -118,9 +118,9 @@ SFO_SFO <-<span class="st"> </span><span class="kw"><a href="../reference/mki }</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 1.978 1.000 1.976 0 -## 1 deSolve, not compiled 3 13.541 6.846 13.531 0 -## 2 Eigenvalue based 3 2.332 1.179 2.330 0 +## 3 deSolve, compiled 3 2.155 1.000 2.152 0 +## 1 deSolve, not compiled 3 15.124 7.018 15.109 0 +## 2 Eigenvalue based 3 2.576 1.195 2.574 0 ## user.child sys.child ## 3 0 0 ## 1 0 0 @@ -149,14 +149,14 @@ SFO_SFO <-<span class="st"> </span><span class="kw"><a href="../reference/mki }</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.334 1.000 3.331 0 -## 1 deSolve, not compiled 3 29.917 8.973 29.888 0 +## 2 deSolve, compiled 3 3.419 1.000 3.415 0 +## 1 deSolve, not compiled 3 31.159 9.113 31.130 0 ## user.child sys.child ## 2 0 0 ## 1 0 0</code></pre> <p>Here we get a performance benefit of a factor of 9 using the version of the differential equation model compiled from C code!</p> <p>This vignette was built with mkin 0.9.46.3 on</p> -<pre><code>## R version 3.4.3 (2017-11-30) +<pre><code>## R version 3.4.4 (2018-03-15) ## Platform: x86_64-pc-linux-gnu (64-bit) ## Running under: Debian GNU/Linux 9 (stretch)</code></pre> <pre><code>## CPU model: AMD Ryzen 7 1700 Eight-Core Processor</code></pre> diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html index 7b26b3f1..12ff2e98 100644 --- a/docs/articles/mkin.html +++ b/docs/articles/mkin.html @@ -80,7 +80,7 @@ <h1>Introduction to mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-11</h4> + <h4 class="date">2018-03-21</h4> </div> diff --git a/docs/articles/twa.html b/docs/articles/twa.html index 7f4c941e..551cf03f 100644 --- a/docs/articles/twa.html +++ b/docs/articles/twa.html @@ -80,7 +80,7 @@ <h1>Calculation of time weighted average concentrations with mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-11</h4> + <h4 class="date">2018-03-21</h4> </div> |