diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2018-09-18 10:14:40 +0200 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2018-09-18 10:14:40 +0200 |
commit | 39b6d8b8569801c2957b22d0973b5ad0c9405e7d (patch) | |
tree | 97d0580eec85d9ab4196338ec742ba407ccfa7f8 /docs/articles | |
parent | 9a793d0d39c8239ebcc76390f227596cef9b9be1 (diff) |
Support maximum twa for HS, test, docs
Diffstat (limited to 'docs/articles')
-rw-r--r-- | docs/articles/FOCUS_D.html | 4 | ||||
-rw-r--r-- | docs/articles/FOCUS_L.html | 46 | ||||
-rw-r--r-- | docs/articles/index.html | 2 | ||||
-rw-r--r-- | docs/articles/mkin.html | 4 | ||||
-rw-r--r-- | docs/articles/twa.html | 4 | ||||
-rw-r--r-- | docs/articles/web_only/FOCUS_Z.html | 4 | ||||
-rw-r--r-- | docs/articles/web_only/compiled_models.html | 14 |
7 files changed, 39 insertions, 39 deletions
diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index a90cb7fb..b44462aa 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.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.5</span> + <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="Released package">0.9.47.6</span> </span> </div> @@ -84,7 +84,7 @@ <h1>Example evaluation of FOCUS Example Dataset D</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-09-14</h4> + <h4 class="date">2018-09-18</h4> <div class="hidden name"><code>FOCUS_D.Rmd</code></div> diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index 2a99a609..8ef55b81 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.5</span> + <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="Released package">0.9.47.6</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-09-14</h4> + <h4 class="date">2018-09-18</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.5 ## R version used for fitting: 3.5.1 -## Date of fit: Fri Sep 14 21:00:22 2018 -## Date of summary: Fri Sep 14 21:00:22 2018 +## Date of fit: Tue Sep 18 09:50:45 2018 +## Date of summary: Tue Sep 18 09:50:45 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.087 s +## Fitted with method Port using 37 model solutions performed in 0.081 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.5 ## R version used for fitting: 3.5.1 -## Date of fit: Fri Sep 14 21:00:23 2018 -## Date of summary: Fri Sep 14 21:00:23 2018 +## Date of fit: Tue Sep 18 09:50:47 2018 +## Date of summary: Tue Sep 18 09:50:47 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.352 s +## Fitted with method Port using 611 model solutions performed in 1.294 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.5 ## R version used for fitting: 3.5.1 -## Date of fit: Fri Sep 14 21:00:24 2018 -## Date of summary: Fri Sep 14 21:00:24 2018 +## Date of fit: Tue Sep 18 09:50:47 2018 +## Date of summary: Tue Sep 18 09:50:47 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.175 s +## Fitted with method Port using 81 model solutions performed in 0.166 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.5 ## R version used for fitting: 3.5.1 -## Date of fit: Fri Sep 14 21:00:25 2018 -## Date of summary: Fri Sep 14 21:00:25 2018 +## Date of fit: Tue Sep 18 09:50:48 2018 +## Date of summary: Tue Sep 18 09:50:48 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.758 s +## Fitted with method Port using 336 model solutions performed in 0.714 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.5 ## R version used for fitting: 3.5.1 -## Date of fit: Fri Sep 14 21:00:26 2018 -## Date of summary: Fri Sep 14 21:00:26 2018 +## Date of fit: Tue Sep 18 09:50:49 2018 +## Date of summary: Tue Sep 18 09:50:49 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.31 s +## Fitted with method Port using 137 model solutions performed in 0.299 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.5 ## R version used for fitting: 3.5.1 -## Date of fit: Fri Sep 14 21:00:26 2018 -## Date of summary: Fri Sep 14 21:00:27 2018 +## Date of fit: Tue Sep 18 09:50:50 2018 +## Date of summary: Tue Sep 18 09:50:50 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.102 s +## Fitted with method Port using 46 model solutions performed in 0.093 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.5 ## R version used for fitting: 3.5.1 -## Date of fit: Fri Sep 14 21:00:26 2018 -## Date of summary: Fri Sep 14 21:00:27 2018 +## Date of fit: Tue Sep 18 09:50:50 2018 +## Date of summary: Tue Sep 18 09:50:50 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.151 s +## Fitted with method Port using 66 model solutions performed in 0.138 s ## ## Weighting: none ## diff --git a/docs/articles/index.html b/docs/articles/index.html index ad0ab46e..c48dfec7 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -58,7 +58,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.5</span> + <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="Released package">0.9.47.6</span> </span> </div> diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html index 3ae09165..e483043b 100644 --- a/docs/articles/mkin.html +++ b/docs/articles/mkin.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.5</span> + <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="Released package">0.9.47.6</span> </span> </div> @@ -84,7 +84,7 @@ <h1>Introduction to mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-09-14</h4> + <h4 class="date">2018-09-18</h4> <div class="hidden name"><code>mkin.Rmd</code></div> diff --git a/docs/articles/twa.html b/docs/articles/twa.html index 4d516ff1..d9249f9d 100644 --- a/docs/articles/twa.html +++ b/docs/articles/twa.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.5</span> + <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="Released package">0.9.47.6</span> </span> </div> @@ -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-14</h4> + <h4 class="date">2018-09-18</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 381c9e4f..a3e743d1 100644 --- a/docs/articles/web_only/FOCUS_Z.html +++ b/docs/articles/web_only/FOCUS_Z.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.5</span> + <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="Released package">0.9.47.6</span> </span> </div> @@ -84,7 +84,7 @@ <h1>Example evaluation of FOCUS dataset Z</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-09-14</h4> + <h4 class="date">2018-09-18</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 9aac1ab2..3b3e9150 100644 --- a/docs/articles/web_only/compiled_models.html +++ b/docs/articles/web_only/compiled_models.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.5</span> + <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="Released package">0.9.47.6</span> </span> </div> @@ -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-14</h4> + <h4 class="date">2018-09-18</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.134 1.000 2.132 0 -## 1 deSolve, not compiled 3 16.165 7.575 16.157 0 -## 2 Eigenvalue based 3 2.597 1.217 2.595 0 +## 3 deSolve, compiled 3 2.001 1.000 1.999 0 +## 1 deSolve, not compiled 3 15.374 7.683 15.368 0 +## 2 Eigenvalue based 3 2.439 1.219 2.438 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.717 1.000 3.715 0 -## 1 deSolve, not compiled 3 34.646 9.321 34.630 0 +## 2 deSolve, compiled 3 3.608 1.000 3.607 0 +## 1 deSolve, not compiled 3 33.150 9.188 33.135 0 ## user.child sys.child ## 2 0 0 ## 1 0 0</code></pre> |