diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2019-02-21 15:01:03 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2019-02-21 15:01:03 +0100 |
commit | af84d618508d5882072ab7b8de481cb5efc60852 (patch) | |
tree | 23d35343d155659c437770cfbf5f6b5d28920bf3 /docs/articles | |
parent | d89e3d22eb9dc383897b09e9c5aa1b57f65cdbf0 (diff) |
Make example logistic fit quiet
Diffstat (limited to 'docs/articles')
-rw-r--r-- | docs/articles/FOCUS_D.html | 6 | ||||
-rw-r--r-- | docs/articles/FOCUS_L.html | 42 | ||||
-rw-r--r-- | docs/articles/web_only/compiled_models.html | 12 |
3 files changed, 30 insertions, 30 deletions
diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index 6a8500a0..4a080ac1 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -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.47.6 ## R version used for fitting: 3.5.2 -## Date of fit: Thu Feb 21 14:32:03 2019 -## Date of summary: Thu Feb 21 14:32:04 2019 +## Date of fit: Thu Feb 21 14:58:25 2019 +## Date of summary: Thu Feb 21 14:58:26 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.735 s +## Fitted with method Port using 153 model solutions performed in 0.705 s ## ## Weighting: none ## diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index 265dd96c..b9f72dbe 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -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.47.6 ## R version used for fitting: 3.5.2 -## Date of fit: Thu Feb 21 14:32:06 2019 -## Date of summary: Thu Feb 21 14:32:06 2019 +## Date of fit: Thu Feb 21 14:58:27 2019 +## Date of summary: Thu Feb 21 14:58:27 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.097 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.47.6 ## R version used for fitting: 3.5.2 -## Date of fit: Thu Feb 21 14:32:08 2019 -## Date of summary: Thu Feb 21 14:32:08 2019 +## Date of fit: Thu Feb 21 14:58:29 2019 +## Date of summary: Thu Feb 21 14:58:29 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.547 s +## Fitted with method Port using 611 model solutions performed in 1.507 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.47.6 ## R version used for fitting: 3.5.2 -## Date of fit: Thu Feb 21 14:32:08 2019 -## Date of summary: Thu Feb 21 14:32:08 2019 +## Date of fit: Thu Feb 21 14:58:30 2019 +## Date of summary: Thu Feb 21 14:58:30 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.201 s +## Fitted with method Port using 81 model solutions performed in 0.197 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.47.6 ## R version used for fitting: 3.5.2 -## Date of fit: Thu Feb 21 14:32:09 2019 -## Date of summary: Thu Feb 21 14:32:09 2019 +## Date of fit: Thu Feb 21 14:58:31 2019 +## Date of summary: Thu Feb 21 14:58:31 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.86 s +## Fitted with method Port using 336 model solutions performed in 0.842 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.47.6 ## R version used for fitting: 3.5.2 -## Date of fit: Thu Feb 21 14:32:10 2019 -## Date of summary: Thu Feb 21 14:32:11 2019 +## Date of fit: Thu Feb 21 14:58:32 2019 +## Date of summary: Thu Feb 21 14:58:32 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.351 s +## Fitted with method Port using 137 model solutions performed in 0.346 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.47.6 ## R version used for fitting: 3.5.2 -## Date of fit: Thu Feb 21 14:32:11 2019 -## Date of summary: Thu Feb 21 14:32:11 2019 +## Date of fit: Thu Feb 21 14:58:32 2019 +## Date of summary: Thu Feb 21 14:58:33 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.113 s +## Fitted with method Port using 46 model solutions performed in 0.111 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.47.6 ## R version used for fitting: 3.5.2 -## Date of fit: Thu Feb 21 14:32:11 2019 -## Date of summary: Thu Feb 21 14:32:11 2019 +## Date of fit: Thu Feb 21 14:58:33 2019 +## Date of summary: Thu Feb 21 14:58:33 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.168 s +## Fitted with method Port using 66 model solutions performed in 0.165 s ## ## Weighting: none ## diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html index 3a37d114..e1149c67 100644 --- a/docs/articles/web_only/compiled_models.html +++ b/docs/articles/web_only/compiled_models.html @@ -126,14 +126,14 @@ <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.429 1.000 2.427 0 -## 1 deSolve, not compiled 3 17.826 7.339 17.815 0 -## 2 Eigenvalue based 3 2.968 1.222 2.967 0 +## 3 deSolve, compiled 3 2.329 1.000 2.327 0 +## 1 deSolve, not compiled 3 17.556 7.538 17.549 0 +## 2 Eigenvalue based 3 2.863 1.229 2.860 0 ## user.child sys.child ## 3 0 0 ## 1 0 0 ## 2 0 0</code></pre> -<p>We see that using the compiled model is by a factor of around 7 faster than using the R version with the default ode solver, and it is even faster than the Eigenvalue based solution implemented in R which does not need iterative solution of the ODEs.</p> +<p>We see that using the compiled model is by a factor of around 8 faster than using the R version with the default ode solver, and it is even faster than the Eigenvalue based solution implemented in R which does not need iterative solution of the ODEs.</p> </div> <div id="model-that-can-not-be-solved-with-eigenvalues" class="section level2"> <h2 class="hasAnchor"> @@ -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.234 1.000 4.232 0 -## 1 deSolve, not compiled 3 37.807 8.929 37.785 0 +## 2 deSolve, compiled 3 4.105 1.000 4.101 0 +## 1 deSolve, not compiled 3 37.400 9.111 37.381 0 ## user.child sys.child ## 2 0 0 ## 1 0 0</code></pre> |