diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2020-10-08 09:31:35 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2020-10-08 09:31:35 +0200 |
| commit | bc3825ae2d12c18ea3d3caf17eb23c93fef180b8 (patch) | |
| tree | 112e70a29db2fb35dd624af20f4d400c579b0283 /docs/dev/articles/web_only/benchmarks.html | |
| parent | c7635af214729d2dc15dd8fbee2ebe6bc64493a4 (diff) | |
Fix issues for release
Diffstat (limited to 'docs/dev/articles/web_only/benchmarks.html')
| -rw-r--r-- | docs/dev/articles/web_only/benchmarks.html | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/docs/dev/articles/web_only/benchmarks.html b/docs/dev/articles/web_only/benchmarks.html index 9e53f113..30b7a879 100644 --- a/docs/dev/articles/web_only/benchmarks.html +++ b/docs/dev/articles/web_only/benchmarks.html @@ -101,7 +101,7 @@ <h1 data-toc-skip>Benchmark timings for mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2020-05-27</h4> + <h4 class="date">2020-10-08</h4> <small class="dont-index">Source: <a href="http://github.com/jranke/mkin/blob/master/vignettes/web_only/benchmarks.rmd"><code>vignettes/web_only/benchmarks.rmd</code></a></small> <div class="hidden name"><code>benchmarks.rmd</code></div> @@ -132,13 +132,20 @@ <span class="no">DFOP_SFO</span> <span class="kw"><-</span> <span class="fu"><a href="../../reference/mkinmod.html">mkinmod</a></span>( <span class="kw">parent</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"FOMC"</span>, <span class="st">"m1"</span>), <span class="kw">m1</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>)) -<span class="no">t3</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_SFO</span>, <span class="no">FOMC_SFO</span>, <span class="no">DFOP_SFO</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">FOCUS_D</span>)))<span class="kw">[[</span><span class="st">"elapsed"</span>]] -<span class="no">t4</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_SFO</span>, <span class="no">FOMC_SFO</span>, <span class="no">DFOP_SFO</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">FOCUS_D</span>), +<span class="no">t3</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_SFO</span>, <span class="no">FOMC_SFO</span>, <span class="no">DFOP_SFO</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">FOCUS_D</span>)))<span class="kw">[[</span><span class="st">"elapsed"</span>]]</pre></body></html></div> +<pre><code>## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): +## Shapiro-Wilk test for standardized residuals: p = 0.0165</code></pre> +<pre><code>## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): +## Shapiro-Wilk test for standardized residuals: p = 0.0499 + +## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): +## Shapiro-Wilk test for standardized residuals: p = 0.0499</code></pre> +<div class="sourceCode" id="cb5"><html><body><pre class="r"><span class="no">t4</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_SFO</span>, <span class="no">FOMC_SFO</span>, <span class="no">DFOP_SFO</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">FOCUS_D</span>), <span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"tc"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]] <span class="no">t5</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_SFO</span>, <span class="no">FOMC_SFO</span>, <span class="no">DFOP_SFO</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">FOCUS_D</span>), <span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"obs"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]]</pre></body></html></div> <p>Two metabolites, synthetic data:</p> -<div class="sourceCode" id="cb3"><html><body><pre class="r"><span class="no">m_synth_SFO_lin</span> <span class="kw"><-</span> <span class="fu"><a href="../../reference/mkinmod.html">mkinmod</a></span>(<span class="kw">parent</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"M1"</span>), +<div class="sourceCode" id="cb6"><html><body><pre class="r"><span class="no">m_synth_SFO_lin</span> <span class="kw"><-</span> <span class="fu"><a href="../../reference/mkinmod.html">mkinmod</a></span>(<span class="kw">parent</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"M1"</span>), <span class="kw">M1</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>, <span class="st">"M2"</span>), <span class="kw">M2</span> <span class="kw">=</span> <span class="fu"><a href="../../reference/mkinsub.html">mkinsub</a></span>(<span class="st">"SFO"</span>), <span class="kw">use_of_ff</span> <span class="kw">=</span> <span class="st">"max"</span>, <span class="kw">quiet</span> <span class="kw">=</span> <span class="fl">TRUE</span>) @@ -153,9 +160,10 @@ <span class="no">DFOP_par_c</span> <span class="kw"><-</span> <span class="no">synthetic_data_for_UBA_2014</span><span class="kw">[[</span><span class="fl">12</span>]]$<span class="no">data</span> <span class="no">t6</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_SFO_lin</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_lin_a</span>)))<span class="kw">[[</span><span class="st">"elapsed"</span>]] -<span class="no">t7</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_DFOP_par</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">DFOP_par_c</span>)))<span class="kw">[[</span><span class="st">"elapsed"</span>]] - -<span class="no">t8</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_SFO_lin</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_lin_a</span>), +<span class="no">t7</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_DFOP_par</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">DFOP_par_c</span>)))<span class="kw">[[</span><span class="st">"elapsed"</span>]]</pre></body></html></div> +<pre><code>## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): +## Shapiro-Wilk test for standardized residuals: p = 0.000174</code></pre> +<div class="sourceCode" id="cb8"><html><body><pre class="r"><span class="no">t8</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_SFO_lin</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">SFO_lin_a</span>), <span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"tc"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]] <span class="no">t9</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_DFOP_par</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">DFOP_par_c</span>), <span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"tc"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]] @@ -164,7 +172,7 @@ <span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"obs"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]] <span class="no">t11</span> <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.time.html">system.time</a></span>(<span class="fu">mmkin_bench</span>(<span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">m_synth_DFOP_par</span>), <span class="fu"><a href="https://rdrr.io/r/base/list.html">list</a></span>(<span class="no">DFOP_par_c</span>), <span class="kw">error_model</span> <span class="kw">=</span> <span class="st">"obs"</span>))<span class="kw">[[</span><span class="st">"elapsed"</span>]]</pre></body></html></div> -<div class="sourceCode" id="cb4"><html><body><pre class="r"><span class="no">mkin_benchmarks</span>[<span class="no">system_string</span>, <span class="fu"><a href="https://rdrr.io/r/base/paste.html">paste0</a></span>(<span class="st">"t"</span>, <span class="fl">1</span>:<span class="fl">11</span>)] <span class="kw"><-</span> +<div class="sourceCode" id="cb9"><html><body><pre class="r"><span class="no">mkin_benchmarks</span>[<span class="no">system_string</span>, <span class="fu"><a href="https://rdrr.io/r/base/paste.html">paste0</a></span>(<span class="st">"t"</span>, <span class="fl">1</span>:<span class="fl">11</span>)] <span class="kw"><-</span> <span class="fu"><a href="https://rdrr.io/r/base/c.html">c</a></span>(<span class="no">t1</span>, <span class="no">t2</span>, <span class="no">t3</span>, <span class="no">t4</span>, <span class="no">t5</span>, <span class="no">t6</span>, <span class="no">t7</span>, <span class="no">t8</span>, <span class="no">t9</span>, <span class="no">t10</span>, <span class="no">t11</span>) <span class="fu"><a href="https://rdrr.io/r/base/save.html">save</a></span>(<span class="no">mkin_benchmarks</span>, <span class="kw">file</span> <span class="kw">=</span> <span class="st">"~/git/mkin/vignettes/web_only/mkin_benchmarks.rda"</span>)</pre></body></html></div> </div> @@ -216,8 +224,8 @@ </tr> <tr class="odd"> <td align="left">0.9.50.3</td> -<td align="right">1.746</td> -<td align="right">3.716</td> +<td align="right">1.707</td> +<td align="right">4.062</td> </tr> </tbody> </table> @@ -272,9 +280,9 @@ </tr> <tr class="odd"> <td align="left">0.9.50.3</td> -<td align="right">1.385</td> -<td align="right">6.562</td> -<td align="right">2.736</td> +<td align="right">1.372</td> +<td align="right">6.233</td> +<td align="right">2.779</td> </tr> </tbody> </table> @@ -350,12 +358,12 @@ </tr> <tr class="odd"> <td align="left">0.9.50.3</td> -<td align="right">0.760</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.976</td> +<td align="right">0.768</td> +<td align="right">1.235</td> +<td align="right">1.302</td> +<td align="right">2.921</td> +<td align="right">2.078</td> +<td align="right">3.040</td> </tr> </tbody> </table> |