diff options
Diffstat (limited to 'docs/dev/articles')
-rw-r--r-- | docs/dev/articles/FOCUS_D.html | 8 | ||||
-rw-r--r-- | docs/dev/articles/FOCUS_L.html | 40 | ||||
-rw-r--r-- | docs/dev/articles/index.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/mkin.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/twa.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/web_only/FOCUS_Z.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/web_only/NAFTA_examples.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/web_only/benchmarks.html | 20 | ||||
-rw-r--r-- | docs/dev/articles/web_only/compiled_models.html | 14 |
9 files changed, 46 insertions, 46 deletions
diff --git a/docs/dev/articles/FOCUS_D.html b/docs/dev/articles/FOCUS_D.html index 0b3ae03a..7d5dd732 100644 --- a/docs/dev/articles/FOCUS_D.html +++ b/docs/dev/articles/FOCUS_D.html @@ -32,7 +32,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-danger" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> </span> </div> @@ -181,8 +181,8 @@ <div class="sourceCode" id="cb11"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">fit</span>)</pre></body></html></div> <pre><code>## mkin version used for fitting: 0.9.50.3 ## R version used for fitting: 4.0.0 -## Date of fit: Wed May 27 06:02:21 2020 -## Date of summary: Wed May 27 06:02:21 2020 +## Date of fit: Wed May 27 07:51:36 2020 +## Date of summary: Wed May 27 07:51:37 2020 ## ## Equations: ## d_parent/dt = - k_parent * parent @@ -190,7 +190,7 @@ ## ## Model predictions using solution type analytical ## -## Fitted using 421 model solutions performed in 0.177 s +## Fitted using 421 model solutions performed in 0.173 s ## ## Error model: Constant variance ## diff --git a/docs/dev/articles/FOCUS_L.html b/docs/dev/articles/FOCUS_L.html index 91043d0f..d69815ab 100644 --- a/docs/dev/articles/FOCUS_L.html +++ b/docs/dev/articles/FOCUS_L.html @@ -32,7 +32,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-danger" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> </span> </div> @@ -127,15 +127,15 @@ <span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">m.L1.SFO</span>)</pre></body></html></div> <pre><code>## mkin version used for fitting: 0.9.50.3 ## R version used for fitting: 4.0.0 -## Date of fit: Wed May 27 06:02:23 2020 -## Date of summary: Wed May 27 06:02:23 2020 +## Date of fit: Wed May 27 07:51:39 2020 +## Date of summary: Wed May 27 07:51:39 2020 ## ## Equations: ## d_parent/dt = - k_parent_sink * parent ## ## Model predictions using solution type analytical ## -## Fitted using 133 model solutions performed in 0.03 s +## Fitted using 133 model solutions performed in 0.031 s ## ## Error model: Constant variance ## @@ -228,8 +228,8 @@ ## doubtful</code></pre> <pre><code>## mkin version used for fitting: 0.9.50.3 ## R version used for fitting: 4.0.0 -## Date of fit: Wed May 27 06:02:24 2020 -## Date of summary: Wed May 27 06:02:24 2020 +## Date of fit: Wed May 27 07:51:39 2020 +## Date of summary: Wed May 27 07:51:39 2020 ## ## ## Warning: Optimisation did not converge: @@ -336,15 +336,15 @@ <div class="sourceCode" id="cb17"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">m.L2.FOMC</span>, <span class="kw">data</span> <span class="kw">=</span> <span class="fl">FALSE</span>)</pre></body></html></div> <pre><code>## mkin version used for fitting: 0.9.50.3 ## R version used for fitting: 4.0.0 -## Date of fit: Wed May 27 06:02:24 2020 -## Date of summary: Wed May 27 06:02:24 2020 +## Date of fit: Wed May 27 07:51:40 2020 +## Date of summary: Wed May 27 07:51:40 2020 ## ## Equations: ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent ## ## Model predictions using solution type analytical ## -## Fitted using 239 model solutions performed in 0.047 s +## Fitted using 239 model solutions performed in 0.048 s ## ## Error model: Constant variance ## @@ -415,8 +415,8 @@ <div class="sourceCode" id="cb20"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">m.L2.DFOP</span>, <span class="kw">data</span> <span class="kw">=</span> <span class="fl">FALSE</span>)</pre></body></html></div> <pre><code>## mkin version used for fitting: 0.9.50.3 ## R version used for fitting: 4.0.0 -## Date of fit: Wed May 27 06:02:24 2020 -## Date of summary: Wed May 27 06:02:24 2020 +## Date of fit: Wed May 27 07:51:40 2020 +## Date of summary: Wed May 27 07:51:40 2020 ## ## Equations: ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -518,8 +518,8 @@ <div class="sourceCode" id="cb24"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">mm.L3</span><span class="kw">[[</span><span class="st">"DFOP"</span>, <span class="fl">1</span>]])</pre></body></html></div> <pre><code>## mkin version used for fitting: 0.9.50.3 ## R version used for fitting: 4.0.0 -## Date of fit: Wed May 27 06:02:25 2020 -## Date of summary: Wed May 27 06:02:25 2020 +## Date of fit: Wed May 27 07:51:41 2020 +## Date of summary: Wed May 27 07:51:41 2020 ## ## Equations: ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -528,7 +528,7 @@ ## ## Model predictions using solution type analytical ## -## Fitted using 373 model solutions performed in 0.08 s +## Fitted using 373 model solutions performed in 0.079 s ## ## Error model: Constant variance ## @@ -627,15 +627,15 @@ <div class="sourceCode" id="cb29"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">mm.L4</span><span class="kw">[[</span><span class="st">"SFO"</span>, <span class="fl">1</span>]], <span class="kw">data</span> <span class="kw">=</span> <span class="fl">FALSE</span>)</pre></body></html></div> <pre><code>## mkin version used for fitting: 0.9.50.3 ## R version used for fitting: 4.0.0 -## Date of fit: Wed May 27 06:02:25 2020 -## Date of summary: Wed May 27 06:02:26 2020 +## Date of fit: Wed May 27 07:51:41 2020 +## Date of summary: Wed May 27 07:51:41 2020 ## ## Equations: ## d_parent/dt = - k_parent_sink * parent ## ## Model predictions using solution type analytical ## -## Fitted using 142 model solutions performed in 0.029 s +## Fitted using 142 model solutions performed in 0.028 s ## ## Error model: Constant variance ## @@ -691,15 +691,15 @@ <div class="sourceCode" id="cb31"><html><body><pre class="r"><span class="fu"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(<span class="no">mm.L4</span><span class="kw">[[</span><span class="st">"FOMC"</span>, <span class="fl">1</span>]], <span class="kw">data</span> <span class="kw">=</span> <span class="fl">FALSE</span>)</pre></body></html></div> <pre><code>## mkin version used for fitting: 0.9.50.3 ## R version used for fitting: 4.0.0 -## Date of fit: Wed May 27 06:02:25 2020 -## Date of summary: Wed May 27 06:02:26 2020 +## Date of fit: Wed May 27 07:51:41 2020 +## Date of summary: Wed May 27 07:51:41 2020 ## ## Equations: ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent ## ## Model predictions using solution type analytical ## -## Fitted using 224 model solutions performed in 0.043 s +## Fitted using 224 model solutions performed in 0.044 s ## ## Error model: Constant variance ## diff --git a/docs/dev/articles/index.html b/docs/dev/articles/index.html index 3d5dd360..472e9396 100644 --- a/docs/dev/articles/index.html +++ b/docs/dev/articles/index.html @@ -71,7 +71,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-danger" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> </span> </div> diff --git a/docs/dev/articles/mkin.html b/docs/dev/articles/mkin.html index 2dd6dcb8..4cc06a43 100644 --- a/docs/dev/articles/mkin.html +++ b/docs/dev/articles/mkin.html @@ -32,7 +32,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-danger" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> </span> </div> diff --git a/docs/dev/articles/twa.html b/docs/dev/articles/twa.html index d4754a1f..29be6c95 100644 --- a/docs/dev/articles/twa.html +++ b/docs/dev/articles/twa.html @@ -32,7 +32,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-danger" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> </span> </div> diff --git a/docs/dev/articles/web_only/FOCUS_Z.html b/docs/dev/articles/web_only/FOCUS_Z.html index 7fca4e49..270232d7 100644 --- a/docs/dev/articles/web_only/FOCUS_Z.html +++ b/docs/dev/articles/web_only/FOCUS_Z.html @@ -32,7 +32,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-danger" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> </span> </div> diff --git a/docs/dev/articles/web_only/NAFTA_examples.html b/docs/dev/articles/web_only/NAFTA_examples.html index 29f4cd8b..12499452 100644 --- a/docs/dev/articles/web_only/NAFTA_examples.html +++ b/docs/dev/articles/web_only/NAFTA_examples.html @@ -32,7 +32,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-danger" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> </span> </div> diff --git a/docs/dev/articles/web_only/benchmarks.html b/docs/dev/articles/web_only/benchmarks.html index b46b873c..9e53f113 100644 --- a/docs/dev/articles/web_only/benchmarks.html +++ b/docs/dev/articles/web_only/benchmarks.html @@ -32,7 +32,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-danger" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> </span> </div> @@ -216,8 +216,8 @@ </tr> <tr class="odd"> <td align="left">0.9.50.3</td> -<td align="right">1.752</td> -<td align="right">3.728</td> +<td align="right">1.746</td> +<td align="right">3.716</td> </tr> </tbody> </table> @@ -272,9 +272,9 @@ </tr> <tr class="odd"> <td align="left">0.9.50.3</td> -<td align="right">1.389</td> -<td align="right">6.579</td> -<td align="right">2.740</td> +<td align="right">1.385</td> +<td align="right">6.562</td> +<td align="right">2.736</td> </tr> </tbody> </table> @@ -351,11 +351,11 @@ <tr class="odd"> <td align="left">0.9.50.3</td> <td align="right">0.760</td> -<td align="right">1.252</td> -<td align="right">1.457</td> -<td align="right">4.201</td> +<td align="right">1.226</td> +<td align="right">1.455</td> +<td align="right">4.198</td> <td align="right">2.007</td> -<td align="right">2.979</td> +<td align="right">2.976</td> </tr> </tbody> </table> diff --git a/docs/dev/articles/web_only/compiled_models.html b/docs/dev/articles/web_only/compiled_models.html index 7b5dc8ca..997e90ea 100644 --- a/docs/dev/articles/web_only/compiled_models.html +++ b/docs/dev/articles/web_only/compiled_models.html @@ -32,7 +32,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-danger" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.3</span> </span> </div> @@ -153,10 +153,10 @@ <span class="fu"><a href="https://rdrr.io/r/base/print.html">print</a></span>(<span class="st">"R package rbenchmark is not available"</span>) }</pre></body></html></div> <pre><code>## test replications relative elapsed -## 4 analytical 1 1.000 0.202 -## 3 deSolve, compiled 1 1.703 0.344 -## 2 Eigenvalue based 1 1.990 0.402 -## 1 deSolve, not compiled 1 40.173 8.115</code></pre> +## 4 analytical 1 1.000 0.201 +## 3 deSolve, compiled 1 1.711 0.344 +## 2 Eigenvalue based 1 1.960 0.394 +## 1 deSolve, not compiled 1 39.881 8.016</code></pre> <p>We see that using the compiled model is by more than a factor of 10 faster than using deSolve without compiled code.</p> </div> <div id="model-without-analytical-solution" class="section level2"> @@ -182,8 +182,8 @@ }</pre></body></html></div> <pre><code>## Successfully compiled differential equation model from auto-generated C code.</code></pre> <pre><code>## test replications relative elapsed -## 2 deSolve, compiled 1 1.000 0.469 -## 1 deSolve, not compiled 1 30.384 14.250</code></pre> +## 2 deSolve, compiled 1 1.000 0.467 +## 1 deSolve, not compiled 1 30.244 14.124</code></pre> <p>Here we get a performance benefit of a factor of 30 using the version of the differential equation model compiled from C code!</p> <p>This vignette was built with mkin 0.9.50.3 on</p> <pre><code>## R version 4.0.0 (2020-04-24) |