aboutsummaryrefslogtreecommitdiff
path: root/docs/reference/mkinfit.html
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2021-04-21 16:40:50 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2021-04-21 16:40:50 +0200
commit9907f17aa98bddfe60e82a71c70a2fea914a02f7 (patch)
tree4d5d959cdd19f32068bae406372df4b8a8f59fd6 /docs/reference/mkinfit.html
parent34d1c5f23edfb60548bc5a9dd99c2f3af92acef1 (diff)
parentc74b79c983fe9fc872bac1262040e82f16049477 (diff)
Merge branch 'master' into saemix
Diffstat (limited to 'docs/reference/mkinfit.html')
-rw-r--r--docs/reference/mkinfit.html28
1 files changed, 14 insertions, 14 deletions
diff --git a/docs/reference/mkinfit.html b/docs/reference/mkinfit.html
index 180f2ee7..2c162e49 100644
--- a/docs/reference/mkinfit.html
+++ b/docs/reference/mkinfit.html
@@ -80,7 +80,7 @@ likelihood function." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">mkin</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span>
</span>
</div>
@@ -431,10 +431,10 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6
<span class='co'># Use shorthand notation for parent only degradation</span>
<span class='va'>fit</span> <span class='op'>&lt;-</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 class='fu'><a href='https://rdrr.io/r/base/summary.html'>summary</a></span><span class='op'>(</span><span class='va'>fit</span><span class='op'>)</span>
-</div><div class='output co'>#&gt; mkin version used for fitting: 1.0.3
-#&gt; R version used for fitting: 4.0.3
-#&gt; Date of fit: Mon Feb 15 13:43:26 2021
-#&gt; Date of summary: Mon Feb 15 13:43:26 2021
+</div><div class='output co'>#&gt; mkin version used for fitting: 1.0.4
+#&gt; R version used for fitting: 4.0.4
+#&gt; Date of fit: Wed Mar 31 19:15:41 2021
+#&gt; Date of summary: Wed Mar 31 19:15:41 2021
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -574,10 +574,10 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6
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>,
solution_type <span class='op'>=</span> <span class='st'>"analytical"</span><span class='op'>)</span><span class='op'>)</span>
<span class='op'>}</span>
-</div><div class='output co'>#&gt; test relative elapsed
-#&gt; 3 analytical 1.000 0.550
-#&gt; 1 deSolve_compiled 1.731 0.952
-#&gt; 2 eigen 2.662 1.464</div><div class='input'><span class='co'># }</span>
+</div><div class='output co'>#&gt; <span class='message'>Loading required package: rbenchmark</span></div><div class='output co'>#&gt; test relative elapsed
+#&gt; 3 analytical 1.000 0.547
+#&gt; 1 deSolve_compiled 1.717 0.939
+#&gt; 2 eigen 2.644 1.446</div><div class='input'><span class='co'># }</span>
<span class='co'># Use stepwise fitting, using optimised parameters from parent only fit, FOMC-SFO</span>
<span class='co'># \dontrun{</span>
@@ -598,10 +598,10 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6
#&gt; 2 6 -64.983 -1 0.3075 0.5792</div><div class='input'><span class='co'># Also, the missing standard error for log_beta and the t-tests for alpha</span>
<span class='co'># and beta indicate overparameterisation</span>
<span class='fu'><a href='https://rdrr.io/r/base/summary.html'>summary</a></span><span class='op'>(</span><span class='va'>fit.FOMC_SFO.tc</span>, data <span class='op'>=</span> <span class='cn'>FALSE</span><span class='op'>)</span>
-</div><div class='output co'>#&gt; <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#&gt; <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#&gt; <span class='warning'>Warning: diag(.) had 0 or NA entries; non-finite result is doubtful</span></div><div class='output co'>#&gt; mkin version used for fitting: 1.0.3
-#&gt; R version used for fitting: 4.0.3
-#&gt; Date of fit: Mon Feb 15 13:43:38 2021
-#&gt; Date of summary: Mon Feb 15 13:43:38 2021
+</div><div class='output co'>#&gt; <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#&gt; <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#&gt; <span class='warning'>Warning: diag(.) had 0 or NA entries; non-finite result is doubtful</span></div><div class='output co'>#&gt; mkin version used for fitting: 1.0.4
+#&gt; R version used for fitting: 4.0.4
+#&gt; Date of fit: Wed Mar 31 19:15:53 2021
+#&gt; Date of summary: Wed Mar 31 19:15:53 2021
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -610,7 +610,7 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted using 3729 model solutions performed in 2.802 s
+#&gt; Fitted using 3729 model solutions performed in 2.798 s
#&gt;
#&gt; Error model: Two-component variance function
#&gt;

Contact - Imprint