diff options
Diffstat (limited to 'docs/dev/reference/mkinfit.html')
| -rw-r--r-- | docs/dev/reference/mkinfit.html | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/docs/dev/reference/mkinfit.html b/docs/dev/reference/mkinfit.html index 17da44cb..ee596e89 100644 --- a/docs/dev/reference/mkinfit.html +++ b/docs/dev/reference/mkinfit.html @@ -25,7 +25,7 @@ likelihood function."><meta name="robots" content="noindex"><!-- mathjax --><scr </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.0</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.2</span> </span> </div> @@ -67,7 +67,10 @@ likelihood function."><meta name="robots" content="noindex"><!-- mathjax --><scr <a href="../articles/web_only/NAFTA_examples.html">Example evaluation of NAFTA SOP Attachment examples</a> </li> <li> - <a href="../articles/web_only/benchmarks.html">Some benchmark timings</a> + <a href="../articles/web_only/benchmarks.html">Benchmark timings for mkin</a> + </li> + <li> + <a href="../articles/web_only/saem_benchmarks.html">Benchmark timings for saem.mmkin</a> </li> </ul></li> <li> @@ -381,17 +384,17 @@ Degradation Data. <em>Environments</em> 6(12) 124 <span class="r-in"><span><span class="co"># Use shorthand notation for parent only degradation</span></span></span> <span class="r-in"><span><span class="va">fit</span> <span class="op"><-</span> <span class="fu">mkinfit</span><span class="op">(</span><span class="st">"FOMC"</span>, <span class="va">FOCUS_2006_C</span>, quiet <span class="op">=</span> <span class="cn">TRUE</span><span class="op">)</span></span></span> <span class="r-in"><span><span class="fu"><a href="https://rdrr.io/r/base/summary.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">fit</span><span class="op">)</span></span></span> -<span class="r-out co"><span class="r-pr">#></span> mkin version used for fitting: 1.2.0 </span> +<span class="r-out co"><span class="r-pr">#></span> mkin version used for fitting: 1.2.2 </span> <span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.2.2 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of fit: Tue Nov 1 14:09:26 2022 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of summary: Tue Nov 1 14:09:26 2022 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of fit: Thu Nov 24 08:05:53 2022 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of summary: Thu Nov 24 08:05:53 2022 </span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> Equations:</span> <span class="r-out co"><span class="r-pr">#></span> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent</span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> Model predictions using solution type analytical </span> <span class="r-out co"><span class="r-pr">#></span> </span> -<span class="r-out co"><span class="r-pr">#></span> Fitted using 222 model solutions performed in 0.049 s</span> +<span class="r-out co"><span class="r-pr">#></span> Fitted using 222 model solutions performed in 0.045 s</span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> Error model: Constant variance </span> <span class="r-out co"><span class="r-pr">#></span> </span> @@ -531,11 +534,10 @@ Degradation Data. <em>Environments</em> 6(12) 124 <span class="r-in"><span> analytical <span class="op">=</span> <span class="fu">mkinfit</span><span class="op">(</span><span class="va">SFO_SFO</span>, <span class="va">FOCUS_D</span>, quiet <span class="op">=</span> <span class="cn">TRUE</span>, error_model <span class="op">=</span> <span class="st">"tc"</span>,</span></span> <span class="r-in"><span> solution_type <span class="op">=</span> <span class="st">"analytical"</span><span class="op">)</span><span class="op">)</span></span></span> <span class="r-in"><span><span class="op">}</span></span></span> -<span class="r-msg co"><span class="r-pr">#></span> Loading required package: rbenchmark</span> <span class="r-out co"><span class="r-pr">#></span> test relative elapsed</span> -<span class="r-out co"><span class="r-pr">#></span> 3 analytical 1.000 0.559</span> -<span class="r-out co"><span class="r-pr">#></span> 1 deSolve_compiled 1.556 0.870</span> -<span class="r-out co"><span class="r-pr">#></span> 2 eigen 2.603 1.455</span> +<span class="r-out co"><span class="r-pr">#></span> 3 analytical 1.000 0.616</span> +<span class="r-out co"><span class="r-pr">#></span> 1 deSolve_compiled 1.505 0.927</span> +<span class="r-out co"><span class="r-pr">#></span> 2 eigen 2.455 1.512</span> <span class="r-in"><span><span class="co"># }</span></span></span> <span class="r-in"><span></span></span> <span class="r-in"><span><span class="co"># Use stepwise fitting, using optimised parameters from parent only fit, FOMC-SFO</span></span></span> @@ -562,10 +564,10 @@ Degradation Data. <em>Environments</em> 6(12) 124 <span class="r-wrn co"><span class="r-pr">#></span> <span class="warning">Warning: </span>NaNs produced</span> <span class="r-wrn co"><span class="r-pr">#></span> <span class="warning">Warning: </span>NaNs produced</span> <span class="r-wrn co"><span class="r-pr">#></span> <span class="warning">Warning: </span>diag(.) had 0 or NA entries; non-finite result is doubtful</span> -<span class="r-out co"><span class="r-pr">#></span> mkin version used for fitting: 1.2.0 </span> +<span class="r-out co"><span class="r-pr">#></span> mkin version used for fitting: 1.2.2 </span> <span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.2.2 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of fit: Tue Nov 1 14:09:37 2022 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of summary: Tue Nov 1 14:09:37 2022 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of fit: Thu Nov 24 08:06:05 2022 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of summary: Thu Nov 24 08:06:05 2022 </span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> Equations:</span> <span class="r-out co"><span class="r-pr">#></span> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent</span> @@ -574,7 +576,7 @@ Degradation Data. <em>Environments</em> 6(12) 124 <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> Model predictions using solution type deSolve </span> <span class="r-out co"><span class="r-pr">#></span> </span> -<span class="r-out co"><span class="r-pr">#></span> Fitted using 3729 model solutions performed in 2.43 s</span> +<span class="r-out co"><span class="r-pr">#></span> Fitted using 3729 model solutions performed in 2.81 s</span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> Error model: Two-component variance function </span> <span class="r-out co"><span class="r-pr">#></span> </span> |