aboutsummaryrefslogtreecommitdiff
path: root/docs/articles
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2019-02-25 14:50:13 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2019-02-25 14:57:28 +0100
commitbe809ea23b256f627216958fcd90489ee0844ab8 (patch)
treeaac8e1ce221d79cd58e4fa62c5e5149a3b0c659f /docs/articles
parentdd6c4a8f895fd470345e7ae773299daaa4de7aef (diff)
Add plotting tests, add nafta to pkgdown
Diffstat (limited to 'docs/articles')
-rw-r--r--docs/articles/FOCUS_D.html8
-rw-r--r--docs/articles/FOCUS_L.html44
-rw-r--r--docs/articles/mkin.html2
-rw-r--r--docs/articles/twa.html2
-rw-r--r--docs/articles/web_only/FOCUS_Z.html2
-rw-r--r--docs/articles/web_only/compiled_models.html12
6 files changed, 35 insertions, 35 deletions
diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html
index ad8413dc..a470cdb6 100644
--- a/docs/articles/FOCUS_D.html
+++ b/docs/articles/FOCUS_D.html
@@ -85,7 +85,7 @@
<h1>Example evaluation of FOCUS Example Dataset D</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2019-02-22</h4>
+ <h4 class="date">2019-02-25</h4>
<div class="hidden name"><code>FOCUS_D.Rmd</code></div>
@@ -163,8 +163,8 @@
<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"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></span>(fit)</a></code></pre></div>
<pre><code>## mkin version used for fitting: 0.9.48.1
## R version used for fitting: 3.5.2
-## Date of fit: Fri Feb 22 20:48:30 2019
-## Date of summary: Fri Feb 22 20:48:31 2019
+## Date of fit: Mon Feb 25 14:54:38 2019
+## Date of summary: Mon Feb 25 14:54:38 2019
##
## Equations:
## d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent
@@ -172,7 +172,7 @@
##
## Model predictions using solution type deSolve
##
-## Fitted with method Port using 153 model solutions performed in 0.731 s
+## Fitted with method Port using 153 model solutions performed in 0.712 s
##
## Weighting: none
##
diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html
index 17c7bf59..e8a81075 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-02-22</h4>
+ <h4 class="date">2019-02-25</h4>
<div class="hidden name"><code>FOCUS_L.Rmd</code></div>
@@ -111,15 +111,15 @@
<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.48.1
## R version used for fitting: 3.5.2
-## Date of fit: Fri Feb 22 20:48:32 2019
-## Date of summary: Fri Feb 22 20:48:32 2019
+## Date of fit: Mon Feb 25 14:54:40 2019
+## Date of summary: Mon Feb 25 14:54:40 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.105 s
+## Fitted with method Port using 37 model solutions performed in 0.096 s
##
## Weighting: none
##
@@ -202,15 +202,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"><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.48.1
## R version used for fitting: 3.5.2
-## Date of fit: Fri Feb 22 20:48:34 2019
-## Date of summary: Fri Feb 22 20:48:34 2019
+## Date of fit: Mon Feb 25 14:54:42 2019
+## Date of summary: Mon Feb 25 14:54:42 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.604 s
+## Fitted with method Port using 611 model solutions performed in 1.529 s
##
## Weighting: none
##
@@ -297,15 +297,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"><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.48.1
## R version used for fitting: 3.5.2
-## Date of fit: Fri Feb 22 20:48:35 2019
-## Date of summary: Fri Feb 22 20:48:35 2019
+## Date of fit: Mon Feb 25 14:54:42 2019
+## Date of summary: Mon Feb 25 14:54:42 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.216 s
+## Fitted with method Port using 81 model solutions performed in 0.199 s
##
## Weighting: none
##
@@ -368,8 +368,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"><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.48.1
## R version used for fitting: 3.5.2
-## Date of fit: Fri Feb 22 20:48:36 2019
-## Date of summary: Fri Feb 22 20:48:36 2019
+## Date of fit: Mon Feb 25 14:54:44 2019
+## Date of summary: Mon Feb 25 14:54:44 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.864 s
+## Fitted with method Port using 336 model solutions performed in 0.853 s
##
## Weighting: none
##
@@ -460,8 +460,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"><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.48.1
## R version used for fitting: 3.5.2
-## Date of fit: Fri Feb 22 20:48:37 2019
-## Date of summary: Fri Feb 22 20:48:38 2019
+## Date of fit: Mon Feb 25 14:54:45 2019
+## Date of summary: Mon Feb 25 14:54:45 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.362 s
+## Fitted with method Port using 137 model solutions performed in 0.348 s
##
## Weighting: none
##
@@ -561,15 +561,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"><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.48.1
## R version used for fitting: 3.5.2
-## Date of fit: Fri Feb 22 20:48:38 2019
-## Date of summary: Fri Feb 22 20:48:38 2019
+## Date of fit: Mon Feb 25 14:54:45 2019
+## Date of summary: Mon Feb 25 14:54:45 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.123 s
+## Fitted with method Port using 46 model solutions performed in 0.112 s
##
## Weighting: none
##
@@ -621,15 +621,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"><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.48.1
## R version used for fitting: 3.5.2
-## Date of fit: Fri Feb 22 20:48:38 2019
-## Date of summary: Fri Feb 22 20:48:38 2019
+## Date of fit: Mon Feb 25 14:54:45 2019
+## Date of summary: Mon Feb 25 14:54:45 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.184 s
+## Fitted with method Port using 66 model solutions performed in 0.165 s
##
## Weighting: none
##
diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html
index 9baa44e4..bffd19dd 100644
--- a/docs/articles/mkin.html
+++ b/docs/articles/mkin.html
@@ -85,7 +85,7 @@
<h1>Introduction to mkin</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2019-02-22</h4>
+ <h4 class="date">2019-02-25</h4>
<div class="hidden name"><code>mkin.Rmd</code></div>
diff --git a/docs/articles/twa.html b/docs/articles/twa.html
index 8c340557..83b05989 100644
--- a/docs/articles/twa.html
+++ b/docs/articles/twa.html
@@ -85,7 +85,7 @@
<h1>Calculation of time weighted average concentrations with mkin</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2019-02-22</h4>
+ <h4 class="date">2019-02-25</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 b1e2811c..c3ee7415 100644
--- a/docs/articles/web_only/FOCUS_Z.html
+++ b/docs/articles/web_only/FOCUS_Z.html
@@ -85,7 +85,7 @@
<h1>Example evaluation of FOCUS dataset Z</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2019-02-22</h4>
+ <h4 class="date">2019-02-25</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 fbf2de33..4209d2bc 100644
--- a/docs/articles/web_only/compiled_models.html
+++ b/docs/articles/web_only/compiled_models.html
@@ -85,7 +85,7 @@
<h1>Performance benefit by using compiled model definitions in mkin</h1>
<h4 class="author">Johannes Ranke</h4>
- <h4 class="date">2019-02-22</h4>
+ <h4 class="date">2019-02-25</h4>
<div class="hidden name"><code>compiled_models.Rmd</code></div>
@@ -126,9 +126,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.484 1.000 2.483 0
-## 1 deSolve, not compiled 3 17.963 7.231 17.951 0
-## 2 Eigenvalue based 3 3.146 1.267 3.144 0
+## 3 deSolve, compiled 3 2.394 1.000 2.388 0.004
+## 1 deSolve, not compiled 3 17.923 7.487 17.910 0.000
+## 2 Eigenvalue based 3 3.021 1.262 3.018 0.000
## user.child sys.child
## 3 0 0
## 1 0 0
@@ -157,8 +157,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 4.232 1.000 4.226 0.004
-## 1 deSolve, not compiled 3 37.946 8.966 37.924 0.000
+## 2 deSolve, compiled 3 4.162 1.000 4.158 0
+## 1 deSolve, not compiled 3 37.536 9.019 37.517 0
## user.child sys.child
## 2 0 0
## 1 0 0</code></pre>

Contact - Imprint