diff options
Diffstat (limited to 'docs/dev/reference')
88 files changed, 145 insertions, 146 deletions
diff --git a/docs/dev/reference/AIC.mmkin.html b/docs/dev/reference/AIC.mmkin.html index ebfe052d..1179c7ac 100644 --- a/docs/dev/reference/AIC.mmkin.html +++ b/docs/dev/reference/AIC.mmkin.html @@ -18,7 +18,7 @@ same dataset."><meta name="robots" content="noindex"><!-- mathjax --><script src </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/CAKE_export.html b/docs/dev/reference/CAKE_export.html index 7b52a8c5..3b6f23fc 100644 --- a/docs/dev/reference/CAKE_export.html +++ b/docs/dev/reference/CAKE_export.html @@ -18,7 +18,7 @@ specified as well."><meta name="robots" content="noindex"><!-- mathjax --><scrip </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/D24_2014.html b/docs/dev/reference/D24_2014.html index 8af0a8e2..52c51b25 100644 --- a/docs/dev/reference/D24_2014.html +++ b/docs/dev/reference/D24_2014.html @@ -22,7 +22,7 @@ constrained by data protection regulations."><meta name="robots" content="noinde </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -132,7 +132,7 @@ constrained by data protection regulations.</p> <p>Hellenic Ministry of Rural Development and Agriculture (2014) Final addendum to the Renewal Assessment Report - public version - 2,4-D Volume 3 Annex B.8 Fate and behaviour in the environment -<a href="https://open.efsa.europa.eu/study-inventory/EFSA-Q-2013-00811" class="external-link">https://open.efsa.europa.eu/study-inventory/EFSA-Q-2013-00811</a></p> +https://open.efsa.europa.eu/study-inventory/EFSA-Q-2013-00811</p> </div> <div id="details"> <h2>Details</h2> diff --git a/docs/dev/reference/DFOP.solution.html b/docs/dev/reference/DFOP.solution.html index d462133c..5b566de0 100644 --- a/docs/dev/reference/DFOP.solution.html +++ b/docs/dev/reference/DFOP.solution.html @@ -18,7 +18,7 @@ two exponential decline functions."><meta name="robots" content="noindex"><!-- m </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/Extract.mmkin.html b/docs/dev/reference/Extract.mmkin.html index 3a22d14b..1f8de281 100644 --- a/docs/dev/reference/Extract.mmkin.html +++ b/docs/dev/reference/Extract.mmkin.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/FOCUS_2006_DFOP_ref_A_to_B.html b/docs/dev/reference/FOCUS_2006_DFOP_ref_A_to_B.html index a8eb25cf..bef6155d 100644 --- a/docs/dev/reference/FOCUS_2006_DFOP_ref_A_to_B.html +++ b/docs/dev/reference/FOCUS_2006_DFOP_ref_A_to_B.html @@ -21,7 +21,7 @@ in this fit."><meta name="robots" content="noindex"><!-- mathjax --><script src= </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/FOCUS_2006_FOMC_ref_A_to_F.html b/docs/dev/reference/FOCUS_2006_FOMC_ref_A_to_F.html index 24297c78..193418fa 100644 --- a/docs/dev/reference/FOCUS_2006_FOMC_ref_A_to_F.html +++ b/docs/dev/reference/FOCUS_2006_FOMC_ref_A_to_F.html @@ -21,7 +21,7 @@ in this fit."><meta name="robots" content="noindex"><!-- mathjax --><script src= </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/FOCUS_2006_HS_ref_A_to_F.html b/docs/dev/reference/FOCUS_2006_HS_ref_A_to_F.html index caf258ba..a9549122 100644 --- a/docs/dev/reference/FOCUS_2006_HS_ref_A_to_F.html +++ b/docs/dev/reference/FOCUS_2006_HS_ref_A_to_F.html @@ -21,7 +21,7 @@ in this fit."><meta name="robots" content="noindex"><!-- mathjax --><script src= </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/FOCUS_2006_SFO_ref_A_to_F.html b/docs/dev/reference/FOCUS_2006_SFO_ref_A_to_F.html index bc3d1c08..52bef6cf 100644 --- a/docs/dev/reference/FOCUS_2006_SFO_ref_A_to_F.html +++ b/docs/dev/reference/FOCUS_2006_SFO_ref_A_to_F.html @@ -21,7 +21,7 @@ in this fit."><meta name="robots" content="noindex"><!-- mathjax --><script src= </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/FOCUS_2006_datasets.html b/docs/dev/reference/FOCUS_2006_datasets.html index 78f8e81b..ca3bc313 100644 --- a/docs/dev/reference/FOCUS_2006_datasets.html +++ b/docs/dev/reference/FOCUS_2006_datasets.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/FOMC.solution.html b/docs/dev/reference/FOMC.solution.html index e1813261..ed190bae 100644 --- a/docs/dev/reference/FOMC.solution.html +++ b/docs/dev/reference/FOMC.solution.html @@ -18,7 +18,7 @@ a decreasing rate constant."><meta name="robots" content="noindex"><!-- mathjax </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/HS.solution.html b/docs/dev/reference/HS.solution.html index d42eaef6..f0a15c45 100644 --- a/docs/dev/reference/HS.solution.html +++ b/docs/dev/reference/HS.solution.html @@ -18,7 +18,7 @@ between them."><meta name="robots" content="noindex"><!-- mathjax --><script src </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/IORE.solution.html b/docs/dev/reference/IORE.solution.html index b9d4734f..458e52d0 100644 --- a/docs/dev/reference/IORE.solution.html +++ b/docs/dev/reference/IORE.solution.html @@ -18,7 +18,7 @@ a concentration dependent rate constant."><meta name="robots" content="noindex"> </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/NAFTA_SOP_2015.html b/docs/dev/reference/NAFTA_SOP_2015.html index 299863d7..329d476e 100644 --- a/docs/dev/reference/NAFTA_SOP_2015.html +++ b/docs/dev/reference/NAFTA_SOP_2015.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/NAFTA_SOP_Attachment.html b/docs/dev/reference/NAFTA_SOP_Attachment.html index 6bc86b46..c9874b5b 100644 --- a/docs/dev/reference/NAFTA_SOP_Attachment.html +++ b/docs/dev/reference/NAFTA_SOP_Attachment.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/Rplot001.png b/docs/dev/reference/Rplot001.png Binary files differindex 70d084a3..5de2bdc7 100644 --- a/docs/dev/reference/Rplot001.png +++ b/docs/dev/reference/Rplot001.png diff --git a/docs/dev/reference/Rplot002.png b/docs/dev/reference/Rplot002.png Binary files differindex 0f7d4405..556ca0a7 100644 --- a/docs/dev/reference/Rplot002.png +++ b/docs/dev/reference/Rplot002.png diff --git a/docs/dev/reference/SFO.solution.html b/docs/dev/reference/SFO.solution.html index 08e031e7..42cd16a0 100644 --- a/docs/dev/reference/SFO.solution.html +++ b/docs/dev/reference/SFO.solution.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/SFORB.solution.html b/docs/dev/reference/SFORB.solution.html index 7e584ace..4be4983f 100644 --- a/docs/dev/reference/SFORB.solution.html +++ b/docs/dev/reference/SFORB.solution.html @@ -21,7 +21,7 @@ and no substance in the bound fraction."><meta name="robots" content="noindex">< </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/add_err.html b/docs/dev/reference/add_err.html index 57db40d1..66220dd6 100644 --- a/docs/dev/reference/add_err.html +++ b/docs/dev/reference/add_err.html @@ -19,7 +19,7 @@ may depend on the predicted value and is specified as a standard deviation."><me </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/anova.saem.mmkin.html b/docs/dev/reference/anova.saem.mmkin.html index 39a30dff..f9153a80 100644 --- a/docs/dev/reference/anova.saem.mmkin.html +++ b/docs/dev/reference/anova.saem.mmkin.html @@ -20,7 +20,7 @@ the model on the previous line."><meta name="robots" content="noindex"><!-- math </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/aw.html b/docs/dev/reference/aw.html index fc5ff777..14aa5ef1 100644 --- a/docs/dev/reference/aw.html +++ b/docs/dev/reference/aw.html @@ -19,7 +19,7 @@ by Burnham and Anderson (2004)."><meta name="robots" content="noindex"><!-- math </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/confint.mkinfit.html b/docs/dev/reference/confint.mkinfit.html index a3571fa5..4945be22 100644 --- a/docs/dev/reference/confint.mkinfit.html +++ b/docs/dev/reference/confint.mkinfit.html @@ -24,7 +24,7 @@ method of Venzon and Moolgavkar (1988)."><meta name="robots" content="noindex">< </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -254,7 +254,7 @@ Profile-Likelihood Based Confidence Intervals, Applied Statistics, 37, <span class="r-in"><span><span class="va">f_d_1</span> <span class="op"><-</span> <span class="fu"><a href="mkinfit.html">mkinfit</a></span><span class="op">(</span><span class="va">SFO_SFO</span>, <span class="fu"><a href="https://rdrr.io/r/base/subset.html" class="external-link">subset</a></span><span class="op">(</span><span class="va">FOCUS_2006_D</span>, <span class="va">value</span> <span class="op">!=</span> <span class="fl">0</span><span class="op">)</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/system.time.html" class="external-link">system.time</a></span><span class="op">(</span><span class="va">ci_profile</span> <span class="op"><-</span> <span class="fu"><a href="https://rdrr.io/r/stats/confint.html" class="external-link">confint</a></span><span class="op">(</span><span class="va">f_d_1</span>, method <span class="op">=</span> <span class="st">"profile"</span>, cores <span class="op">=</span> <span class="fl">1</span>, quiet <span class="op">=</span> <span class="cn">TRUE</span><span class="op">)</span><span class="op">)</span></span></span> <span class="r-out co"><span class="r-pr">#></span> user system elapsed </span> -<span class="r-out co"><span class="r-pr">#></span> 1.183 0.000 1.182 </span> +<span class="r-out co"><span class="r-pr">#></span> 1.239 0.000 1.239 </span> <span class="r-in"><span><span class="co"># Using more cores does not save much time here, as parent_0 takes up most of the time</span></span></span> <span class="r-in"><span><span class="co"># If we additionally exclude parent_0 (the confidence of which is often of</span></span></span> <span class="r-in"><span><span class="co"># minor interest), we get a nice performance improvement if we use at least 4 cores</span></span></span> @@ -262,7 +262,7 @@ Profile-Likelihood Based Confidence Intervals, Applied Statistics, 37, <span class="r-in"><span> <span class="fu"><a href="https://rdrr.io/r/base/c.html" class="external-link">c</a></span><span class="op">(</span><span class="st">"k_parent_sink"</span>, <span class="st">"k_parent_m1"</span>, <span class="st">"k_m1_sink"</span>, <span class="st">"sigma"</span><span class="op">)</span>, cores <span class="op">=</span> <span class="va">n_cores</span><span class="op">)</span><span class="op">)</span></span></span> <span class="r-msg co"><span class="r-pr">#></span> Profiling the likelihood</span> <span class="r-out co"><span class="r-pr">#></span> user system elapsed </span> -<span class="r-out co"><span class="r-pr">#></span> 0.418 0.116 0.294 </span> +<span class="r-out co"><span class="r-pr">#></span> 0.428 0.109 0.290 </span> <span class="r-in"><span><span class="va">ci_profile</span></span></span> <span class="r-out co"><span class="r-pr">#></span> 2.5% 97.5%</span> <span class="r-out co"><span class="r-pr">#></span> parent_0 96.456003640 1.027703e+02</span> diff --git a/docs/dev/reference/create_deg_func.html b/docs/dev/reference/create_deg_func.html index fd8325c0..deeb2246 100644 --- a/docs/dev/reference/create_deg_func.html +++ b/docs/dev/reference/create_deg_func.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -148,8 +148,8 @@ <span class="r-in"><span> replications <span class="op">=</span> <span class="fl">2</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 replications elapsed relative user.self sys.self user.child</span> -<span class="r-out co"><span class="r-pr">#></span> 1 analytical 2 0.235 1.000 0.235 0 0</span> -<span class="r-out co"><span class="r-pr">#></span> 2 deSolve 2 0.294 1.251 0.294 0 0</span> +<span class="r-out co"><span class="r-pr">#></span> 1 analytical 2 0.244 1.000 0.245 0 0</span> +<span class="r-out co"><span class="r-pr">#></span> 2 deSolve 2 0.304 1.246 0.303 0 0</span> <span class="r-out co"><span class="r-pr">#></span> sys.child</span> <span class="r-out co"><span class="r-pr">#></span> 1 0</span> <span class="r-out co"><span class="r-pr">#></span> 2 0</span> @@ -162,8 +162,8 @@ <span class="r-in"><span> deSolve <span class="op">=</span> <span class="fu"><a href="mkinfit.html">mkinfit</a></span><span class="op">(</span><span class="va">DFOP_SFO</span>, <span class="va">FOCUS_D</span>, solution_type <span class="op">=</span> <span class="st">"deSolve"</span>, quiet <span class="op">=</span> <span class="cn">TRUE</span><span class="op">)</span>,</span></span> <span class="r-in"><span> replications <span class="op">=</span> <span class="fl">2</span><span class="op">)</span></span></span> <span class="r-out co"><span class="r-pr">#></span> test replications elapsed relative user.self sys.self user.child</span> -<span class="r-out co"><span class="r-pr">#></span> 1 analytical 2 0.374 1.000 0.374 0 0</span> -<span class="r-out co"><span class="r-pr">#></span> 2 deSolve 2 0.527 1.409 0.526 0 0</span> +<span class="r-out co"><span class="r-pr">#></span> 1 analytical 2 0.386 1.000 0.386 0 0</span> +<span class="r-out co"><span class="r-pr">#></span> 2 deSolve 2 0.537 1.391 0.537 0 0</span> <span class="r-out co"><span class="r-pr">#></span> sys.child</span> <span class="r-out co"><span class="r-pr">#></span> 1 0</span> <span class="r-out co"><span class="r-pr">#></span> 2 0</span> diff --git a/docs/dev/reference/dimethenamid_2018.html b/docs/dev/reference/dimethenamid_2018.html index 0fcd0c61..5a39602c 100644 --- a/docs/dev/reference/dimethenamid_2018.html +++ b/docs/dev/reference/dimethenamid_2018.html @@ -22,7 +22,7 @@ constrained by data protection regulations."><meta name="robots" content="noinde </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -132,7 +132,7 @@ constrained by data protection regulations.</p> <p>Rapporteur Member State Germany, Co-Rapporteur Member State Bulgaria (2018) Renewal Assessment Report Dimethenamid-P Volume 3 - B.8 Environmental fate and behaviour Rev. 2 - November 2017 -<a href="https://open.efsa.europa.eu/study-inventory/EFSA-Q-2014-00716" class="external-link">https://open.efsa.europa.eu/study-inventory/EFSA-Q-2014-00716</a></p> +https://open.efsa.europa.eu/study-inventory/EFSA-Q-2014-00716</p> </div> <div id="details"> <h2>Details</h2> @@ -222,10 +222,10 @@ specific pieces of information in the comments.</p> <span class="r-in"><span><span class="co">#saemix::plot(f_dmta_saem_tc$so, plot.type = "convergence")</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">f_dmta_saem_tc</span><span class="op">)</span></span></span> <span class="r-out co"><span class="r-pr">#></span> saemix version used for fitting: 3.2 </span> -<span class="r-out co"><span class="r-pr">#></span> mkin version used for pre-fitting: 1.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of fit: Sun Apr 16 08:30:03 2023 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of summary: Sun Apr 16 08:30:03 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> mkin version used for pre-fitting: 1.2.5 </span> +<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.3.0 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of fit: Fri May 19 17:28:53 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of summary: Fri May 19 17:28:53 2023 </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_DMTA/dt = - k_DMTA * DMTA</span> @@ -238,7 +238,7 @@ specific pieces of information in the comments.</p> <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 in 304.528 s</span> +<span class="r-out co"><span class="r-pr">#></span> Fitted in 299.056 s</span> <span class="r-out co"><span class="r-pr">#></span> Using 300, 100 iterations and 9 chains</span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> Variance model: Two-component variance function </span> diff --git a/docs/dev/reference/ds_mixed.html b/docs/dev/reference/ds_mixed.html index 2d0274ff..f60df25b 100644 --- a/docs/dev/reference/ds_mixed.html +++ b/docs/dev/reference/ds_mixed.html @@ -18,7 +18,7 @@ the 'dataset_generation' directory."><meta name="robots" content="noindex"><!-- </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/endpoints.html b/docs/dev/reference/endpoints.html index 3cda0f3c..3455275a 100644 --- a/docs/dev/reference/endpoints.html +++ b/docs/dev/reference/endpoints.html @@ -23,7 +23,7 @@ advantage that the SFORB model can also be used for metabolites."><meta name="ro </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/experimental_data_for_UBA.html b/docs/dev/reference/experimental_data_for_UBA.html index 77ff6ce4..c0d029cc 100644 --- a/docs/dev/reference/experimental_data_for_UBA.html +++ b/docs/dev/reference/experimental_data_for_UBA.html @@ -45,7 +45,7 @@ Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/f_time_norm_focus.html b/docs/dev/reference/f_time_norm_focus.html index b0722bc6..69578b89 100644 --- a/docs/dev/reference/f_time_norm_focus.html +++ b/docs/dev/reference/f_time_norm_focus.html @@ -18,7 +18,7 @@ in Appendix 8 to the FOCUS kinetics guidance (FOCUS 2014, p. 369)."><meta name=" </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/focus_soil_moisture.html b/docs/dev/reference/focus_soil_moisture.html index cb4a035a..d72e48b1 100644 --- a/docs/dev/reference/focus_soil_moisture.html +++ b/docs/dev/reference/focus_soil_moisture.html @@ -18,7 +18,7 @@ corresponds to pF2, MWHC to pF 1 and 1/3 bar to pF 2.5."><meta name="robots" con </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/get_deg_func.html b/docs/dev/reference/get_deg_func.html index cf81a591..7cc1cd24 100644 --- a/docs/dev/reference/get_deg_func.html +++ b/docs/dev/reference/get_deg_func.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/hierarchical_kinetics.html b/docs/dev/reference/hierarchical_kinetics.html index 7ece90cc..4da1e94f 100644 --- a/docs/dev/reference/hierarchical_kinetics.html +++ b/docs/dev/reference/hierarchical_kinetics.html @@ -24,7 +24,7 @@ includes them.'><meta name="robots" content="noindex"><!-- mathjax --><script sr </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.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/illparms.html b/docs/dev/reference/illparms.html index 7bf6c1fe..2dffcfe9 100644 --- a/docs/dev/reference/illparms.html +++ b/docs/dev/reference/illparms.html @@ -21,7 +21,7 @@ without parameter transformations is used."><meta name="robots" content="noindex </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/ilr.html b/docs/dev/reference/ilr.html index 94b23a76..677c3f5e 100644 --- a/docs/dev/reference/ilr.html +++ b/docs/dev/reference/ilr.html @@ -18,7 +18,7 @@ transformations."><meta name="robots" content="noindex"><!-- mathjax --><script </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/index.html b/docs/dev/reference/index.html index d1b789c3..019231a7 100644 --- a/docs/dev/reference/index.html +++ b/docs/dev/reference/index.html @@ -17,7 +17,7 @@ </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.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/intervals.saem.mmkin.html b/docs/dev/reference/intervals.saem.mmkin.html index a566ee8d..9eefd1c1 100644 --- a/docs/dev/reference/intervals.saem.mmkin.html +++ b/docs/dev/reference/intervals.saem.mmkin.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/llhist.html b/docs/dev/reference/llhist.html index 2b5afa25..4250ca39 100644 --- a/docs/dev/reference/llhist.html +++ b/docs/dev/reference/llhist.html @@ -18,7 +18,7 @@ original fit is shown as a red vertical line."><meta name="robots" content="noin </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/loftest.html b/docs/dev/reference/loftest.html index 871dfc88..c11fe007 100644 --- a/docs/dev/reference/loftest.html +++ b/docs/dev/reference/loftest.html @@ -20,7 +20,7 @@ lrtest.default from the lmtest package."><meta name="robots" content="noindex">< </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/logLik.mkinfit.html b/docs/dev/reference/logLik.mkinfit.html index e51a52eb..bbe44051 100644 --- a/docs/dev/reference/logLik.mkinfit.html +++ b/docs/dev/reference/logLik.mkinfit.html @@ -21,7 +21,7 @@ the error model."><meta name="robots" content="noindex"><!-- mathjax --><script </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/logLik.saem.mmkin.html b/docs/dev/reference/logLik.saem.mmkin.html index 6d0102c1..fc97386c 100644 --- a/docs/dev/reference/logLik.saem.mmkin.html +++ b/docs/dev/reference/logLik.saem.mmkin.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/logistic.solution.html b/docs/dev/reference/logistic.solution.html index 9cfebf03..f161823c 100644 --- a/docs/dev/reference/logistic.solution.html +++ b/docs/dev/reference/logistic.solution.html @@ -18,7 +18,7 @@ an increasing rate constant, supposedly caused by microbial growth"><meta name=" </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/lrtest.mkinfit.html b/docs/dev/reference/lrtest.mkinfit.html index d59590c0..32b7cf76 100644 --- a/docs/dev/reference/lrtest.mkinfit.html +++ b/docs/dev/reference/lrtest.mkinfit.html @@ -21,7 +21,7 @@ and can be expressed by fixing the parameters of the other."><meta name="robots" </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/max_twa_parent.html b/docs/dev/reference/max_twa_parent.html index 507a0758..40a29918 100644 --- a/docs/dev/reference/max_twa_parent.html +++ b/docs/dev/reference/max_twa_parent.html @@ -23,7 +23,7 @@ soil section of the FOCUS guidance."><meta name="robots" content="noindex"><!-- </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mccall81_245T.html b/docs/dev/reference/mccall81_245T.html index c0e9cb37..70e96537 100644 --- a/docs/dev/reference/mccall81_245T.html +++ b/docs/dev/reference/mccall81_245T.html @@ -19,7 +19,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mean_degparms.html b/docs/dev/reference/mean_degparms.html index a374d532..0a52af76 100644 --- a/docs/dev/reference/mean_degparms.html +++ b/docs/dev/reference/mean_degparms.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mhmkin.html b/docs/dev/reference/mhmkin.html index b41c11df..3e0a8c31 100644 --- a/docs/dev/reference/mhmkin.html +++ b/docs/dev/reference/mhmkin.html @@ -22,7 +22,7 @@ mixed-effects model fitting functions."><meta name="robots" content="noindex"><! </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mixed.html b/docs/dev/reference/mixed.html index 1709944a..e354315b 100644 --- a/docs/dev/reference/mixed.html +++ b/docs/dev/reference/mixed.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mkin_long_to_wide.html b/docs/dev/reference/mkin_long_to_wide.html index 990506b5..4e7b2756 100644 --- a/docs/dev/reference/mkin_long_to_wide.html +++ b/docs/dev/reference/mkin_long_to_wide.html @@ -19,7 +19,7 @@ variable and several dependent variables as columns."><meta name="robots" conten </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mkin_wide_to_long.html b/docs/dev/reference/mkin_wide_to_long.html index a324d3b8..5e419cbe 100644 --- a/docs/dev/reference/mkin_wide_to_long.html +++ b/docs/dev/reference/mkin_wide_to_long.html @@ -19,7 +19,7 @@ mkinfit."><meta name="robots" content="noindex"><!-- mathjax --><script src="htt </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mkinds.html b/docs/dev/reference/mkinds.html index 6219766e..3c1154a8 100644 --- a/docs/dev/reference/mkinds.html +++ b/docs/dev/reference/mkinds.html @@ -20,7 +20,7 @@ provided by this package come as mkinds objects nevertheless."><meta name="robot </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mkindsg.html b/docs/dev/reference/mkindsg.html index 6e221a23..4ef380cb 100644 --- a/docs/dev/reference/mkindsg.html +++ b/docs/dev/reference/mkindsg.html @@ -20,7 +20,7 @@ dataset if no data are supplied."><meta name="robots" content="noindex"><!-- mat </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mkinerrmin.html b/docs/dev/reference/mkinerrmin.html index 3a8b9610..205654d1 100644 --- a/docs/dev/reference/mkinerrmin.html +++ b/docs/dev/reference/mkinerrmin.html @@ -18,7 +18,7 @@ the chi-squared test as defined in the FOCUS kinetics report from 2006."><meta n </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mkinerrplot.html b/docs/dev/reference/mkinerrplot.html index bc9b828a..e2d37adb 100644 --- a/docs/dev/reference/mkinerrplot.html +++ b/docs/dev/reference/mkinerrplot.html @@ -21,7 +21,7 @@ using the argument show_errplot = TRUE."><meta name="robots" content="noindex">< </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mkinfit.html b/docs/dev/reference/mkinfit.html index 237d903e..aa714f26 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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -401,10 +401,10 @@ 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.3 </span> -<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of fit: Sun Apr 16 08:30:40 2023 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of summary: Sun Apr 16 08:30:40 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> mkin version used for fitting: 1.2.5 </span> +<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.3.0 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of fit: Fri May 19 17:29:30 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of summary: Fri May 19 17:29:30 2023 </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> @@ -552,9 +552,9 @@ Degradation Data. <em>Environments</em> 6(12) 124 <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-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.236</span> -<span class="r-out co"><span class="r-pr">#></span> 1 deSolve_compiled 1.263 0.298</span> -<span class="r-out co"><span class="r-pr">#></span> 2 eigen 2.373 0.560</span> +<span class="r-out co"><span class="r-pr">#></span> 3 analytical 1.000 0.241</span> +<span class="r-out co"><span class="r-pr">#></span> 1 deSolve_compiled 1.270 0.306</span> +<span class="r-out co"><span class="r-pr">#></span> 2 eigen 2.382 0.574</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> @@ -581,10 +581,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.3 </span> -<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of fit: Sun Apr 16 08:30:44 2023 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of summary: Sun Apr 16 08:30:44 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> mkin version used for fitting: 1.2.5 </span> +<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.3.0 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of fit: Fri May 19 17:29:35 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of summary: Fri May 19 17:29:35 2023 </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> @@ -593,7 +593,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 0.688 s</span> +<span class="r-out co"><span class="r-pr">#></span> Fitted using 3729 model solutions performed in 0.727 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> diff --git a/docs/dev/reference/mkinmod.html b/docs/dev/reference/mkinmod.html index 50ec64fa..3e74b37f 100644 --- a/docs/dev/reference/mkinmod.html +++ b/docs/dev/reference/mkinmod.html @@ -21,7 +21,7 @@ components."><meta name="robots" content="noindex"><!-- mathjax --><script src=" </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -330,7 +330,7 @@ Evaluating and Calculating Degradation Kinetics in Environmental Media</p> <span class="r-in"><span> m1 <span class="op">=</span> <span class="fu">mkinsub</span><span class="op">(</span><span class="st">"SFO"</span>, full_name <span class="op">=</span> <span class="st">"Metabolite M1"</span><span class="op">)</span>,</span></span> <span class="r-in"><span> name <span class="op">=</span> <span class="st">"SFO_SFO"</span>, dll_dir <span class="op">=</span> <span class="va">DLL_dir</span>, unload <span class="op">=</span> <span class="cn">TRUE</span>, overwrite <span class="op">=</span> <span class="cn">TRUE</span><span class="op">)</span></span></span> <span class="r-msg co"><span class="r-pr">#></span> Temporary DLL for differentials generated and loaded</span> -<span class="r-msg co"><span class="r-pr">#></span> Copied DLL from /tmp/RtmpiGRJ6t/file5c7f7365e02a0.so to /home/jranke/.local/share/mkin/SFO_SFO.so</span> +<span class="r-msg co"><span class="r-pr">#></span> Copied DLL from /tmp/Rtmpo7fLwX/file774c3752c3c97.so to /home/jranke/.local/share/mkin/SFO_SFO.so</span> <span class="r-in"><span><span class="co"># Now we can save the model and restore it in a new session</span></span></span> <span class="r-in"><span><span class="fu"><a href="https://rdrr.io/r/base/readRDS.html" class="external-link">saveRDS</a></span><span class="op">(</span><span class="va">SFO_SFO.2</span>, file <span class="op">=</span> <span class="st">"~/SFO_SFO.rds"</span><span class="op">)</span></span></span> <span class="r-in"><span><span class="co"># Terminate the R session here if you would like to check, and then do</span></span></span> @@ -383,7 +383,7 @@ Evaluating and Calculating Degradation Kinetics in Environmental Media</p> <span class="r-out co"><span class="r-pr">#></span> })</span> <span class="r-out co"><span class="r-pr">#></span> return(predicted)</span> <span class="r-out co"><span class="r-pr">#></span> }</span> -<span class="r-out co"><span class="r-pr">#></span> <environment: 0x555558bd6708></span> +<span class="r-out co"><span class="r-pr">#></span> <environment: 0x55556118b9d0></span> <span class="r-in"><span></span></span> <span class="r-in"><span><span class="co"># If we have several parallel metabolites</span></span></span> <span class="r-in"><span><span class="co"># (compare tests/testthat/test_synthetic_data_for_UBA_2014.R)</span></span></span> diff --git a/docs/dev/reference/mkinparplot.html b/docs/dev/reference/mkinparplot.html index f7d404ef..297c3685 100644 --- a/docs/dev/reference/mkinparplot.html +++ b/docs/dev/reference/mkinparplot.html @@ -18,7 +18,7 @@ mkinfit."><meta name="robots" content="noindex"><!-- mathjax --><script src="htt </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mkinplot.html b/docs/dev/reference/mkinplot.html index d83ea3f4..008fdd42 100644 --- a/docs/dev/reference/mkinplot.html +++ b/docs/dev/reference/mkinplot.html @@ -18,7 +18,7 @@ plot.mkinfit."><meta name="robots" content="noindex"><!-- mathjax --><script src </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mkinpredict.html b/docs/dev/reference/mkinpredict.html index 7d8e7c26..262b3fde 100644 --- a/docs/dev/reference/mkinpredict.html +++ b/docs/dev/reference/mkinpredict.html @@ -19,7 +19,7 @@ kinetic parameters and initial values for the state variables."><meta name="robo </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -394,12 +394,11 @@ as these always return mapped output.</p></dd> <span class="r-in"><span> <span class="fu"><a href="https://rdrr.io/r/base/c.html" class="external-link">c</a></span><span class="op">(</span>parent <span class="op">=</span> <span class="fl">100</span>, m1 <span class="op">=</span> <span class="fl">0</span><span class="op">)</span>, <span class="fu"><a href="https://rdrr.io/r/base/seq.html" class="external-link">seq</a></span><span class="op">(</span><span class="fl">0</span>, <span class="fl">20</span>, by <span class="op">=</span> <span class="fl">0.1</span><span class="op">)</span>,</span></span> <span class="r-in"><span> solution_type <span class="op">=</span> <span class="st">"analytical"</span>, use_compiled <span class="op">=</span> <span class="cn">FALSE</span><span class="op">)</span><span class="op">[</span><span class="fl">201</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> 2 deSolve_compiled 1.00 0.004</span> -<span class="r-out co"><span class="r-pr">#></span> 1 eigen 4.00 0.016</span> -<span class="r-out co"><span class="r-pr">#></span> 4 analytical 4.25 0.017</span> -<span class="r-out co"><span class="r-pr">#></span> 3 deSolve 40.75 0.163</span> +<span class="r-out co"><span class="r-pr">#></span> 4 analytical 1.0 0.002</span> +<span class="r-out co"><span class="r-pr">#></span> 2 deSolve_compiled 1.5 0.003</span> +<span class="r-out co"><span class="r-pr">#></span> 1 eigen 3.5 0.007</span> +<span class="r-out co"><span class="r-pr">#></span> 3 deSolve 31.5 0.063</span> <span class="r-in"><span></span></span> <span class="r-in"><span><span class="co"># \dontrun{</span></span></span> <span class="r-in"><span> <span class="co"># Predict from a fitted model</span></span></span> diff --git a/docs/dev/reference/mkinresplot.html b/docs/dev/reference/mkinresplot.html index e73ac93c..2108778e 100644 --- a/docs/dev/reference/mkinresplot.html +++ b/docs/dev/reference/mkinresplot.html @@ -20,7 +20,7 @@ argument show_residuals = TRUE."><meta name="robots" content="noindex"><!-- math </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/mmkin.html b/docs/dev/reference/mmkin.html index 64623f20..4581129d 100644 --- a/docs/dev/reference/mmkin.html +++ b/docs/dev/reference/mmkin.html @@ -20,7 +20,7 @@ datasets specified in its first two arguments."><meta name="robots" content="noi </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -206,10 +206,10 @@ plotting.</p></div> <span class="r-in"><span></span></span> <span class="r-in"><span><span class="va">time_default</span></span></span> <span class="r-out co"><span class="r-pr">#></span> user system elapsed </span> -<span class="r-out co"><span class="r-pr">#></span> 1.560 0.668 0.742 </span> +<span class="r-out co"><span class="r-pr">#></span> 1.668 0.586 0.716 </span> <span class="r-in"><span><span class="va">time_1</span></span></span> <span class="r-out co"><span class="r-pr">#></span> user system elapsed </span> -<span class="r-out co"><span class="r-pr">#></span> 2.033 0.004 2.037 </span> +<span class="r-out co"><span class="r-pr">#></span> 2.054 0.012 2.065 </span> <span class="r-in"><span></span></span> <span class="r-in"><span><span class="fu"><a href="endpoints.html">endpoints</a></span><span class="op">(</span><span class="va">fits.0</span><span class="op">[[</span><span class="st">"SFO_lin"</span>, <span class="fl">2</span><span class="op">]</span><span class="op">]</span><span class="op">)</span></span></span> <span class="r-out co"><span class="r-pr">#></span> $ff</span> diff --git a/docs/dev/reference/multistart.html b/docs/dev/reference/multistart.html index 6fc88621..ea847d32 100644 --- a/docs/dev/reference/multistart.html +++ b/docs/dev/reference/multistart.html @@ -22,7 +22,7 @@ mixed-effects models by Duchesne et al (2021)."><meta name="robots" content="noi </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.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/nafta.html b/docs/dev/reference/nafta.html index 6d568718..91cc716c 100644 --- a/docs/dev/reference/nafta.html +++ b/docs/dev/reference/nafta.html @@ -21,7 +21,7 @@ order of increasing model complexity, i.e. SFO, then IORE, and finally DFOP."><m </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/nlme.html b/docs/dev/reference/nlme.html index 81c45ab9..49bad1a8 100644 --- a/docs/dev/reference/nlme.html +++ b/docs/dev/reference/nlme.html @@ -20,7 +20,7 @@ datasets. They are used internally by the nlme.mmkin() method."><meta name="robo </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/nlme.mmkin.html b/docs/dev/reference/nlme.mmkin.html index 76d667b9..bf520640 100644 --- a/docs/dev/reference/nlme.mmkin.html +++ b/docs/dev/reference/nlme.mmkin.html @@ -19,7 +19,7 @@ have been obtained by fitting the same model to a list of datasets."><meta name= </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/nobs.mkinfit.html b/docs/dev/reference/nobs.mkinfit.html index 10f6550b..fb6ce502 100644 --- a/docs/dev/reference/nobs.mkinfit.html +++ b/docs/dev/reference/nobs.mkinfit.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/parms.html b/docs/dev/reference/parms.html index d4175d41..b45423be 100644 --- a/docs/dev/reference/parms.html +++ b/docs/dev/reference/parms.html @@ -19,7 +19,7 @@ without considering the error structure that was assumed for the fit."><meta nam </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/parplot.html b/docs/dev/reference/parplot.html index ee2ec7b2..d701438c 100644 --- a/docs/dev/reference/parplot.html +++ b/docs/dev/reference/parplot.html @@ -19,7 +19,7 @@ or by their medians as proposed in the paper by Duchesne et al. (2021)."><meta n </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/plot.mixed.mmkin.html b/docs/dev/reference/plot.mixed.mmkin.html index 3d902b77..c5a67513 100644 --- a/docs/dev/reference/plot.mixed.mmkin.html +++ b/docs/dev/reference/plot.mixed.mmkin.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -304,7 +304,7 @@ corresponding model prediction lines for the different datasets.</p></dd> <span class="r-in"><span><span class="va">f_nlmix</span> <span class="op"><-</span> <span class="fu">nlmix</span><span class="op">(</span><span class="va">f_obs</span><span class="op">)</span></span></span> <span class="r-err co"><span class="r-pr">#></span> <span class="error">Error in nlmix(f_obs):</span> could not find function "nlmix"</span> <span class="r-in"><span><span class="fu"><a href="https://rdrr.io/r/graphics/plot.default.html" class="external-link">plot</a></span><span class="op">(</span><span class="va">f_nlmix</span><span class="op">)</span></span></span> -<span class="r-err co"><span class="r-pr">#></span> <span class="error">Error in plot(f_nlmix):</span> object 'f_nlmix' not found</span> +<span class="r-err co"><span class="r-pr">#></span> <span class="error">Error in eval(expr, envir, enclos):</span> object 'f_nlmix' not found</span> <span class="r-in"><span></span></span> <span class="r-in"><span><span class="co"># We can overlay the two variants if we generate predictions</span></span></span> <span class="r-in"><span><span class="va">pred_nlme</span> <span class="op"><-</span> <span class="fu"><a href="mkinpredict.html">mkinpredict</a></span><span class="op">(</span><span class="va">dfop_sfo</span>,</span></span> diff --git a/docs/dev/reference/plot.mkinfit.html b/docs/dev/reference/plot.mkinfit.html index 9cf12d82..42322156 100644 --- a/docs/dev/reference/plot.mkinfit.html +++ b/docs/dev/reference/plot.mkinfit.html @@ -19,7 +19,7 @@ observed data together with the solution of the fitted model."><meta name="robot </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/plot.mmkin.html b/docs/dev/reference/plot.mmkin.html index c8fde67c..e224ccf8 100644 --- a/docs/dev/reference/plot.mmkin.html +++ b/docs/dev/reference/plot.mmkin.html @@ -21,7 +21,7 @@ the fit of at least one model to the same dataset is shown."><meta name="robots" </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/plot.nafta.html b/docs/dev/reference/plot.nafta.html index 8acaa8b3..1177dd81 100644 --- a/docs/dev/reference/plot.nafta.html +++ b/docs/dev/reference/plot.nafta.html @@ -18,7 +18,7 @@ function (SFO, then IORE, then DFOP)."><meta name="robots" content="noindex"><!- </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/read_spreadsheet.html b/docs/dev/reference/read_spreadsheet.html index 6e7203f4..cb2a0d0f 100644 --- a/docs/dev/reference/read_spreadsheet.html +++ b/docs/dev/reference/read_spreadsheet.html @@ -22,7 +22,7 @@ factors can be given in columns named 'Temperature' and 'Moisture'."><meta name= </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/reexports.html b/docs/dev/reference/reexports.html index ee1148da..81563f52 100644 --- a/docs/dev/reference/reexports.html +++ b/docs/dev/reference/reexports.html @@ -28,7 +28,7 @@ intervals, nlme </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/residuals.mkinfit.html b/docs/dev/reference/residuals.mkinfit.html index 578b5066..f8b110b4 100644 --- a/docs/dev/reference/residuals.mkinfit.html +++ b/docs/dev/reference/residuals.mkinfit.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/saem.html b/docs/dev/reference/saem.html index 9b9a911d..952e4eab 100644 --- a/docs/dev/reference/saem.html +++ b/docs/dev/reference/saem.html @@ -19,7 +19,7 @@ Expectation Maximisation algorithm (SAEM)."><meta name="robots" content="noindex </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -439,10 +439,10 @@ using <a href="mmkin.html">mmkin</a>.</p> <span class="r-plt img"><img src="saem-4.png" alt="" width="700" height="433"></span> <span class="r-in"><span><span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">f_saem_dfop_sfo</span>, data <span class="op">=</span> <span class="cn">TRUE</span><span class="op">)</span></span></span> <span class="r-out co"><span class="r-pr">#></span> saemix version used for fitting: 3.2 </span> -<span class="r-out co"><span class="r-pr">#></span> mkin version used for pre-fitting: 1.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of fit: Sun Apr 16 08:32:32 2023 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of summary: Sun Apr 16 08:32:32 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> mkin version used for pre-fitting: 1.2.5 </span> +<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.3.0 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of fit: Fri May 19 17:31:33 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of summary: Fri May 19 17:31:33 2023 </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 = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *</span> @@ -457,7 +457,7 @@ using <a href="mmkin.html">mmkin</a>.</p> <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 in 4.145 s</span> +<span class="r-out co"><span class="r-pr">#></span> Fitted in 3.681 s</span> <span class="r-out co"><span class="r-pr">#></span> Using 300, 100 iterations and 10 chains</span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> Variance model: Constant variance </span> diff --git a/docs/dev/reference/schaefer07_complex_case.html b/docs/dev/reference/schaefer07_complex_case.html index 880e5ac0..9e1eb3cf 100644 --- a/docs/dev/reference/schaefer07_complex_case.html +++ b/docs/dev/reference/schaefer07_complex_case.html @@ -19,7 +19,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/set_nd_nq.html b/docs/dev/reference/set_nd_nq.html index 6f4ae169..0d4848b7 100644 --- a/docs/dev/reference/set_nd_nq.html +++ b/docs/dev/reference/set_nd_nq.html @@ -21,7 +21,7 @@ it automates the proposal of Boesten et al (2015)."><meta name="robots" content= </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/sigma_twocomp.html b/docs/dev/reference/sigma_twocomp.html index 0ead0184..62160487 100644 --- a/docs/dev/reference/sigma_twocomp.html +++ b/docs/dev/reference/sigma_twocomp.html @@ -18,7 +18,7 @@ dependence of the measured value \(y\):"><meta name="robots" content="noindex">< </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/status.html b/docs/dev/reference/status.html index df3e3a44..3d0d7493 100644 --- a/docs/dev/reference/status.html +++ b/docs/dev/reference/status.html @@ -17,7 +17,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/summary.mkinfit.html b/docs/dev/reference/summary.mkinfit.html index f627c2f6..b2bb592e 100644 --- a/docs/dev/reference/summary.mkinfit.html +++ b/docs/dev/reference/summary.mkinfit.html @@ -21,7 +21,7 @@ values."><meta name="robots" content="noindex"><!-- mathjax --><script src="http </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -231,10 +231,10 @@ EC Document Reference Sanco/10058/2005 version 2.0, 434 pp, <h2>Examples</h2> <div class="sourceCode"><pre class="sourceCode r"><code><span class="r-in"><span></span></span> <span class="r-in"><span> <span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="fu"><a href="mkinfit.html">mkinfit</a></span><span class="op">(</span><span class="st">"SFO"</span>, <span class="va">FOCUS_2006_A</span>, quiet <span class="op">=</span> <span class="cn">TRUE</span><span class="op">)</span><span class="op">)</span></span></span> -<span class="r-out co"><span class="r-pr">#></span> mkin version used for fitting: 1.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of fit: Sun Apr 16 08:34:39 2023 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of summary: Sun Apr 16 08:34:39 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> mkin version used for fitting: 1.2.5 </span> +<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.3.0 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of fit: Fri May 19 17:33:37 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of summary: Fri May 19 17:33:37 2023 </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 = - k_parent * parent</span> diff --git a/docs/dev/reference/summary.mmkin.html b/docs/dev/reference/summary.mmkin.html index c27f1634..84cb51fd 100644 --- a/docs/dev/reference/summary.mmkin.html +++ b/docs/dev/reference/summary.mmkin.html @@ -18,7 +18,7 @@ and gives an overview of ill-defined parameters calculated by illparms."><meta n </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -152,7 +152,7 @@ and gives an overview of ill-defined parameters calculated by <a href="illparms. <span class="r-in"><span> quiet <span class="op">=</span> <span class="cn">TRUE</span>, cores <span class="op">=</span> <span class="fl">1</span><span class="op">)</span></span></span> <span class="r-in"><span> <span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">fits</span><span class="op">)</span></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> Fitted in 0.509 s</span> +<span class="r-out co"><span class="r-pr">#></span> Fitted in 0.515 s</span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> Status:</span> <span class="r-out co"><span class="r-pr">#></span> dataset</span> diff --git a/docs/dev/reference/summary.nlme.mmkin.html b/docs/dev/reference/summary.nlme.mmkin.html index cb2c20bd..9e6ca376 100644 --- a/docs/dev/reference/summary.nlme.mmkin.html +++ b/docs/dev/reference/summary.nlme.mmkin.html @@ -21,7 +21,7 @@ endpoints such as formation fractions and DT50 values. Optionally </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -252,10 +252,10 @@ José Pinheiro and Douglas Bates for the components inherited from nlme</p> <span class="r-in"><span><span class="va">f_nlme</span> <span class="op"><-</span> <span class="fu"><a href="https://rdrr.io/pkg/nlme/man/nlme.html" class="external-link">nlme</a></span><span class="op">(</span><span class="va">f_mmkin</span><span class="op">)</span></span></span> <span class="r-in"><span><span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">f_nlme</span>, data <span class="op">=</span> <span class="cn">TRUE</span><span class="op">)</span></span></span> <span class="r-out co"><span class="r-pr">#></span> nlme version used for fitting: 3.1.162 </span> -<span class="r-out co"><span class="r-pr">#></span> mkin version used for pre-fitting: 1.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of fit: Sun Apr 16 08:34:41 2023 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of summary: Sun Apr 16 08:34:41 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> mkin version used for pre-fitting: 1.2.5 </span> +<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.3.0 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of fit: Fri May 19 17:33:40 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of summary: Fri May 19 17:33:40 2023 </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 = - k_parent * parent</span> @@ -265,7 +265,7 @@ José Pinheiro and Douglas Bates for the components inherited from nlme</p> <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 in 0.194 s using 4 iterations</span> +<span class="r-out co"><span class="r-pr">#></span> Fitted in 0.19 s using 4 iterations</span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> Variance model: Two-component variance function </span> <span class="r-out co"><span class="r-pr">#></span> </span> diff --git a/docs/dev/reference/summary.saem.mmkin.html b/docs/dev/reference/summary.saem.mmkin.html index e434ad8d..fbd9e027 100644 --- a/docs/dev/reference/summary.saem.mmkin.html +++ b/docs/dev/reference/summary.saem.mmkin.html @@ -21,7 +21,7 @@ endpoints such as formation fractions and DT50 values. Optionally </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -330,10 +330,10 @@ saemix authors for the parts inherited from saemix.</p> <span class="r-out co"><span class="r-pr">#></span> b.1 0.06363957 0.07878001 0.09392044</span> <span class="r-in"><span><span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">f_saem_dfop_sfo_2</span>, data <span class="op">=</span> <span class="cn">TRUE</span><span class="op">)</span></span></span> <span class="r-out co"><span class="r-pr">#></span> saemix version used for fitting: 3.2 </span> -<span class="r-out co"><span class="r-pr">#></span> mkin version used for pre-fitting: 1.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of fit: Sun Apr 16 08:34:58 2023 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of summary: Sun Apr 16 08:34:58 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> mkin version used for pre-fitting: 1.2.5 </span> +<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.3.0 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of fit: Fri May 19 17:33:55 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of summary: Fri May 19 17:33:55 2023 </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 = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *</span> @@ -348,7 +348,7 @@ saemix authors for the parts inherited from saemix.</p> <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 in 9.384 s</span> +<span class="r-out co"><span class="r-pr">#></span> Fitted in 9.133 s</span> <span class="r-out co"><span class="r-pr">#></span> Using 300, 100 iterations and 10 chains</span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> Variance model: Two-component variance function </span> diff --git a/docs/dev/reference/summary_listing.html b/docs/dev/reference/summary_listing.html index e584416a..640d834a 100644 --- a/docs/dev/reference/summary_listing.html +++ b/docs/dev/reference/summary_listing.html @@ -18,7 +18,7 @@ option results = "asis".'><meta name="robots" content="noindex"><!-- mathjax --> </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/synthetic_data_for_UBA_2014.html b/docs/dev/reference/synthetic_data_for_UBA_2014.html index b8154c47..0ec5e832 100644 --- a/docs/dev/reference/synthetic_data_for_UBA_2014.html +++ b/docs/dev/reference/synthetic_data_for_UBA_2014.html @@ -32,7 +32,7 @@ Compare also the code in the example section to see the degradation models."><me </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> @@ -269,10 +269,10 @@ Compare also the code in the example section to see the degradation models."><me <span class="r-in"><span> <span class="fu"><a href="plot.mkinfit.html">plot_sep</a></span><span class="op">(</span><span class="va">fit</span><span class="op">)</span></span></span> <span class="r-plt img"><img src="synthetic_data_for_UBA_2014-1.png" alt="" width="700" height="433"></span> <span class="r-in"><span> <span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.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.3 </span> -<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.2.3 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of fit: Sun Apr 16 08:35:08 2023 </span> -<span class="r-out co"><span class="r-pr">#></span> Date of summary: Sun Apr 16 08:35:08 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> mkin version used for fitting: 1.2.5 </span> +<span class="r-out co"><span class="r-pr">#></span> R version used for fitting: 4.3.0 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of fit: Fri May 19 17:34:06 2023 </span> +<span class="r-out co"><span class="r-pr">#></span> Date of summary: Fri May 19 17:34:06 2023 </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 = - k_parent * parent</span> @@ -281,7 +281,7 @@ Compare also the code in the example section to see the degradation models."><me <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 833 model solutions performed in 0.166 s</span> +<span class="r-out co"><span class="r-pr">#></span> Fitted using 833 model solutions performed in 0.164 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> diff --git a/docs/dev/reference/test_data_from_UBA_2014.html b/docs/dev/reference/test_data_from_UBA_2014.html index 8b0194f6..fd5caf4e 100644 --- a/docs/dev/reference/test_data_from_UBA_2014.html +++ b/docs/dev/reference/test_data_from_UBA_2014.html @@ -18,7 +18,7 @@ </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/transform_odeparms.html b/docs/dev/reference/transform_odeparms.html index 4cb2e575..9e81258a 100644 --- a/docs/dev/reference/transform_odeparms.html +++ b/docs/dev/reference/transform_odeparms.html @@ -22,7 +22,7 @@ the ilr transformation is used."><meta name="robots" content="noindex"><!-- math </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> diff --git a/docs/dev/reference/update.mkinfit.html b/docs/dev/reference/update.mkinfit.html index 90aa0edb..fc644f6f 100644 --- a/docs/dev/reference/update.mkinfit.html +++ b/docs/dev/reference/update.mkinfit.html @@ -20,7 +20,7 @@ override these starting values."><meta name="robots" content="noindex"><!-- math </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.3</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.5</span> </span> </div> |
