diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2021-02-15 17:36:12 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2021-02-15 17:36:12 +0100 |
| commit | b9be19af5e3085216d0cd5af439332f631fa8b92 (patch) | |
| tree | e10511f60e7f1713b781d5ea2acf885f3d1e6767 /docs/dev/reference | |
| parent | 11c7f26dd6c532d977d9875f3c16952c7bba37ca (diff) | |
Fully rebuild docs, rerun tests and check
Diffstat (limited to 'docs/dev/reference')
109 files changed, 430 insertions, 436 deletions
diff --git a/docs/dev/reference/AIC.mmkin.html b/docs/dev/reference/AIC.mmkin.html index b332257e..8c791755 100644 --- a/docs/dev/reference/AIC.mmkin.html +++ b/docs/dev/reference/AIC.mmkin.html @@ -73,7 +73,7 @@ same dataset." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ same dataset." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -187,8 +187,7 @@ dataframe if there are several fits in the column).</p> <span class='va'>f</span> <span class='op'><-</span> <span class='fu'><a href='mmkin.html'>mmkin</a></span><span class='op'>(</span><span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span><span class='op'>(</span><span class='st'>"SFO"</span>, <span class='st'>"FOMC"</span>, <span class='st'>"DFOP"</span><span class='op'>)</span>, <span class='fu'><a href='https://rdrr.io/r/base/list.html'>list</a></span><span class='op'>(</span><span class='st'>"FOCUS A"</span> <span class='op'>=</span> <span class='va'>FOCUS_2006_A</span>, <span class='st'>"FOCUS C"</span> <span class='op'>=</span> <span class='va'>FOCUS_2006_C</span><span class='op'>)</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> -</div><div class='output co'>#> <span class='warning'>Warning: Optimisation did not converge:</span> -#> <span class='warning'>false convergence (8)</span></div><div class='input'> <span class='co'># We get a warning because the FOMC model does not converge for the</span> + <span class='co'># We get a warning because the FOMC model does not converge for the</span> <span class='co'># FOCUS A dataset, as it is well described by SFO</span> <span class='fu'><a href='https://rdrr.io/r/stats/AIC.html'>AIC</a></span><span class='op'>(</span><span class='va'>f</span><span class='op'>[</span><span class='st'>"SFO"</span>, <span class='st'>"FOCUS A"</span><span class='op'>]</span><span class='op'>)</span> <span class='co'># We get a single number for a single fit</span> @@ -199,15 +198,15 @@ dataframe if there are several fits in the column).</p> <span class='fu'><a href='https://rdrr.io/r/stats/AIC.html'>AIC</a></span><span class='op'>(</span><span class='va'>f</span><span class='op'>[</span>, <span class='st'>"FOCUS A"</span><span class='op'>]</span><span class='op'>)</span> </div><div class='output co'>#> df AIC #> SFO 3 55.28197 -#> FOMC 4 57.28211 +#> FOMC 4 57.28222 #> DFOP 5 59.28197</div><div class='input'> <span class='fu'><a href='https://rdrr.io/r/stats/AIC.html'>AIC</a></span><span class='op'>(</span><span class='va'>f</span><span class='op'>[</span>, <span class='st'>"FOCUS A"</span><span class='op'>]</span>, k <span class='op'>=</span> <span class='fl'>0</span><span class='op'>)</span> <span class='co'># If we do not penalize additional parameters, we get nearly the same</span> </div><div class='output co'>#> df AIC #> SFO 3 49.28197 -#> FOMC 4 49.28211 +#> FOMC 4 49.28222 #> DFOP 5 49.28197</div><div class='input'> <span class='fu'><a href='https://rdrr.io/r/stats/AIC.html'>BIC</a></span><span class='op'>(</span><span class='va'>f</span><span class='op'>[</span>, <span class='st'>"FOCUS A"</span><span class='op'>]</span><span class='op'>)</span> <span class='co'># Comparing the BIC gives a very similar picture</span> </div><div class='output co'>#> df BIC #> SFO 3 55.52030 -#> FOMC 4 57.59987 +#> FOMC 4 57.59999 #> DFOP 5 59.67918</div><div class='input'> <span class='co'># For FOCUS C, the more complex models fit better</span> <span class='fu'><a href='https://rdrr.io/r/stats/AIC.html'>AIC</a></span><span class='op'>(</span><span class='va'>f</span><span class='op'>[</span>, <span class='st'>"FOCUS C"</span><span class='op'>]</span><span class='op'>)</span> diff --git a/docs/dev/reference/CAKE_export.html b/docs/dev/reference/CAKE_export.html index d3f45bf0..e187772f 100644 --- a/docs/dev/reference/CAKE_export.html +++ b/docs/dev/reference/CAKE_export.html @@ -73,7 +73,7 @@ specified as well." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ specified as well." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/D24_2014.html b/docs/dev/reference/D24_2014.html index 2498c58e..9ecb6330 100644 --- a/docs/dev/reference/D24_2014.html +++ b/docs/dev/reference/D24_2014.html @@ -77,7 +77,7 @@ constrained by data protection regulations." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> diff --git a/docs/dev/reference/DFOP.solution.html b/docs/dev/reference/DFOP.solution.html index 22b28732..3ee660f2 100644 --- a/docs/dev/reference/DFOP.solution.html +++ b/docs/dev/reference/DFOP.solution.html @@ -73,7 +73,7 @@ two exponential decline functions." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ two exponential decline functions." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/Extract.mmkin.html b/docs/dev/reference/Extract.mmkin.html index 0c02355f..8381337a 100644 --- a/docs/dev/reference/Extract.mmkin.html +++ b/docs/dev/reference/Extract.mmkin.html @@ -72,7 +72,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -121,7 +121,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -220,7 +220,7 @@ either a list of mkinfit objects or a single mkinfit object.</p></td> <span class='op'>)</span> </div><div class='output co'>#> $par #> parent_0 log_alpha log_beta sigma -#> 99.666193 2.549849 5.050586 1.890202 +#> 99.666192 2.549850 5.050586 1.890202 #> #> $objective #> [1] 28.58291 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 16d12378..a188430d 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 @@ -76,7 +76,7 @@ in this fit." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -125,7 +125,7 @@ in this fit." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> 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 6b8a6119..0bee1c16 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 @@ -76,7 +76,7 @@ in this fit." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -125,7 +125,7 @@ in this fit." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> 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 076a66c6..460fdf0d 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 @@ -76,7 +76,7 @@ in this fit." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -125,7 +125,7 @@ in this fit." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> 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 08f1d416..c1a5fdff 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 @@ -76,7 +76,7 @@ in this fit." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -125,7 +125,7 @@ in this fit." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/FOCUS_2006_datasets.html b/docs/dev/reference/FOCUS_2006_datasets.html index df4651f8..fb3a8f17 100644 --- a/docs/dev/reference/FOCUS_2006_datasets.html +++ b/docs/dev/reference/FOCUS_2006_datasets.html @@ -72,7 +72,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -121,7 +121,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/FOMC.solution.html b/docs/dev/reference/FOMC.solution.html index ed5c4d21..1a5124e0 100644 --- a/docs/dev/reference/FOMC.solution.html +++ b/docs/dev/reference/FOMC.solution.html @@ -73,7 +73,7 @@ a decreasing rate constant." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ a decreasing rate constant." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/HS.solution.html b/docs/dev/reference/HS.solution.html index 8cf5c7f9..1b79e8b6 100644 --- a/docs/dev/reference/HS.solution.html +++ b/docs/dev/reference/HS.solution.html @@ -73,7 +73,7 @@ between them." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ between them." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/IORE.solution.html b/docs/dev/reference/IORE.solution.html index 29d615dc..bc17319e 100644 --- a/docs/dev/reference/IORE.solution.html +++ b/docs/dev/reference/IORE.solution.html @@ -73,7 +73,7 @@ a concentration dependent rate constant." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ a concentration dependent rate constant." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/NAFTA_SOP_2015-1.png b/docs/dev/reference/NAFTA_SOP_2015-1.png Binary files differindex 4d823d77..4f0d7833 100644 --- a/docs/dev/reference/NAFTA_SOP_2015-1.png +++ b/docs/dev/reference/NAFTA_SOP_2015-1.png diff --git a/docs/dev/reference/NAFTA_SOP_2015.html b/docs/dev/reference/NAFTA_SOP_2015.html index 4243faba..fb65fec8 100644 --- a/docs/dev/reference/NAFTA_SOP_2015.html +++ b/docs/dev/reference/NAFTA_SOP_2015.html @@ -72,7 +72,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -121,7 +121,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/NAFTA_SOP_Attachment-1.png b/docs/dev/reference/NAFTA_SOP_Attachment-1.png Binary files differindex 6eb10cde..9417685e 100644 --- a/docs/dev/reference/NAFTA_SOP_Attachment-1.png +++ b/docs/dev/reference/NAFTA_SOP_Attachment-1.png diff --git a/docs/dev/reference/NAFTA_SOP_Attachment.html b/docs/dev/reference/NAFTA_SOP_Attachment.html index de984984..311a7c61 100644 --- a/docs/dev/reference/NAFTA_SOP_Attachment.html +++ b/docs/dev/reference/NAFTA_SOP_Attachment.html @@ -72,7 +72,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -121,7 +121,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -193,7 +193,7 @@ #> Estimate Pr(>t) Lower Upper #> parent_0 9.99e+01 1.41e-26 98.8116 101.0810 #> k1 2.67e-02 5.05e-06 0.0243 0.0295 -#> k2 2.42e-12 5.00e-01 0.0000 Inf +#> k2 2.26e-12 5.00e-01 0.0000 Inf #> g 6.47e-01 3.67e-06 0.6248 0.6677 #> sigma 1.27e+00 8.91e-06 0.8395 1.6929 #> @@ -202,7 +202,7 @@ #> DT50 DT90 DT50_rep #> SFO 67.7 2.25e+02 6.77e+01 #> IORE 58.2 1.07e+03 3.22e+02 -#> DFOP 55.5 5.22e+11 2.86e+11 +#> DFOP 55.5 5.59e+11 3.07e+11 #> #> Representative half-life: #> [1] 321.51</div><div class='input'> <span class='fu'><a href='https://rdrr.io/r/graphics/plot.default.html'>plot</a></span><span class='op'>(</span><span class='va'>nafta_att_p5a</span><span class='op'>)</span> diff --git a/docs/dev/reference/Rplot001.png b/docs/dev/reference/Rplot001.png Binary files differindex 17a35806..7f498242 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 9b97a634..54c31a3f 100644 --- a/docs/dev/reference/Rplot002.png +++ b/docs/dev/reference/Rplot002.png diff --git a/docs/dev/reference/Rplot006.png b/docs/dev/reference/Rplot006.png Binary files differindex 730a7481..81525882 100644 --- a/docs/dev/reference/Rplot006.png +++ b/docs/dev/reference/Rplot006.png diff --git a/docs/dev/reference/Rplot007.png b/docs/dev/reference/Rplot007.png Binary files differindex fce3b6ee..10b7455a 100644 --- a/docs/dev/reference/Rplot007.png +++ b/docs/dev/reference/Rplot007.png diff --git a/docs/dev/reference/SFO.solution.html b/docs/dev/reference/SFO.solution.html index b3e7ef9a..43c434c6 100644 --- a/docs/dev/reference/SFO.solution.html +++ b/docs/dev/reference/SFO.solution.html @@ -72,7 +72,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -121,7 +121,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/SFORB.solution.html b/docs/dev/reference/SFORB.solution.html index 9310212f..807fbe5c 100644 --- a/docs/dev/reference/SFORB.solution.html +++ b/docs/dev/reference/SFORB.solution.html @@ -76,7 +76,7 @@ and no substance in the bound fraction." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -125,7 +125,7 @@ and no substance in the bound fraction." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/add_err-1.png b/docs/dev/reference/add_err-1.png Binary files differindex d2ce797f..9ba106db 100644 --- a/docs/dev/reference/add_err-1.png +++ b/docs/dev/reference/add_err-1.png diff --git a/docs/dev/reference/add_err-2.png b/docs/dev/reference/add_err-2.png Binary files differindex ac220c9e..3088c40e 100644 --- a/docs/dev/reference/add_err-2.png +++ b/docs/dev/reference/add_err-2.png diff --git a/docs/dev/reference/add_err-3.png b/docs/dev/reference/add_err-3.png Binary files differindex 40465b71..493a761a 100644 --- a/docs/dev/reference/add_err-3.png +++ b/docs/dev/reference/add_err-3.png diff --git a/docs/dev/reference/add_err.html b/docs/dev/reference/add_err.html index 6ea30515..b94cef29 100644 --- a/docs/dev/reference/add_err.html +++ b/docs/dev/reference/add_err.html @@ -74,7 +74,7 @@ may depend on the predicted value and is specified as a standard deviation." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -123,7 +123,7 @@ may depend on the predicted value and is specified as a standard deviation." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/aw.html b/docs/dev/reference/aw.html index ef808dd8..3b06f2a6 100644 --- a/docs/dev/reference/aw.html +++ b/docs/dev/reference/aw.html @@ -74,7 +74,7 @@ by Burnham and Anderson (2004)." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -123,7 +123,7 @@ by Burnham and Anderson (2004)." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/confint.mkinfit.html b/docs/dev/reference/confint.mkinfit.html index 89bb3d89..2237a539 100644 --- a/docs/dev/reference/confint.mkinfit.html +++ b/docs/dev/reference/confint.mkinfit.html @@ -79,7 +79,7 @@ method of Venzon and Moolgavkar (1988)." /> </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.0.1.9000</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -285,13 +285,13 @@ Profile-Likelihood Based Confidence Intervals, Applied Statistics, 37, <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'>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 class='fu'><a href='https://rdrr.io/r/base/system.time.html'>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'>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> </div><div class='output co'>#> user system elapsed -#> 4.258 0.916 3.889 </div><div class='input'><span class='co'># Using more cores does not save much time here, as parent_0 takes up most of the time</span> +#> 4.295 1.008 3.959 </div><div class='input'><span class='co'># Using more cores does not save much time here, as parent_0 takes up most of the time</span> <span class='co'># If we additionally exclude parent_0 (the confidence of which is often of</span> <span class='co'># minor interest), we get a nice performance improvement if we use at least 4 cores</span> <span class='fu'><a href='https://rdrr.io/r/base/system.time.html'>system.time</a></span><span class='op'>(</span><span class='va'>ci_profile_no_parent_0</span> <span class='op'><-</span> <span class='fu'><a href='https://rdrr.io/r/stats/confint.html'>confint</a></span><span class='op'>(</span><span class='va'>f_d_1</span>, method <span class='op'>=</span> <span class='st'>"profile"</span>, <span class='fu'><a href='https://rdrr.io/r/base/c.html'>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> </div><div class='output co'>#> <span class='message'>Profiling the likelihood</span></div><div class='output co'>#> user system elapsed -#> 1.459 0.088 0.907 </div><div class='input'><span class='va'>ci_profile</span> +#> 1.451 0.126 0.923 </div><div class='input'><span class='va'>ci_profile</span> </div><div class='output co'>#> 2.5% 97.5% #> parent_0 96.456003640 1.027703e+02 #> k_parent_sink 0.040762501 5.549764e-02 diff --git a/docs/dev/reference/create_deg_func.html b/docs/dev/reference/create_deg_func.html index 4945d157..65a682bb 100644 --- a/docs/dev/reference/create_deg_func.html +++ b/docs/dev/reference/create_deg_func.html @@ -72,7 +72,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -121,7 +121,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -181,8 +181,8 @@ deSolve <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='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>, replications <span class='op'>=</span> <span class='fl'>2</span><span class='op'>)</span> </div><div class='output co'>#> <span class='message'>Loading required package: rbenchmark</span></div><div class='output co'>#> test replications elapsed relative user.self sys.self user.child -#> 1 analytical 2 0.396 1.000 0.395 0 0 -#> 2 deSolve 2 0.694 1.753 0.693 0 0 +#> 1 analytical 2 0.396 1.00 0.396 0 0 +#> 2 deSolve 2 0.709 1.79 0.707 0 0 #> sys.child #> 1 0 #> 2 0</div><div class='input'> <span class='va'>DFOP_SFO</span> <span class='op'><-</span> <span class='fu'><a href='mkinmod.html'>mkinmod</a></span><span class='op'>(</span> @@ -193,8 +193,8 @@ 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>, replications <span class='op'>=</span> <span class='fl'>2</span><span class='op'>)</span> </div><div class='output co'>#> test replications elapsed relative user.self sys.self user.child -#> 1 analytical 2 0.838 1.000 0.838 0.001 0 -#> 2 deSolve 2 1.573 1.877 1.572 0.000 0 +#> 1 analytical 2 0.844 1.000 0.844 0 0 +#> 2 deSolve 2 1.624 1.924 1.624 0 0 #> sys.child #> 1 0 #> 2 0</div><div class='input'><span class='co'># }</span> diff --git a/docs/dev/reference/dimethenamid_2018.html b/docs/dev/reference/dimethenamid_2018.html index 21dea623..a06599df 100644 --- a/docs/dev/reference/dimethenamid_2018.html +++ b/docs/dev/reference/dimethenamid_2018.html @@ -77,7 +77,7 @@ constrained by data protection regulations." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> diff --git a/docs/dev/reference/endpoints.html b/docs/dev/reference/endpoints.html index 301b454f..c9912f9c 100644 --- a/docs/dev/reference/endpoints.html +++ b/docs/dev/reference/endpoints.html @@ -78,7 +78,7 @@ advantage that the SFORB model can also be used for metabolites." /> </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.0.2.9000</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> diff --git a/docs/dev/reference/experimental_data_for_UBA-1.png b/docs/dev/reference/experimental_data_for_UBA-1.png Binary files differindex 24cb54c5..33946ded 100644 --- a/docs/dev/reference/experimental_data_for_UBA-1.png +++ b/docs/dev/reference/experimental_data_for_UBA-1.png diff --git a/docs/dev/reference/experimental_data_for_UBA.html b/docs/dev/reference/experimental_data_for_UBA.html index 78e57fb0..9904370f 100644 --- a/docs/dev/reference/experimental_data_for_UBA.html +++ b/docs/dev/reference/experimental_data_for_UBA.html @@ -100,7 +100,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -149,7 +149,7 @@ Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/f_time_norm_focus.html b/docs/dev/reference/f_time_norm_focus.html index 3421043d..852e00a0 100644 --- a/docs/dev/reference/f_time_norm_focus.html +++ b/docs/dev/reference/f_time_norm_focus.html @@ -73,7 +73,7 @@ in Appendix 8 to the FOCUS kinetics guidance (FOCUS 2014, p. 369)." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> diff --git a/docs/dev/reference/focus_soil_moisture.html b/docs/dev/reference/focus_soil_moisture.html index c46fd69a..0e6fea28 100644 --- a/docs/dev/reference/focus_soil_moisture.html +++ b/docs/dev/reference/focus_soil_moisture.html @@ -73,7 +73,7 @@ corresponds to pF2, MWHC to pF 1 and 1/3 bar to pF 2.5." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ corresponds to pF2, MWHC to pF 1 and 1/3 bar to pF 2.5." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/get_deg_func.html b/docs/dev/reference/get_deg_func.html index a266bf5f..fb661085 100644 --- a/docs/dev/reference/get_deg_func.html +++ b/docs/dev/reference/get_deg_func.html @@ -72,7 +72,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -121,7 +121,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/ilr.html b/docs/dev/reference/ilr.html index 98e51211..452647d6 100644 --- a/docs/dev/reference/ilr.html +++ b/docs/dev/reference/ilr.html @@ -73,7 +73,7 @@ transformations." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ transformations." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/index.html b/docs/dev/reference/index.html index b52ecb22..03a21517 100644 --- a/docs/dev/reference/index.html +++ b/docs/dev/reference/index.html @@ -71,7 +71,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.2.9000</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> diff --git a/docs/dev/reference/loftest-1.png b/docs/dev/reference/loftest-1.png Binary files differindex 6b918fec..d6006ecc 100644 --- a/docs/dev/reference/loftest-1.png +++ b/docs/dev/reference/loftest-1.png diff --git a/docs/dev/reference/loftest-2.png b/docs/dev/reference/loftest-2.png Binary files differindex 60874bd3..4d0dc551 100644 --- a/docs/dev/reference/loftest-2.png +++ b/docs/dev/reference/loftest-2.png diff --git a/docs/dev/reference/loftest-3.png b/docs/dev/reference/loftest-3.png Binary files differindex 4837e7f2..6afd084b 100644 --- a/docs/dev/reference/loftest-3.png +++ b/docs/dev/reference/loftest-3.png diff --git a/docs/dev/reference/loftest-4.png b/docs/dev/reference/loftest-4.png Binary files differindex 9c18ac30..f94eede1 100644 --- a/docs/dev/reference/loftest-4.png +++ b/docs/dev/reference/loftest-4.png diff --git a/docs/dev/reference/loftest-5.png b/docs/dev/reference/loftest-5.png Binary files differindex 11f2bda7..43460a65 100644 --- a/docs/dev/reference/loftest-5.png +++ b/docs/dev/reference/loftest-5.png diff --git a/docs/dev/reference/loftest.html b/docs/dev/reference/loftest.html index abbbd3b9..9dbd547d 100644 --- a/docs/dev/reference/loftest.html +++ b/docs/dev/reference/loftest.html @@ -75,7 +75,7 @@ lrtest.default from the lmtest package." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -124,7 +124,7 @@ lrtest.default from the lmtest package." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/logLik.mkinfit.html b/docs/dev/reference/logLik.mkinfit.html index 82c0654f..3e9452c6 100644 --- a/docs/dev/reference/logLik.mkinfit.html +++ b/docs/dev/reference/logLik.mkinfit.html @@ -76,7 +76,7 @@ the error model." /> </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.0.1.9000</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> diff --git a/docs/dev/reference/logistic.solution-2.png b/docs/dev/reference/logistic.solution-2.png Binary files differindex 764996df..73e6436d 100644 --- a/docs/dev/reference/logistic.solution-2.png +++ b/docs/dev/reference/logistic.solution-2.png diff --git a/docs/dev/reference/logistic.solution.html b/docs/dev/reference/logistic.solution.html index 950e8a8e..ab68c99e 100644 --- a/docs/dev/reference/logistic.solution.html +++ b/docs/dev/reference/logistic.solution.html @@ -73,7 +73,7 @@ an increasing rate constant, supposedly caused by microbial growth" /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ an increasing rate constant, supposedly caused by microbial growth" /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -240,10 +240,10 @@ Version 1.1, 18 December 2014 <span class='fu'><a href='plot.mkinfit.html'>plot_sep</a></span><span class='op'>(</span><span class='va'>m</span><span class='op'>)</span> </div><div class='img'><img src='logistic.solution-2.png' alt='' width='700' height='433' /></div><div class='input'> <span class='fu'><a href='https://rdrr.io/r/base/summary.html'>summary</a></span><span class='op'>(</span><span class='va'>m</span><span class='op'>)</span><span class='op'>$</span><span class='va'>bpar</span> </div><div class='output co'>#> Estimate se_notrans t value Pr(>t) Lower -#> parent_0 1.057896e+02 1.9023449703 55.610119 3.768361e-16 1.016451e+02 -#> kmax 6.398190e-02 0.0143201031 4.467978 3.841829e-04 3.929235e-02 +#> parent_0 1.057896e+02 1.9023449590 55.610120 3.768360e-16 1.016451e+02 +#> kmax 6.398190e-02 0.0143201029 4.467978 3.841828e-04 3.929235e-02 #> k0 1.612775e-04 0.0005866813 0.274898 3.940351e-01 5.846688e-08 -#> r 2.263946e-01 0.1718110715 1.317695 1.061044e-01 4.335843e-02 +#> r 2.263946e-01 0.1718110662 1.317695 1.061043e-01 4.335843e-02 #> sigma 5.332935e+00 0.9145907310 5.830952 4.036926e-05 3.340213e+00 #> Upper #> parent_0 109.9341588 diff --git a/docs/dev/reference/lrtest.mkinfit.html b/docs/dev/reference/lrtest.mkinfit.html index b76ebc87..f2d8472e 100644 --- a/docs/dev/reference/lrtest.mkinfit.html +++ b/docs/dev/reference/lrtest.mkinfit.html @@ -76,7 +76,7 @@ and can be expressed by fixing the parameters of the other." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -125,7 +125,7 @@ and can be expressed by fixing the parameters of the other." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/max_twa_parent.html b/docs/dev/reference/max_twa_parent.html index 25f745e9..a358568a 100644 --- a/docs/dev/reference/max_twa_parent.html +++ b/docs/dev/reference/max_twa_parent.html @@ -78,7 +78,7 @@ soil section of the FOCUS guidance." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -127,7 +127,7 @@ soil section of the FOCUS guidance." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/mccall81_245T-1.png b/docs/dev/reference/mccall81_245T-1.png Binary files differindex 5daa5f18..91fe060e 100644 --- a/docs/dev/reference/mccall81_245T-1.png +++ b/docs/dev/reference/mccall81_245T-1.png diff --git a/docs/dev/reference/mccall81_245T.html b/docs/dev/reference/mccall81_245T.html index 7179533d..f79137be 100644 --- a/docs/dev/reference/mccall81_245T.html +++ b/docs/dev/reference/mccall81_245T.html @@ -74,7 +74,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -181,30 +181,30 @@ <span class='va'>fit.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_SFO</span>, <span class='fu'><a href='https://rdrr.io/r/base/subset.html'>subset</a></span><span class='op'>(</span><span class='va'>mccall81_245T</span>, <span class='va'>soil</span> <span class='op'>==</span> <span class='st'>"Commerce"</span><span class='op'>)</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> </div><div class='output co'>#> <span class='warning'>Warning: Observations with value of zero were removed from the data</span></div><div class='input'> <span class='fu'><a href='https://rdrr.io/r/base/summary.html'>summary</a></span><span class='op'>(</span><span class='va'>fit.1</span><span class='op'>)</span><span class='op'>$</span><span class='va'>bpar</span> </div><div class='output co'>#> Estimate se_notrans t value Pr(>t) -#> T245_0 1.038550e+02 2.1847074888 47.537272 4.472189e-18 +#> T245_0 1.038550e+02 2.1847074945 47.537272 4.472189e-18 #> k_T245 4.337042e-02 0.0018983965 22.845818 2.276911e-13 -#> k_phenol 4.050581e-01 0.2986993400 1.356073 9.756988e-02 -#> k_anisole 6.678742e-03 0.0008021439 8.326114 2.623176e-07 -#> f_T245_to_phenol 6.227599e-01 0.3985340295 1.562627 6.949412e-02 -#> f_phenol_to_anisole 1.000000e+00 0.6718439378 1.488441 7.867787e-02 -#> sigma 2.514628e+00 0.4907558750 5.123989 6.233156e-05 +#> k_phenol 4.050581e-01 0.2986993563 1.356073 9.756989e-02 +#> k_anisole 6.678742e-03 0.0008021439 8.326114 2.623177e-07 +#> f_T245_to_phenol 6.227599e-01 0.3985340558 1.562627 6.949413e-02 +#> f_phenol_to_anisole 1.000000e+00 0.6718439825 1.488441 7.867789e-02 +#> sigma 2.514628e+00 0.4907558883 5.123989 6.233157e-05 #> Lower Upper -#> T245_0 99.246061370 1.084640e+02 +#> T245_0 99.246061385 1.084640e+02 #> k_T245 0.039631621 4.746194e-02 -#> k_phenol 0.218013878 7.525762e-01 +#> k_phenol 0.218013879 7.525762e-01 #> k_anisole 0.005370739 8.305299e-03 -#> f_T245_to_phenol 0.547559083 6.924813e-01 +#> f_T245_to_phenol 0.547559081 6.924813e-01 #> f_phenol_to_anisole 0.000000000 1.000000e+00 #> sigma 1.706607296 3.322649e+00</div><div class='input'> <span class='fu'><a href='endpoints.html'>endpoints</a></span><span class='op'>(</span><span class='va'>fit.1</span><span class='op'>)</span> </div><div class='output co'>#> $ff #> T245_phenol T245_sink phenol_anisole phenol_sink -#> 6.227599e-01 3.772401e-01 1.000000e+00 6.894640e-11 +#> 6.227599e-01 3.772401e-01 1.000000e+00 3.773626e-10 #> #> $distimes #> DT50 DT90 #> T245 15.982025 53.09114 #> phenol 1.711229 5.68458 -#> anisole 103.784092 344.76329 +#> anisole 103.784093 344.76329 #> </div><div class='input'> <span class='co'># formation fraction from phenol to anisol is practically 1. As we cannot</span> <span class='co'># fix formation fractions when using the ilr transformation, we can turn of</span> <span class='co'># the sink in the model generation</span> @@ -215,28 +215,28 @@ quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> </div><div class='output co'>#> <span class='warning'>Warning: Observations with value of zero were removed from the data</span></div><div class='input'> <span class='fu'><a href='https://rdrr.io/r/base/summary.html'>summary</a></span><span class='op'>(</span><span class='va'>fit.2</span><span class='op'>)</span><span class='op'>$</span><span class='va'>bpar</span> </div><div class='output co'>#> Estimate se_notrans t value Pr(>t) Lower -#> T245_0 1.038550e+02 2.1623653027 48.028439 4.993108e-19 99.271020526 -#> k_T245 4.337042e-02 0.0018343666 23.643268 3.573555e-14 0.039650977 -#> k_phenol 4.050582e-01 0.1177237248 3.440752 1.679252e-03 0.218746585 -#> k_anisole 6.678741e-03 0.0006829745 9.778903 1.872894e-08 0.005377083 -#> f_T245_to_phenol 6.227599e-01 0.0342197865 18.198825 2.039410e-12 0.547975628 +#> T245_0 1.038550e+02 2.1623653066 48.028439 4.993108e-19 99.271020284 +#> k_T245 4.337042e-02 0.0018343666 23.643268 3.573556e-14 0.039650976 +#> k_phenol 4.050582e-01 0.1177237473 3.440752 1.679254e-03 0.218746587 +#> k_anisole 6.678742e-03 0.0006829745 9.778903 1.872894e-08 0.005377083 +#> f_T245_to_phenol 6.227599e-01 0.0342197875 18.198824 2.039411e-12 0.547975637 #> sigma 2.514628e+00 0.3790944250 6.633250 2.875782e-06 1.710983655 #> Upper -#> T245_0 108.43904097 +#> T245_0 108.43904074 #> k_T245 0.04743877 -#> k_phenol 0.75005577 +#> k_phenol 0.75005585 #> k_anisole 0.00829550 -#> f_T245_to_phenol 0.69212306 +#> f_T245_to_phenol 0.69212308 #> sigma 3.31827222</div><div class='input'> <span class='fu'><a href='endpoints.html'>endpoints</a></span><span class='op'>(</span><span class='va'>fit.1</span><span class='op'>)</span> </div><div class='output co'>#> $ff #> T245_phenol T245_sink phenol_anisole phenol_sink -#> 6.227599e-01 3.772401e-01 1.000000e+00 6.894640e-11 +#> 6.227599e-01 3.772401e-01 1.000000e+00 3.773626e-10 #> #> $distimes #> DT50 DT90 #> T245 15.982025 53.09114 #> phenol 1.711229 5.68458 -#> anisole 103.784092 344.76329 +#> anisole 103.784093 344.76329 #> </div><div class='input'> <span class='fu'><a href='plot.mkinfit.html'>plot_sep</a></span><span class='op'>(</span><span class='va'>fit.2</span><span class='op'>)</span> </div><div class='img'><img src='mccall81_245T-1.png' alt='' width='700' height='433' /></div><div class='input'> <span class='co'># }</span> </div></pre> diff --git a/docs/dev/reference/mixed-1.png b/docs/dev/reference/mixed-1.png Binary files differindex 3400c4aa..28a376f4 100644 --- a/docs/dev/reference/mixed-1.png +++ b/docs/dev/reference/mixed-1.png diff --git a/docs/dev/reference/mixed.html b/docs/dev/reference/mixed.html index 18a67af8..7bf8dd56 100644 --- a/docs/dev/reference/mixed.html +++ b/docs/dev/reference/mixed.html @@ -72,7 +72,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -121,7 +121,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -235,18 +235,16 @@ #> Status of individual fits: #> #> dataset -#> model 1 2 3 4 5 6 7 8 -#> DFOP-SFO OK OK OK OK OK C OK OK +#> model 1 2 3 4 5 6 7 8 +#> DFOP-SFO OK OK OK OK OK OK OK OK #> #> OK: No warnings -#> C: Optimisation did not converge: -#> iteration limit reached without convergence (10) #> #> Mean fitted parameters: #> parent_0 log_k_m1 f_parent_qlogis log_k1 log_k2 -#> 100.606304 -8.759216 -0.002001 -3.350539 -3.989549 +#> 100.674757 -8.761916 -0.004347 -3.348812 -3.986853 #> g_qlogis -#> -0.090353 </div><div class='input'><span class='fu'><a href='https://rdrr.io/r/graphics/plot.default.html'>plot</a></span><span class='op'>(</span><span class='va'>f_mixed</span><span class='op'>)</span> +#> -0.087392 </div><div class='input'><span class='fu'><a href='https://rdrr.io/r/graphics/plot.default.html'>plot</a></span><span class='op'>(</span><span class='va'>f_mixed</span><span class='op'>)</span> </div><div class='img'><img src='mixed-1.png' alt='' width='700' height='433' /></div><div class='input'><span class='co'># }</span> </div></pre> </div> diff --git a/docs/dev/reference/mkin_long_to_wide.html b/docs/dev/reference/mkin_long_to_wide.html index 28a37800..6246fbe2 100644 --- a/docs/dev/reference/mkin_long_to_wide.html +++ b/docs/dev/reference/mkin_long_to_wide.html @@ -74,7 +74,7 @@ variable and several dependent variables as columns." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -123,7 +123,7 @@ variable and several dependent variables as columns." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/mkin_wide_to_long.html b/docs/dev/reference/mkin_wide_to_long.html index f085d162..f2bf00c1 100644 --- a/docs/dev/reference/mkin_wide_to_long.html +++ b/docs/dev/reference/mkin_wide_to_long.html @@ -74,7 +74,7 @@ mkinfit." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -123,7 +123,7 @@ mkinfit." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/mkinds.html b/docs/dev/reference/mkinds.html index 907f8ad3..0d1de46d 100644 --- a/docs/dev/reference/mkinds.html +++ b/docs/dev/reference/mkinds.html @@ -75,7 +75,7 @@ provided by this package come as mkinds objects nevertheless." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -124,7 +124,7 @@ provided by this package come as mkinds objects nevertheless." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/mkindsg.html b/docs/dev/reference/mkindsg.html index 3e4dfb39..67c6e5df 100644 --- a/docs/dev/reference/mkindsg.html +++ b/docs/dev/reference/mkindsg.html @@ -75,7 +75,7 @@ dataset if no data are supplied." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -124,7 +124,7 @@ dataset if no data are supplied." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -239,12 +239,12 @@ or covariates like soil pH).</p></dd> <span class='fu'><a href='https://rdrr.io/r/base/print.html'>print</a></span><span class='op'>(</span><span class='va'>mdsg</span><span class='op'>)</span> </div><div class='output co'>#> <mkindsg> holding 5 mkinds objects #> Title $title: Experimental X -#> Occurrene of observed compounds $observed_n: +#> Occurrence of observed compounds $observed_n: #> parent A1 #> 5 5 </div><div class='input'><span class='fu'><a href='https://rdrr.io/r/base/print.html'>print</a></span><span class='op'>(</span><span class='va'>mdsg</span>, verbose <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> </div><div class='output co'>#> <mkindsg> holding 5 mkinds objects #> Title $title: Experimental X -#> Occurrene of observed compounds $observed_n: +#> Occurrence of observed compounds $observed_n: #> parent A1 #> 5 5 #> @@ -290,7 +290,7 @@ or covariates like soil pH).</p></dd> #> Observation unit: \%AR </div><div class='input'><span class='fu'><a href='https://rdrr.io/r/base/print.html'>print</a></span><span class='op'>(</span><span class='va'>mdsg</span>, verbose <span class='op'>=</span> <span class='cn'>TRUE</span>, data <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> </div><div class='output co'>#> <mkindsg> holding 5 mkinds objects #> Title $title: Experimental X -#> Occurrene of observed compounds $observed_n: +#> Occurrence of observed compounds $observed_n: #> parent A1 #> 5 5 #> diff --git a/docs/dev/reference/mkinerrmin.html b/docs/dev/reference/mkinerrmin.html index 1cff040d..94c575cb 100644 --- a/docs/dev/reference/mkinerrmin.html +++ b/docs/dev/reference/mkinerrmin.html @@ -73,7 +73,7 @@ the chi-squared test as defined in the FOCUS kinetics report from 2006." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ the chi-squared test as defined in the FOCUS kinetics report from 2006." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/mkinerrplot.html b/docs/dev/reference/mkinerrplot.html index 2324b968..7f1fd048 100644 --- a/docs/dev/reference/mkinerrplot.html +++ b/docs/dev/reference/mkinerrplot.html @@ -76,7 +76,7 @@ using the argument show_errplot = TRUE." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -125,7 +125,7 @@ using the argument show_errplot = TRUE." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/mkinfit-1.png b/docs/dev/reference/mkinfit-1.png Binary files differindex eed9064f..de2a90a9 100644 --- a/docs/dev/reference/mkinfit-1.png +++ b/docs/dev/reference/mkinfit-1.png diff --git a/docs/dev/reference/mkinfit.html b/docs/dev/reference/mkinfit.html index 6ae7b343..5910038f 100644 --- a/docs/dev/reference/mkinfit.html +++ b/docs/dev/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-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -431,17 +431,17 @@ 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'><-</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'>#> mkin version used for fitting: 0.9.50.4 +</div><div class='output co'>#> mkin version used for fitting: 1.0.3.9000 #> R version used for fitting: 4.0.3 -#> Date of fit: Mon Jan 11 12:41:45 2021 -#> Date of summary: Mon Jan 11 12:41:45 2021 +#> Date of fit: Mon Feb 15 17:09:39 2021 +#> Date of summary: Mon Feb 15 17:09:39 2021 #> #> Equations: #> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent #> #> Model predictions using solution type analytical #> -#> Fitted using 222 model solutions performed in 0.046 s +#> Fitted using 222 model solutions performed in 0.045 s #> #> Error model: Constant variance #> @@ -476,10 +476,10 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6 #> #> Parameter correlation: #> parent_0 log_alpha log_beta sigma -#> parent_0 1.000e+00 -1.565e-01 -3.142e-01 4.758e-08 -#> log_alpha -1.565e-01 1.000e+00 9.564e-01 1.007e-07 -#> log_beta -3.142e-01 9.564e-01 1.000e+00 8.568e-08 -#> sigma 4.758e-08 1.007e-07 8.568e-08 1.000e+00 +#> parent_0 1.000e+00 -1.565e-01 -3.142e-01 4.772e-08 +#> log_alpha -1.565e-01 1.000e+00 9.564e-01 1.005e-07 +#> log_beta -3.142e-01 9.564e-01 1.000e+00 8.541e-08 +#> sigma 4.772e-08 1.005e-07 8.541e-08 1.000e+00 #> #> Backtransformed parameters: #> Confidence intervals for internally transformed parameters are asymmetric. @@ -548,7 +548,7 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6 #> --- #> Signif. codes: 0 ‘***’ 0.001 ‘**’ 0.01 ‘*’ 0.05 ‘.’ 0.1 ‘ ’ 1</div><div class='input'><span class='fu'><a href='parms.html'>parms</a></span><span class='op'>(</span><span class='va'>fit.tc</span><span class='op'>)</span> </div><div class='output co'>#> parent_0 k_parent k_m1 f_parent_to_m1 sigma_low -#> 1.007343e+02 1.005562e-01 5.166712e-03 5.083933e-01 3.049884e-03 +#> 1.007343e+02 1.005562e-01 5.166712e-03 5.083933e-01 3.049883e-03 #> rsd_high #> 7.928118e-02 </div><div class='input'><span class='fu'><a href='endpoints.html'>endpoints</a></span><span class='op'>(</span><span class='va'>fit.tc</span><span class='op'>)</span> </div><div class='output co'>#> $ff @@ -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'>#> <span class='message'>Loading required package: rbenchmark</span></div><div class='output co'>#> test relative elapsed -#> 3 analytical 1.000 0.526 -#> 1 deSolve_compiled 1.903 1.001 -#> 2 eigen 2.308 1.214</div><div class='input'><span class='co'># }</span> +</div><div class='output co'>#> test relative elapsed +#> 3 analytical 1.000 0.563 +#> 1 deSolve_compiled 1.702 0.958 +#> 2 eigen 2.597 1.462</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> @@ -587,22 +587,21 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6 </div><div class='output co'>#> <span class='message'>Temporary DLL for differentials generated and loaded</span></div><div class='input'><span class='va'>fit.FOMC_SFO</span> <span class='op'><-</span> <span class='fu'>mkinfit</span><span class='op'>(</span><span class='va'>FOMC_SFO</span>, <span class='va'>FOCUS_D</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> <span class='co'># Again, we get a warning and try a more sophisticated error model</span> <span class='va'>fit.FOMC_SFO.tc</span> <span class='op'><-</span> <span class='fu'>mkinfit</span><span class='op'>(</span><span class='va'>FOMC_SFO</span>, <span class='va'>FOCUS_D</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span>, error_model <span class='op'>=</span> <span class='st'>"tc"</span><span class='op'>)</span> -</div><div class='output co'>#> <span class='warning'>Warning: Optimisation did not converge:</span> -#> <span class='warning'>iteration limit reached without convergence (10)</span></div><div class='input'><span class='co'># This model has a higher likelihood, but not significantly so</span> +<span class='co'># This model has a higher likelihood, but not significantly so</span> <span class='fu'><a href='https://rdrr.io/pkg/lmtest/man/lrtest.html'>lrtest</a></span><span class='op'>(</span><span class='va'>fit.tc</span>, <span class='va'>fit.FOMC_SFO.tc</span><span class='op'>)</span> </div><div class='output co'>#> Likelihood ratio test #> #> Model 1: FOMC_SFO with error model tc and fixed parameter(s) m1_0 #> Model 2: SFO_SFO with error model tc and fixed parameter(s) m1_0 #> #Df LogLik Df Chisq Pr(>Chisq) -#> 1 7 -64.870 -#> 2 6 -64.983 -1 0.2259 0.6346</div><div class='input'><span class='co'># Also, the missing standard error for log_beta and the t-tests for alpha</span> +#> 1 7 -64.829 +#> 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'>#> <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#> <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#> <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#> <span class='warning'>Warning: diag(.) had 0 or NA entries; non-finite result is doubtful</span></div><div class='output co'>#> mkin version used for fitting: 0.9.50.4 +</div><div class='output co'>#> <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#> <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#> <span class='warning'>Warning: diag(.) had 0 or NA entries; non-finite result is doubtful</span></div><div class='output co'>#> mkin version used for fitting: 1.0.3.9000 #> R version used for fitting: 4.0.3 -#> Date of fit: Mon Jan 11 12:41:56 2021 -#> Date of summary: Mon Jan 11 12:41:56 2021 +#> Date of fit: Mon Feb 15 17:09:50 2021 +#> Date of summary: Mon Feb 15 17:09:50 2021 #> #> Equations: #> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent @@ -611,12 +610,12 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6 #> #> Model predictions using solution type deSolve #> -#> Fitted using 4273 model solutions performed in 3.456 s +#> Fitted using 3729 model solutions performed in 2.815 s #> #> Error model: Two-component variance function #> #> Error model algorithm: d_3 -#> Three-step fitting yielded a higher likelihood than direct fitting +#> Direct fitting and three-step fitting yield approximately the same likelihood #> #> Starting values for parameters to be optimised: #> value type @@ -642,72 +641,67 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6 #> value type #> m1_0 0 state #> -#> -#> Warning(s): -#> Optimisation did not converge: -#> iteration limit reached without convergence (10) -#> #> Results: #> -#> AIC BIC logLik -#> 143.7396 155.2027 -64.86982 +#> AIC BIC logLik +#> 143.658 155.1211 -64.82902 #> #> Optimised, transformed parameters with symmetric confidence intervals: -#> Estimate Std. Error Lower Upper -#> parent_0 1.016e+02 1.90600 97.7400 105.5000 -#> log_k_m1 -5.285e+00 0.09286 -5.4740 -5.0950 -#> f_parent_qlogis 6.482e-04 0.06164 -0.1251 0.1264 -#> log_alpha 5.467e+00 NaN NaN NaN -#> log_beta 7.750e+00 NaN NaN NaN -#> sigma_low 0.000e+00 NaN NaN NaN -#> rsd_high 7.989e-02 NaN NaN NaN +#> Estimate Std. Error Lower Upper +#> parent_0 101.600000 2.6400000 96.240000 107.000000 +#> log_k_m1 -5.284000 0.0929100 -5.474000 -5.095000 +#> f_parent_qlogis 0.001426 0.0767000 -0.155000 0.157800 +#> log_alpha 5.522000 0.0077320 5.506000 5.538000 +#> log_beta 7.806000 NaN NaN NaN +#> sigma_low 0.002488 0.0002431 0.001992 0.002984 +#> rsd_high 0.079210 0.0093280 0.060180 0.098230 #> #> Parameter correlation: -#> parent_0 log_k_m1 f_parent_qlogis log_alpha log_beta -#> parent_0 1.0000000 -0.0002167 -0.6060 NaN NaN -#> log_k_m1 -0.0002167 1.0000000 0.5474 NaN NaN -#> f_parent_qlogis -0.6060320 0.5474423 1.0000 NaN NaN -#> log_alpha NaN NaN NaN 1 NaN -#> log_beta NaN NaN NaN NaN 1 -#> sigma_low NaN NaN NaN NaN NaN -#> rsd_high NaN NaN NaN NaN NaN -#> sigma_low rsd_high -#> parent_0 NaN NaN -#> log_k_m1 NaN NaN -#> f_parent_qlogis NaN NaN -#> log_alpha NaN NaN -#> log_beta NaN NaN -#> sigma_low 1 NaN -#> rsd_high NaN 1 +#> parent_0 log_k_m1 f_parent_qlogis log_alpha log_beta +#> parent_0 1.000000 -0.095226 -0.76678 0.70544 NaN +#> log_k_m1 -0.095226 1.000000 0.51432 -0.14387 NaN +#> f_parent_qlogis -0.766780 0.514321 1.00000 -0.61396 NaN +#> log_alpha 0.705444 -0.143872 -0.61396 1.00000 NaN +#> log_beta NaN NaN NaN NaN 1 +#> sigma_low 0.016073 0.001586 0.01548 5.87007 NaN +#> rsd_high 0.006626 -0.011700 -0.05357 0.04849 NaN +#> sigma_low rsd_high +#> parent_0 0.016073 0.006626 +#> log_k_m1 0.001586 -0.011700 +#> f_parent_qlogis 0.015476 -0.053566 +#> log_alpha 5.870075 0.048487 +#> log_beta NaN NaN +#> sigma_low 1.000000 -0.652558 +#> rsd_high -0.652558 1.000000 #> #> Backtransformed parameters: #> Confidence intervals for internally transformed parameters are asymmetric. #> t-test (unrealistically) based on the assumption of normal distribution #> for estimators of untransformed parameters. #> Estimate t value Pr(>t) Lower Upper -#> parent_0 1.016e+02 32.5400 7.812e-26 97.740000 1.055e+02 -#> k_m1 5.069e-03 10.0400 1.448e-11 0.004194 6.126e-03 -#> f_parent_to_m1 5.002e-01 20.7300 5.001e-20 0.468800 5.315e-01 -#> alpha 2.367e+02 0.6205 2.697e-01 NA NA -#> beta 2.322e+03 0.6114 2.727e-01 NA NA -#> sigma_low 0.000e+00 NaN NaN NaN NaN -#> rsd_high 7.989e-02 8.6630 4.393e-10 NaN NaN +#> parent_0 1.016e+02 32.7800 6.311e-26 9.624e+01 1.070e+02 +#> k_m1 5.072e-03 10.1200 1.216e-11 4.196e-03 6.130e-03 +#> f_parent_to_m1 5.004e-01 20.8300 4.317e-20 4.613e-01 5.394e-01 +#> alpha 2.502e+02 0.5624 2.889e-01 2.463e+02 2.542e+02 +#> beta 2.455e+03 0.5549 2.915e-01 NA NA +#> sigma_low 2.488e-03 0.4843 3.158e-01 1.992e-03 2.984e-03 +#> rsd_high 7.921e-02 8.4300 8.001e-10 6.018e-02 9.823e-02 #> #> FOCUS Chi2 error levels in percent: #> err.min n.optim df -#> All data 6.782 5 14 -#> parent 7.142 3 6 -#> m1 4.639 2 8 +#> All data 6.781 5 14 +#> parent 7.141 3 6 +#> m1 4.640 2 8 #> #> Resulting formation fractions: #> ff -#> parent_m1 0.5002 -#> parent_sink 0.4998 +#> parent_m1 0.5004 +#> parent_sink 0.4996 #> #> Estimated disappearance times: -#> DT50 DT90 DT50back -#> parent 6.81 22.7 6.833 -#> m1 136.74 454.2 NA</div><div class='input'> +#> DT50 DT90 DT50back +#> parent 6.812 22.7 6.834 +#> m1 136.661 454.0 NA</div><div class='input'> <span class='co'># We can easily use starting parameters from the parent only fit (only for illustration)</span> <span class='va'>fit.FOMC</span> <span class='op'>=</span> <span class='fu'>mkinfit</span><span class='op'>(</span><span class='st'>"FOMC"</span>, <span class='va'>FOCUS_2006_D</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span>, error_model <span class='op'>=</span> <span class='st'>"tc"</span><span class='op'>)</span> <span class='va'>fit.FOMC_SFO</span> <span class='op'><-</span> <span class='fu'>mkinfit</span><span class='op'>(</span><span class='va'>FOMC_SFO</span>, <span class='va'>FOCUS_D</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span>, diff --git a/docs/dev/reference/mkinmod.html b/docs/dev/reference/mkinmod.html index 9a7dac6f..413f0ae1 100644 --- a/docs/dev/reference/mkinmod.html +++ b/docs/dev/reference/mkinmod.html @@ -78,7 +78,7 @@ mkinmod." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -127,7 +127,7 @@ mkinmod." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -348,7 +348,7 @@ Evaluating and Calculating Degradation Kinetics in Environmental Media</p> parent <span class='op'>=</span> <span class='fu'>mkinsub</span><span class='op'>(</span><span class='st'>"SFO"</span>, <span class='st'>"m1"</span>, full_name <span class='op'>=</span> <span class='st'>"Test compound"</span><span class='op'>)</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>, 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> -</div><div class='output co'>#> <span class='message'>Copied DLL from /tmp/Rtmpy4eiQb/file554e573761a7.so to /home/jranke/.local/share/mkin/SFO_SFO.so</span></div><div class='input'><span class='co'># Now we can save the model and restore it in a new session</span> +</div><div class='output co'>#> <span class='message'>Copied DLL from /tmp/Rtmp92fCb2/file133ad522561845.so to /home/jranke/.local/share/mkin/SFO_SFO.so</span></div><div class='input'><span class='co'># Now we can save the model and restore it in a new session</span> <span class='fu'><a href='https://rdrr.io/r/base/readRDS.html'>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 class='co'># Terminate the R session here if you would like to check, and then do</span> <span class='kw'><a href='https://rdrr.io/r/base/library.html'>library</a></span><span class='op'>(</span><span class='va'><a href='https://pkgdown.jrwb.de/mkin/'>mkin</a></span><span class='op'>)</span> @@ -397,7 +397,7 @@ Evaluating and Calculating Degradation Kinetics in Environmental Media</p> #> }) #> return(predicted) #> } -#> <environment: 0x55555cac8d00></div><div class='input'> +#> <environment: 0x5555572517f8></div><div class='input'> <span class='co'># If we have several parallel metabolites</span> <span class='co'># (compare tests/testthat/test_synthetic_data_for_UBA_2014.R)</span> <span class='va'>m_synth_DFOP_par</span> <span class='op'><-</span> <span class='fu'>mkinmod</span><span class='op'>(</span> diff --git a/docs/dev/reference/mkinparplot-1.png b/docs/dev/reference/mkinparplot-1.png Binary files differindex dcf3e4b5..c9ed49eb 100644 --- a/docs/dev/reference/mkinparplot-1.png +++ b/docs/dev/reference/mkinparplot-1.png diff --git a/docs/dev/reference/mkinparplot.html b/docs/dev/reference/mkinparplot.html index 0a989ef9..bac6e71c 100644 --- a/docs/dev/reference/mkinparplot.html +++ b/docs/dev/reference/mkinparplot.html @@ -73,7 +73,7 @@ mkinfit." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ mkinfit." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -176,7 +176,8 @@ effect, namely to produce a plot.</p> phenol <span class='op'>=</span> <span class='fu'><a href='mkinmod.html'>mkinsub</a></span><span class='op'>(</span><span class='st'>"SFO"</span>, to <span class='op'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span><span class='op'>(</span><span class='st'>"anisole"</span><span class='op'>)</span><span class='op'>)</span>, anisole <span class='op'>=</span> <span class='fu'><a href='mkinmod.html'>mkinsub</a></span><span class='op'>(</span><span class='st'>"SFO"</span><span class='op'>)</span>, use_of_ff <span class='op'>=</span> <span class='st'>"max"</span><span class='op'>)</span> </div><div class='output co'>#> <span class='message'>Temporary DLL for differentials generated and loaded</span></div><div class='input'><span class='va'>fit</span> <span class='op'><-</span> <span class='fu'><a href='mkinfit.html'>mkinfit</a></span><span class='op'>(</span><span class='va'>model</span>, <span class='fu'><a href='https://rdrr.io/r/base/subset.html'>subset</a></span><span class='op'>(</span><span class='va'>mccall81_245T</span>, <span class='va'>soil</span> <span class='op'>==</span> <span class='st'>"Commerce"</span><span class='op'>)</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> -</div><div class='output co'>#> <span class='warning'>Warning: Observations with value of zero were removed from the data</span></div><div class='input'><span class='fu'>mkinparplot</span><span class='op'>(</span><span class='va'>fit</span><span class='op'>)</span> +</div><div class='output co'>#> <span class='warning'>Warning: Observations with value of zero were removed from the data</span></div><div class='output co'>#> <span class='warning'>Warning: Optimisation did not converge:</span> +#> <span class='warning'>false convergence (8)</span></div><div class='input'><span class='fu'>mkinparplot</span><span class='op'>(</span><span class='va'>fit</span><span class='op'>)</span> </div><div class='img'><img src='mkinparplot-1.png' alt='' width='700' height='433' /></div><div class='input'><span class='co'># }</span> </div></pre> </div> diff --git a/docs/dev/reference/mkinplot.html b/docs/dev/reference/mkinplot.html index 417c8c73..120bddb3 100644 --- a/docs/dev/reference/mkinplot.html +++ b/docs/dev/reference/mkinplot.html @@ -73,7 +73,7 @@ plot.mkinfit." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ plot.mkinfit." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/mkinpredict.html b/docs/dev/reference/mkinpredict.html index 3221fc23..1ebaecb5 100644 --- a/docs/dev/reference/mkinpredict.html +++ b/docs/dev/reference/mkinpredict.html @@ -74,7 +74,7 @@ kinetic parameters and initial values for the state variables." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -123,7 +123,7 @@ kinetic parameters and initial values for the state variables." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -408,10 +408,10 @@ as these always return mapped output.</p></td> 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 class='op'>}</span> </div><div class='output co'>#> test relative elapsed +#> 2 deSolve_compiled 1.0 0.005 #> 4 analytical 1.0 0.005 -#> 2 deSolve_compiled 1.2 0.006 -#> 1 eigen 4.0 0.020 -#> 3 deSolve 44.2 0.221</div><div class='input'> +#> 1 eigen 4.4 0.022 +#> 3 deSolve 46.8 0.234</div><div class='input'> <span class='co'># \dontrun{</span> <span class='co'># Predict from a fitted model</span> <span class='va'>f</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='va'>FOCUS_2006_C</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> diff --git a/docs/dev/reference/mkinresplot.html b/docs/dev/reference/mkinresplot.html index 2e10d5f6..30377f2c 100644 --- a/docs/dev/reference/mkinresplot.html +++ b/docs/dev/reference/mkinresplot.html @@ -75,7 +75,7 @@ argument show_residuals = TRUE." /> </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.0.1.9000</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> diff --git a/docs/dev/reference/mmkin.html b/docs/dev/reference/mmkin.html index 65c91adf..5da1b1de 100644 --- a/docs/dev/reference/mmkin.html +++ b/docs/dev/reference/mmkin.html @@ -75,7 +75,7 @@ datasets specified in its first two arguments." /> </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.0.1.9000</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -234,9 +234,9 @@ plotting.</p></div> <span class='va'>time_default</span> </div><div class='output co'>#> user system elapsed -#> 4.438 0.334 1.640 </div><div class='input'><span class='va'>time_1</span> +#> 4.921 0.475 1.707 </div><div class='input'><span class='va'>time_1</span> </div><div class='output co'>#> user system elapsed -#> 5.535 0.004 5.539 </div><div class='input'> +#> 5.680 0.003 5.684 </div><div class='input'> <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> </div><div class='output co'>#> $ff #> parent_M1 parent_sink M1_M2 M1_sink diff --git a/docs/dev/reference/nafta-1.png b/docs/dev/reference/nafta-1.png Binary files differindex 4d823d77..4f0d7833 100644 --- a/docs/dev/reference/nafta-1.png +++ b/docs/dev/reference/nafta-1.png diff --git a/docs/dev/reference/nafta.html b/docs/dev/reference/nafta.html index bbc8797d..6fb797a5 100644 --- a/docs/dev/reference/nafta.html +++ b/docs/dev/reference/nafta.html @@ -76,7 +76,7 @@ order of increasing model complexity, i.e. SFO, then IORE, and finally DFOP." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -125,7 +125,7 @@ order of increasing model complexity, i.e. SFO, then IORE, and finally DFOP." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/nlme-1.png b/docs/dev/reference/nlme-1.png Binary files differindex 193722c7..728cc557 100644 --- a/docs/dev/reference/nlme-1.png +++ b/docs/dev/reference/nlme-1.png diff --git a/docs/dev/reference/nlme-2.png b/docs/dev/reference/nlme-2.png Binary files differindex c0fb6dcf..e8167455 100644 --- a/docs/dev/reference/nlme-2.png +++ b/docs/dev/reference/nlme-2.png diff --git a/docs/dev/reference/nlme.html b/docs/dev/reference/nlme.html index b3e88428..b850eb3d 100644 --- a/docs/dev/reference/nlme.html +++ b/docs/dev/reference/nlme.html @@ -75,7 +75,7 @@ datasets. They are used internally by the nlme.mmkin() method." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -124,7 +124,7 @@ datasets. They are used internally by the nlme.mmkin() method." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -224,37 +224,37 @@ nlme for the case of a single grouping variable ds.</p> <span class='fu'><a href='https://rdrr.io/r/base/summary.html'>summary</a></span><span class='op'>(</span><span class='va'>m_nlme</span><span class='op'>)</span> </div><div class='output co'>#> Nonlinear mixed-effects model fit by maximum likelihood #> Model: value ~ nlme_f(name, time, parent_0, log_k_parent_sink) -#> Data: grouped_data +#> Data: grouped_data #> AIC BIC logLik -#> 252.7798 262.1358 -121.3899 +#> 300.6824 310.2426 -145.3412 #> #> Random effects: #> Formula: list(parent_0 ~ 1, log_k_parent_sink ~ 1) #> Level: ds #> Structure: Diagonal -#> parent_0 log_k_parent_sink Residual -#> StdDev: 0.0006768135 0.6800777 2.489397 +#> parent_0 log_k_parent_sink Residual +#> StdDev: 1.697361 0.6801209 3.666073 #> -#> Fixed effects: parent_0 + log_k_parent_sink ~ 1 -#> Value Std.Error DF t-value p-value -#> parent_0 101.74884 0.6456014 44 157.60321 0 -#> log_k_parent_sink -3.05575 0.4015811 44 -7.60929 0 +#> Fixed effects: parent_0 + log_k_parent_sink ~ 1 +#> Value Std.Error DF t-value p-value +#> parent_0 100.99378 1.3890416 46 72.70753 0 +#> log_k_parent_sink -3.07521 0.4018589 46 -7.65246 0 #> Correlation: #> prnt_0 -#> log_k_parent_sink 0.026 +#> log_k_parent_sink 0.027 #> #> Standardized Within-Group Residuals: #> Min Q1 Med Q3 Max -#> -2.1317488 -0.6878121 0.0828385 0.8592270 2.9529864 +#> -1.9942823 -0.5622565 0.1791579 0.7165038 2.0704781 #> -#> Number of Observations: 48 +#> Number of Observations: 50 #> Number of Groups: 3 </div><div class='input'><span class='fu'><a href='https://rdrr.io/r/graphics/plot.default.html'>plot</a></span><span class='op'>(</span><span class='fu'><a href='https://rdrr.io/pkg/nlme/man/augPred.html'>augPred</a></span><span class='op'>(</span><span class='va'>m_nlme</span>, level <span class='op'>=</span> <span class='fl'>0</span><span class='op'>:</span><span class='fl'>1</span><span class='op'>)</span>, layout <span class='op'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span><span class='op'>(</span><span class='fl'>3</span>, <span class='fl'>1</span><span class='op'>)</span><span class='op'>)</span> </div><div class='img'><img src='nlme-1.png' alt='' width='700' height='433' /></div><div class='input'><span class='co'># augPred does not work on fits with more than one state</span> <span class='co'># variable</span> <span class='co'>#</span> <span class='co'># The procedure is greatly simplified by the nlme.mmkin function</span> <span class='va'>f_nlme</span> <span class='op'><-</span> <span class='fu'><a href='https://rdrr.io/pkg/nlme/man/nlme.html'>nlme</a></span><span class='op'>(</span><span class='va'>f</span><span class='op'>)</span> -</div><div class='output co'>#> <span class='warning'>Warning: Iteration 1, LME step: nlminb() did not converge (code = 1). Do increase 'msMaxIter'!</span></div><div class='input'><span class='fu'><a href='https://rdrr.io/r/graphics/plot.default.html'>plot</a></span><span class='op'>(</span><span class='va'>f_nlme</span><span class='op'>)</span> +<span class='fu'><a href='https://rdrr.io/r/graphics/plot.default.html'>plot</a></span><span class='op'>(</span><span class='va'>f_nlme</span><span class='op'>)</span> </div><div class='img'><img src='nlme-2.png' alt='' width='700' height='433' /></div></pre> </div> <div class="col-md-3 hidden-xs hidden-sm" id="pkgdown-sidebar"> diff --git a/docs/dev/reference/nlme.mmkin.html b/docs/dev/reference/nlme.mmkin.html index 2649c111..925cf7cf 100644 --- a/docs/dev/reference/nlme.mmkin.html +++ b/docs/dev/reference/nlme.mmkin.html @@ -74,7 +74,7 @@ have been obtained by fitting the same model to a list of datasets." /> </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.0.1.9000</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -157,7 +157,7 @@ have been obtained by fitting the same model to a list of datasets.</p> data <span class='op'>=</span> <span class='st'>"auto"</span>, fixed <span class='op'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/lapply.html'>lapply</a></span><span class='op'>(</span><span class='fu'><a href='https://rdrr.io/r/base/list.html'>as.list</a></span><span class='op'>(</span><span class='fu'><a href='https://rdrr.io/r/base/names.html'>names</a></span><span class='op'>(</span><span class='fu'><a href='nlme_function.html'>mean_degparms</a></span><span class='op'>(</span><span class='va'>model</span><span class='op'>)</span><span class='op'>)</span><span class='op'>)</span>, <span class='kw'>function</span><span class='op'>(</span><span class='va'>el</span><span class='op'>)</span> <span class='fu'><a href='https://rdrr.io/r/base/eval.html'>eval</a></span><span class='op'>(</span><span class='fu'><a href='https://rdrr.io/r/base/parse.html'>parse</a></span><span class='op'>(</span>text <span class='op'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/paste.html'>paste</a></span><span class='op'>(</span><span class='va'>el</span>, <span class='fl'>1</span>, sep <span class='op'>=</span> <span class='st'>"~"</span><span class='op'>)</span><span class='op'>)</span><span class='op'>)</span><span class='op'>)</span>, - random <span class='op'>=</span> <span class='fu'>pdDiag</span><span class='op'>(</span><span class='va'>fixed</span><span class='op'>)</span>, + random <span class='op'>=</span> <span class='fu'><a href='https://rdrr.io/pkg/nlme/man/pdDiag.html'>pdDiag</a></span><span class='op'>(</span><span class='va'>fixed</span><span class='op'>)</span>, <span class='va'>groups</span>, start <span class='op'>=</span> <span class='fu'><a href='nlme_function.html'>mean_degparms</a></span><span class='op'>(</span><span class='va'>model</span>, random <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span>, correlation <span class='op'>=</span> <span class='cn'>NULL</span>, diff --git a/docs/dev/reference/nobs.mkinfit.html b/docs/dev/reference/nobs.mkinfit.html index 621eb622..0b6c963c 100644 --- a/docs/dev/reference/nobs.mkinfit.html +++ b/docs/dev/reference/nobs.mkinfit.html @@ -72,7 +72,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -121,7 +121,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/parms.html b/docs/dev/reference/parms.html index ba0e89bb..9f6f4225 100644 --- a/docs/dev/reference/parms.html +++ b/docs/dev/reference/parms.html @@ -74,7 +74,7 @@ considering the error structure that was assumed for the fit." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -123,7 +123,7 @@ considering the error structure that was assumed for the fit." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -219,10 +219,10 @@ such matrices is returned.</p> #> #> $DFOP #> Dataset 7 -#> parent_0 91.058971597 +#> parent_0 91.058971589 #> k1 0.044946770 #> k2 0.002868336 -#> g 0.526942414 +#> g 0.526942415 #> sigma 2.221302196 #> </div><div class='input'><span class='fu'>parms</span><span class='op'>(</span><span class='va'>fits</span><span class='op'>)</span> </div><div class='output co'>#> $SFO @@ -233,17 +233,17 @@ such matrices is returned.</p> #> #> $FOMC #> Dataset 6 Dataset 7 Dataset 8 Dataset 9 Dataset 10 -#> parent_0 95.558575 92.6837649 90.719787 98.383939 94.8481458 +#> parent_0 95.558575 92.6837649 90.719787 98.383939 94.8481459 #> alpha 1.338667 0.4967832 1.639099 1.074460 0.2805272 #> beta 13.033315 14.1451255 5.007077 4.397126 6.9052224 #> sigma 1.847671 1.9167519 1.066063 3.146056 1.6222778 #> #> $DFOP #> Dataset 6 Dataset 7 Dataset 8 Dataset 9 Dataset 10 -#> parent_0 96.55213663 91.058971597 90.34509493 98.14858820 94.311323733 +#> parent_0 96.55213663 91.058971589 90.34509493 98.14858820 94.311323734 #> k1 0.21954588 0.044946770 0.41232288 0.31697588 0.080663857 #> k2 0.02957934 0.002868336 0.07581766 0.03260384 0.003425417 -#> g 0.44845068 0.526942414 0.66091967 0.65322767 0.342652880 +#> g 0.44845068 0.526942415 0.66091967 0.65322767 0.342652880 #> sigma 1.35690468 2.221302196 1.34169076 2.87159846 1.942067831 #> </div><div class='input'><span class='fu'>parms</span><span class='op'>(</span><span class='va'>fits</span>, transformed <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> </div><div class='output co'>#> $SFO diff --git a/docs/dev/reference/plot.mixed.mmkin.html b/docs/dev/reference/plot.mixed.mmkin.html index ef169074..630e95a3 100644 --- a/docs/dev/reference/plot.mixed.mmkin.html +++ b/docs/dev/reference/plot.mixed.mmkin.html @@ -72,7 +72,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.0.2.9000</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -283,10 +283,10 @@ corresponding model prediction lines for the different datasets.</p></td> </div><div class='img'><img src='plot.mixed.mmkin-2.png' alt='' width='700' height='433' /></div><div class='input'> <span class='va'>f_saem</span> <span class='op'><-</span> <span class='fu'><a href='saem.html'>saem</a></span><span class='op'>(</span><span class='va'>f</span>, transformations <span class='op'>=</span> <span class='st'>"saemix"</span><span class='op'>)</span> </div><div class='output co'>#> Running main SAEM algorithm -#> [1] "Sat Feb 13 12:33:07 2021" +#> [1] "Mon Feb 15 17:12:17 2021" #> .... #> Minimisation finished -#> [1] "Sat Feb 13 12:33:13 2021"</div><div class='input'><span class='fu'><a href='https://rdrr.io/r/graphics/plot.default.html'>plot</a></span><span class='op'>(</span><span class='va'>f_saem</span><span class='op'>)</span> +#> [1] "Mon Feb 15 17:12:24 2021"</div><div class='input'><span class='fu'><a href='https://rdrr.io/r/graphics/plot.default.html'>plot</a></span><span class='op'>(</span><span class='va'>f_saem</span><span class='op'>)</span> </div><div class='img'><img src='plot.mixed.mmkin-3.png' alt='' width='700' height='433' /></div><div class='input'> <span class='co'># We can overlay the two variants if we generate predictions</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>, diff --git a/docs/dev/reference/plot.mkinfit-2.png b/docs/dev/reference/plot.mkinfit-2.png Binary files differindex 376c812f..a11d1680 100644 --- a/docs/dev/reference/plot.mkinfit-2.png +++ b/docs/dev/reference/plot.mkinfit-2.png diff --git a/docs/dev/reference/plot.mkinfit-5.png b/docs/dev/reference/plot.mkinfit-5.png Binary files differindex bc44de88..6631aa68 100644 --- a/docs/dev/reference/plot.mkinfit-5.png +++ b/docs/dev/reference/plot.mkinfit-5.png diff --git a/docs/dev/reference/plot.mkinfit-6.png b/docs/dev/reference/plot.mkinfit-6.png Binary files differindex eb8cbd92..946b20c5 100644 --- a/docs/dev/reference/plot.mkinfit-6.png +++ b/docs/dev/reference/plot.mkinfit-6.png diff --git a/docs/dev/reference/plot.mkinfit-7.png b/docs/dev/reference/plot.mkinfit-7.png Binary files differindex 92a664f4..10807ea8 100644 --- a/docs/dev/reference/plot.mkinfit-7.png +++ b/docs/dev/reference/plot.mkinfit-7.png diff --git a/docs/dev/reference/plot.mkinfit.html b/docs/dev/reference/plot.mkinfit.html index c5bfb528..c5249ecd 100644 --- a/docs/dev/reference/plot.mkinfit.html +++ b/docs/dev/reference/plot.mkinfit.html @@ -74,7 +74,7 @@ observed data together with the solution of the fitted model." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> diff --git a/docs/dev/reference/plot.mmkin-1.png b/docs/dev/reference/plot.mmkin-1.png Binary files differindex f12b7907..647dfb8a 100644 --- a/docs/dev/reference/plot.mmkin-1.png +++ b/docs/dev/reference/plot.mmkin-1.png diff --git a/docs/dev/reference/plot.mmkin-2.png b/docs/dev/reference/plot.mmkin-2.png Binary files differindex e3127554..1bc1c9db 100644 --- a/docs/dev/reference/plot.mmkin-2.png +++ b/docs/dev/reference/plot.mmkin-2.png diff --git a/docs/dev/reference/plot.mmkin-3.png b/docs/dev/reference/plot.mmkin-3.png Binary files differindex 5448976e..50d6ffac 100644 --- a/docs/dev/reference/plot.mmkin-3.png +++ b/docs/dev/reference/plot.mmkin-3.png diff --git a/docs/dev/reference/plot.mmkin-4.png b/docs/dev/reference/plot.mmkin-4.png Binary files differindex 9a25fc50..e049fa16 100644 --- a/docs/dev/reference/plot.mmkin-4.png +++ b/docs/dev/reference/plot.mmkin-4.png diff --git a/docs/dev/reference/plot.mmkin-5.png b/docs/dev/reference/plot.mmkin-5.png Binary files differindex 82b422b5..2421995b 100644 --- a/docs/dev/reference/plot.mmkin-5.png +++ b/docs/dev/reference/plot.mmkin-5.png diff --git a/docs/dev/reference/plot.mmkin.html b/docs/dev/reference/plot.mmkin.html index ee80c6e4..9ca0df94 100644 --- a/docs/dev/reference/plot.mmkin.html +++ b/docs/dev/reference/plot.mmkin.html @@ -76,7 +76,7 @@ the fit of at least one model to the same dataset is shown." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> diff --git a/docs/dev/reference/plot.nafta.html b/docs/dev/reference/plot.nafta.html index 9fc59f94..c24fba99 100644 --- a/docs/dev/reference/plot.nafta.html +++ b/docs/dev/reference/plot.nafta.html @@ -73,7 +73,7 @@ function (SFO, then IORE, then DFOP)." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ function (SFO, then IORE, then DFOP)." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/reexports.html b/docs/dev/reference/reexports.html index f12a2690..371567d8 100644 --- a/docs/dev/reference/reexports.html +++ b/docs/dev/reference/reexports.html @@ -79,7 +79,7 @@ below to see their documentation. </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -128,7 +128,7 @@ below to see their documentation. <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> diff --git a/docs/dev/reference/residuals.mkinfit.html b/docs/dev/reference/residuals.mkinfit.html index 95114dae..3f518ab7 100644 --- a/docs/dev/reference/residuals.mkinfit.html +++ b/docs/dev/reference/residuals.mkinfit.html @@ -72,7 +72,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -121,7 +121,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -175,7 +175,7 @@ standard deviation obtained from the fitted error model?</p></td> </div><div class='output co'>#> [1] 0.09726374 -0.13912142 -0.15351210 0.73388322 -0.08657004 -0.93204702 #> [7] -0.03269080 1.45347823 -0.88423697</div><div class='input'><span class='fu'><a href='https://rdrr.io/r/stats/residuals.html'>residuals</a></span><span class='op'>(</span><span class='va'>f</span>, standardized <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> </div><div class='output co'>#> [1] 0.13969917 -0.19981904 -0.22048826 1.05407091 -0.12433989 -1.33869208 -#> [7] -0.04695354 2.08761977 -1.27002287</div></pre> +#> [7] -0.04695355 2.08761977 -1.27002287</div></pre> </div> <div class="col-md-3 hidden-xs hidden-sm" id="pkgdown-sidebar"> <nav id="toc" data-toggle="toc" class="sticky-top"> diff --git a/docs/dev/reference/saem.html b/docs/dev/reference/saem.html index 02483bec..bdb1226e 100644 --- a/docs/dev/reference/saem.html +++ b/docs/dev/reference/saem.html @@ -74,7 +74,7 @@ Expectation Maximisation algorithm (SAEM)." /> </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.0.2.9000</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -261,27 +261,27 @@ using <a href='mmkin.html'>mmkin</a>.</p> state.ini <span class='op'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span><span class='op'>(</span>parent <span class='op'>=</span> <span class='fl'>100</span><span class='op'>)</span>, fixed_initials <span class='op'>=</span> <span class='st'>"parent"</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> <span class='va'>f_saem_p0_fixed</span> <span class='op'><-</span> <span class='fu'>saem</span><span class='op'>(</span><span class='va'>f_mmkin_parent_p0_fixed</span><span class='op'>)</span> </div><div class='output co'>#> Running main SAEM algorithm -#> [1] "Sat Feb 13 12:33:16 2021" +#> [1] "Mon Feb 15 17:12:32 2021" #> .... #> Minimisation finished -#> [1] "Sat Feb 13 12:33:18 2021"</div><div class='input'> +#> [1] "Mon Feb 15 17:12:34 2021"</div><div class='input'> <span class='va'>f_mmkin_parent</span> <span class='op'><-</span> <span class='fu'><a href='mmkin.html'>mmkin</a></span><span class='op'>(</span><span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span><span class='op'>(</span><span class='st'>"SFO"</span>, <span class='st'>"FOMC"</span>, <span class='st'>"DFOP"</span><span class='op'>)</span>, <span class='va'>ds</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> <span class='va'>f_saem_sfo</span> <span class='op'><-</span> <span class='fu'>saem</span><span class='op'>(</span><span class='va'>f_mmkin_parent</span><span class='op'>[</span><span class='st'>"SFO"</span>, <span class='op'>]</span><span class='op'>)</span> </div><div class='output co'>#> Running main SAEM algorithm -#> [1] "Sat Feb 13 12:33:19 2021" +#> [1] "Mon Feb 15 17:12:35 2021" #> .... #> Minimisation finished -#> [1] "Sat Feb 13 12:33:20 2021"</div><div class='input'><span class='va'>f_saem_fomc</span> <span class='op'><-</span> <span class='fu'>saem</span><span class='op'>(</span><span class='va'>f_mmkin_parent</span><span class='op'>[</span><span class='st'>"FOMC"</span>, <span class='op'>]</span><span class='op'>)</span> +#> [1] "Mon Feb 15 17:12:36 2021"</div><div class='input'><span class='va'>f_saem_fomc</span> <span class='op'><-</span> <span class='fu'>saem</span><span class='op'>(</span><span class='va'>f_mmkin_parent</span><span class='op'>[</span><span class='st'>"FOMC"</span>, <span class='op'>]</span><span class='op'>)</span> </div><div class='output co'>#> Running main SAEM algorithm -#> [1] "Sat Feb 13 12:33:20 2021" +#> [1] "Mon Feb 15 17:12:36 2021" #> .... #> Minimisation finished -#> [1] "Sat Feb 13 12:33:22 2021"</div><div class='input'><span class='va'>f_saem_dfop</span> <span class='op'><-</span> <span class='fu'>saem</span><span class='op'>(</span><span class='va'>f_mmkin_parent</span><span class='op'>[</span><span class='st'>"DFOP"</span>, <span class='op'>]</span><span class='op'>)</span> +#> [1] "Mon Feb 15 17:12:38 2021"</div><div class='input'><span class='va'>f_saem_dfop</span> <span class='op'><-</span> <span class='fu'>saem</span><span class='op'>(</span><span class='va'>f_mmkin_parent</span><span class='op'>[</span><span class='st'>"DFOP"</span>, <span class='op'>]</span><span class='op'>)</span> </div><div class='output co'>#> Running main SAEM algorithm -#> [1] "Sat Feb 13 12:33:23 2021" +#> [1] "Mon Feb 15 17:12:39 2021" #> .... #> Minimisation finished -#> [1] "Sat Feb 13 12:33:25 2021"</div><div class='input'> +#> [1] "Mon Feb 15 17:12:42 2021"</div><div class='input'> <span class='co'># The returned saem.mmkin object contains an SaemixObject, therefore we can use</span> <span class='co'># functions from saemix</span> <span class='kw'><a href='https://rdrr.io/r/base/library.html'>library</a></span><span class='op'>(</span><span class='va'>saemix</span><span class='op'>)</span> @@ -324,10 +324,10 @@ using <a href='mmkin.html'>mmkin</a>.</p> <span class='va'>f_mmkin_parent_tc</span> <span class='op'><-</span> <span class='fu'><a href='https://rdrr.io/r/stats/update.html'>update</a></span><span class='op'>(</span><span class='va'>f_mmkin_parent</span>, error_model <span class='op'>=</span> <span class='st'>"tc"</span><span class='op'>)</span> <span class='va'>f_saem_fomc_tc</span> <span class='op'><-</span> <span class='fu'>saem</span><span class='op'>(</span><span class='va'>f_mmkin_parent_tc</span><span class='op'>[</span><span class='st'>"FOMC"</span>, <span class='op'>]</span><span class='op'>)</span> </div><div class='output co'>#> Running main SAEM algorithm -#> [1] "Sat Feb 13 12:33:28 2021" +#> [1] "Mon Feb 15 17:12:44 2021" #> .... #> Minimisation finished -#> [1] "Sat Feb 13 12:33:32 2021"</div><div class='input'><span class='fu'><a href='https://rdrr.io/pkg/saemix/man/compare.saemix.html'>compare.saemix</a></span><span class='op'>(</span><span class='fu'><a href='https://rdrr.io/r/base/list.html'>list</a></span><span class='op'>(</span><span class='va'>f_saem_fomc</span><span class='op'>$</span><span class='va'>so</span>, <span class='va'>f_saem_fomc_tc</span><span class='op'>$</span><span class='va'>so</span><span class='op'>)</span><span class='op'>)</span> +#> [1] "Mon Feb 15 17:12:49 2021"</div><div class='input'><span class='fu'><a href='https://rdrr.io/pkg/saemix/man/compare.saemix.html'>compare.saemix</a></span><span class='op'>(</span><span class='fu'><a href='https://rdrr.io/r/base/list.html'>list</a></span><span class='op'>(</span><span class='va'>f_saem_fomc</span><span class='op'>$</span><span class='va'>so</span>, <span class='va'>f_saem_fomc_tc</span><span class='op'>$</span><span class='va'>so</span><span class='op'>)</span><span class='op'>)</span> </div><div class='output co'>#> <span class='error'>Error in compare.saemix(list(f_saem_fomc$so, f_saem_fomc_tc$so)): 'compare.saemix' requires at least two models.</span></div><div class='input'> <span class='va'>sfo_sfo</span> <span class='op'><-</span> <span class='fu'><a href='mkinmod.html'>mkinmod</a></span><span class='op'>(</span>parent <span class='op'>=</span> <span class='fu'><a href='mkinmod.html'>mkinsub</a></span><span class='op'>(</span><span class='st'>"SFO"</span>, <span class='st'>"A1"</span><span class='op'>)</span>, A1 <span class='op'>=</span> <span class='fu'><a href='mkinmod.html'>mkinsub</a></span><span class='op'>(</span><span class='st'>"SFO"</span><span class='op'>)</span><span class='op'>)</span> @@ -346,15 +346,15 @@ using <a href='mmkin.html'>mmkin</a>.</p> <span class='co'># four minutes</span> <span class='va'>f_saem_sfo_sfo</span> <span class='op'><-</span> <span class='fu'>saem</span><span class='op'>(</span><span class='va'>f_mmkin</span><span class='op'>[</span><span class='st'>"SFO-SFO"</span>, <span class='op'>]</span><span class='op'>)</span> </div><div class='output co'>#> Running main SAEM algorithm -#> [1] "Sat Feb 13 12:33:35 2021" +#> [1] "Mon Feb 15 17:12:51 2021" #> .... #> Minimisation finished -#> [1] "Sat Feb 13 12:33:39 2021"</div><div class='input'><span class='va'>f_saem_dfop_sfo</span> <span class='op'><-</span> <span class='fu'>saem</span><span class='op'>(</span><span class='va'>f_mmkin</span><span class='op'>[</span><span class='st'>"DFOP-SFO"</span>, <span class='op'>]</span><span class='op'>)</span> +#> [1] "Mon Feb 15 17:12:56 2021"</div><div class='input'><span class='va'>f_saem_dfop_sfo</span> <span class='op'><-</span> <span class='fu'>saem</span><span class='op'>(</span><span class='va'>f_mmkin</span><span class='op'>[</span><span class='st'>"DFOP-SFO"</span>, <span class='op'>]</span><span class='op'>)</span> </div><div class='output co'>#> Running main SAEM algorithm -#> [1] "Sat Feb 13 12:33:40 2021" +#> [1] "Mon Feb 15 17:12:56 2021" #> .... #> Minimisation finished -#> [1] "Sat Feb 13 12:33:48 2021"</div><div class='input'><span class='co'># We can use print, plot and summary methods to check the results</span> +#> [1] "Mon Feb 15 17:13:05 2021"</div><div class='input'><span class='co'># We can use print, plot and summary methods to check the results</span> <span class='fu'><a href='https://rdrr.io/r/base/print.html'>print</a></span><span class='op'>(</span><span class='va'>f_saem_dfop_sfo</span><span class='op'>)</span> </div><div class='output co'>#> Kinetic nonlinear mixed-effects model fit by SAEM #> Structural model: @@ -395,10 +395,10 @@ using <a href='mmkin.html'>mmkin</a>.</p> #> SD.g_qlogis 0.44771 -0.86417 1.7596</div><div class='input'><span class='fu'><a href='https://rdrr.io/pkg/saemix/man/plot-SaemixObject-method.html'>plot</a></span><span class='op'>(</span><span class='va'>f_saem_dfop_sfo</span><span class='op'>)</span> </div><div class='img'><img src='saem-5.png' alt='' width='700' height='433' /></div><div class='input'><span class='fu'><a href='https://rdrr.io/pkg/saemix/man/summary-methods.html'>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> </div><div class='output co'>#> saemix version used for fitting: 3.1.9000 -#> mkin version used for pre-fitting: 1.0.2.9000 +#> mkin version used for pre-fitting: 1.0.3.9000 #> R version used for fitting: 4.0.3 -#> Date of fit: Sat Feb 13 12:33:48 2021 -#> Date of summary: Sat Feb 13 12:33:48 2021 +#> Date of fit: Mon Feb 15 17:13:05 2021 +#> Date of summary: Mon Feb 15 17:13:06 2021 #> #> Equations: #> d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -413,7 +413,7 @@ using <a href='mmkin.html'>mmkin</a>.</p> #> #> Model predictions using solution type analytical #> -#> Fitted in 8.875 s using 300, 100 iterations +#> Fitted in 8.985 s using 300, 100 iterations #> #> Variance model: Constant variance #> diff --git a/docs/dev/reference/schaefer07_complex_case-1.png b/docs/dev/reference/schaefer07_complex_case-1.png Binary files differindex 16e657dd..96aab2dc 100644 --- a/docs/dev/reference/schaefer07_complex_case-1.png +++ b/docs/dev/reference/schaefer07_complex_case-1.png diff --git a/docs/dev/reference/schaefer07_complex_case.html b/docs/dev/reference/schaefer07_complex_case.html index 83555b99..4ccad5c4 100644 --- a/docs/dev/reference/schaefer07_complex_case.html +++ b/docs/dev/reference/schaefer07_complex_case.html @@ -74,7 +74,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -123,7 +123,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -186,15 +186,15 @@ </div><div class='img'><img src='schaefer07_complex_case-1.png' alt='' width='700' height='433' /></div><div class='input'> <span class='fu'><a href='endpoints.html'>endpoints</a></span><span class='op'>(</span><span class='va'>fit</span><span class='op'>)</span> </div><div class='output co'>#> $ff #> parent_A1 parent_B1 parent_C1 parent_sink A1_A2 A1_sink -#> 0.3809620 0.1954665 0.4235715 0.0000000 0.4479662 0.5520338 +#> 0.3809620 0.1954667 0.4235713 0.0000000 0.4479619 0.5520381 #> #> $distimes #> DT50 DT90 #> parent 13.95078 46.34350 -#> A1 49.75343 165.27731 -#> B1 37.26912 123.80533 -#> C1 11.23131 37.30959 -#> A2 28.50569 94.69386 +#> A1 49.75342 165.27728 +#> B1 37.26908 123.80520 +#> C1 11.23131 37.30961 +#> A2 28.50624 94.69567 #> </div><div class='input'> <span class='co'># }</span> <span class='co'># Compare with the results obtained in the original publication</span> <span class='fu'><a href='https://rdrr.io/r/base/print.html'>print</a></span><span class='op'>(</span><span class='va'>schaefer07_complex_results</span><span class='op'>)</span> diff --git a/docs/dev/reference/sigma_twocomp-1.png b/docs/dev/reference/sigma_twocomp-1.png Binary files differindex 21db3145..6e61684e 100644 --- a/docs/dev/reference/sigma_twocomp-1.png +++ b/docs/dev/reference/sigma_twocomp-1.png diff --git a/docs/dev/reference/sigma_twocomp.html b/docs/dev/reference/sigma_twocomp.html index 8212e480..b7d295b2 100644 --- a/docs/dev/reference/sigma_twocomp.html +++ b/docs/dev/reference/sigma_twocomp.html @@ -73,7 +73,7 @@ dependence of the measured value \(y\):" /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ dependence of the measured value \(y\):" /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -188,6 +188,10 @@ Additive, Multiplicative, and Mixed Analytical Errors. Clinical Chemistry 24(11), 1895-1898.</p> <p>Rocke, David M. and Lorenzato, Stefan (1995) A two-component model for measurement error in analytical chemistry. Technometrics 37(2), 176-184.</p> +<p>Ranke J and Meinecke S (2019) Error Models for the Kinetic Evaluation of Chemical +Degradation Data. <em>Environments</em> 6(12) 124 +doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6120124</a> +.</p> <h2 class="hasAnchor" id="examples"><a class="anchor" href="#examples"></a>Examples</h2> <pre class="examples"><div class='input'><span class='va'>times</span> <span class='op'><-</span> <span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span><span class='op'>(</span><span class='fl'>0</span>, <span class='fl'>1</span>, <span class='fl'>3</span>, <span class='fl'>7</span>, <span class='fl'>14</span>, <span class='fl'>28</span>, <span class='fl'>60</span>, <span class='fl'>90</span>, <span class='fl'>120</span><span class='op'>)</span> diff --git a/docs/dev/reference/summary.mkinfit.html b/docs/dev/reference/summary.mkinfit.html index f314dfa8..494731e9 100644 --- a/docs/dev/reference/summary.mkinfit.html +++ b/docs/dev/reference/summary.mkinfit.html @@ -76,7 +76,7 @@ values." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -125,7 +125,7 @@ values." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -236,17 +236,17 @@ EC Document Reference Sanco/10058/2005 version 2.0, 434 pp, <h2 class="hasAnchor" id="examples"><a class="anchor" href="#examples"></a>Examples</h2> <pre class="examples"><div class='input'> <span class='fu'><a href='https://rdrr.io/pkg/saemix/man/summary-methods.html'>summary</a></span><span class='op'>(</span><span class='fu'><a href='mkinfit.html'>mkinfit</a></span><span class='op'>(</span><span class='fu'><a href='mkinmod.html'>mkinmod</a></span><span class='op'>(</span>parent <span class='op'>=</span> <span class='fu'><a href='mkinmod.html'>mkinsub</a></span><span class='op'>(</span><span class='st'>"SFO"</span><span class='op'>)</span><span class='op'>)</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> -</div><div class='output co'>#> mkin version used for fitting: 0.9.50.4 +</div><div class='output co'>#> mkin version used for fitting: 1.0.3.9000 #> R version used for fitting: 4.0.3 -#> Date of fit: Mon Nov 30 16:01:20 2020 -#> Date of summary: Mon Nov 30 16:01:20 2020 +#> Date of fit: Mon Feb 15 17:13:09 2021 +#> Date of summary: Mon Feb 15 17:13:09 2021 #> #> Equations: #> d_parent/dt = - k_parent * parent #> #> Model predictions using solution type analytical #> -#> Fitted using 131 model solutions performed in 0.028 s +#> Fitted using 131 model solutions performed in 0.027 s #> #> Error model: Constant variance #> diff --git a/docs/dev/reference/summary.nlme.mmkin.html b/docs/dev/reference/summary.nlme.mmkin.html index 2aeadc46..b2f6624a 100644 --- a/docs/dev/reference/summary.nlme.mmkin.html +++ b/docs/dev/reference/summary.nlme.mmkin.html @@ -76,7 +76,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -125,7 +125,7 @@ endpoints such as formation fractions and DT50 values. Optionally <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -263,12 +263,12 @@ José Pinheiro and Douglas Bates for the components inherited from nlme</p> <span class='va'>f_mmkin</span> <span class='op'><-</span> <span class='fu'><a href='mmkin.html'>mmkin</a></span><span class='op'>(</span><span class='st'>"SFO"</span>, <span class='va'>ds_sfo_syn</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span>, error_model <span class='op'>=</span> <span class='st'>"tc"</span>, cores <span class='op'>=</span> <span class='fl'>1</span><span class='op'>)</span> </div><div class='output co'>#> <span class='warning'>Warning: Optimisation did not converge:</span> #> <span class='warning'>iteration limit reached without convergence (10)</span></div><div class='input'><span class='va'>f_nlme</span> <span class='op'><-</span> <span class='fu'><a href='https://rdrr.io/pkg/nlme/man/nlme.html'>nlme</a></span><span class='op'>(</span><span class='va'>f_mmkin</span><span class='op'>)</span> -</div><div class='output co'>#> <span class='warning'>Warning: Iteration 1, LME step: nlminb() did not converge (code = 1). Do increase 'msMaxIter'!</span></div><div class='input'><span class='fu'><a href='https://rdrr.io/pkg/saemix/man/summary-methods.html'>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> -</div><div class='output co'>#> nlme version used for fitting: 3.1.150.1 -#> mkin version used for pre-fitting: 0.9.50.4 +</div><div class='output co'>#> <span class='warning'>Warning: Iteration 4, LME step: nlminb() did not converge (code = 1). PORT message: false convergence (8)</span></div><div class='input'><span class='fu'><a href='https://rdrr.io/pkg/saemix/man/summary-methods.html'>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> +</div><div class='output co'>#> nlme version used for fitting: 3.1.152 +#> mkin version used for pre-fitting: 1.0.3.9000 #> R version used for fitting: 4.0.3 -#> Date of fit: Mon Nov 30 16:01:23 2020 -#> Date of summary: Mon Nov 30 16:01:23 2020 +#> Date of fit: Mon Feb 15 17:13:12 2021 +#> Date of summary: Mon Feb 15 17:13:12 2021 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -278,148 +278,146 @@ José Pinheiro and Douglas Bates for the components inherited from nlme</p> #> #> Model predictions using solution type analytical #> -#> Fitted in 0.996 s using 6 iterations +#> Fitted in 0.544 s using 4 iterations #> #> Variance model: Two-component variance function #> #> Mean of starting values for individual parameters: #> parent_0 log_k_parent -#> 101.568773 -4.454103 +#> 101.569 -4.454 #> #> Fixed degradation parameter values: #> None #> #> Results: #> -#> AIC BIC logLik -#> 586.4159 603.9145 -286.2079 +#> AIC BIC logLik +#> 584.5 599.5 -286.2 #> #> Optimised, transformed parameters with symmetric confidence intervals: #> lower est. upper -#> parent_0 99.360 101.593 103.825 -#> log_k_parent -4.979 -4.451 -3.924 +#> parent_0 99.371 101.592 103.814 +#> log_k_parent -4.973 -4.449 -3.926 #> #> Correlation: #> prnt_0 -#> log_k_parent 0.155 +#> log_k_parent 0.051 #> #> Random effects: #> Formula: list(parent_0 ~ 1, log_k_parent ~ 1) #> Level: ds -#> Structure: General positive-definite, Log-Cholesky parametrization -#> StdDev Corr -#> parent_0 0.2624248 prnt_0 -#> log_k_parent 0.5907146 0.999 -#> Residual 1.0000000 +#> Structure: Diagonal +#> parent_0 log_k_parent Residual +#> StdDev: 6.924e-05 0.5863 1 #> #> Variance function: #> Structure: Constant plus proportion of variance covariate #> Formula: ~fitted(.) #> Parameter estimates: -#> const prop -#> 6.56706e-24 7.89583e-02 +#> const prop +#> 0.0001208853 0.0789968036 #> #> Backtransformed parameters with asymmetric confidence intervals: #> lower est. upper -#> parent_0 99.360213 101.59280 103.82539 -#> k_parent 0.006883 0.01166 0.01976 +#> parent_0 99.370882 101.59243 103.81398 +#> k_parent 0.006923 0.01168 0.01972 #> #> Estimated disappearance times: #> DT50 DT90 -#> parent 59.44 197.4 +#> parent 59.32 197.1 #> #> Data: #> ds name time observed predicted residual std standardized -#> ds 1 parent 0 104.1 101.417 2.68283 8.0077 0.335030 -#> ds 1 parent 0 105.0 101.417 3.58283 8.0077 0.447422 -#> ds 1 parent 1 98.5 100.624 -2.12400 7.9451 -0.267334 -#> ds 1 parent 1 96.1 100.624 -4.52400 7.9451 -0.569407 -#> ds 1 parent 3 101.9 99.056 2.84379 7.8213 0.363595 -#> ds 1 parent 3 85.2 99.056 -13.85621 7.8213 -1.771597 -#> ds 1 parent 7 99.1 95.994 3.10646 7.5795 0.409850 -#> ds 1 parent 7 93.0 95.994 -2.99354 7.5795 -0.394953 -#> ds 1 parent 14 88.1 90.860 -2.75997 7.1741 -0.384710 -#> ds 1 parent 14 84.1 90.860 -6.75997 7.1741 -0.942268 -#> ds 1 parent 28 80.2 81.402 -1.20174 6.4273 -0.186973 -#> ds 1 parent 28 91.3 81.402 9.89826 6.4273 1.540024 -#> ds 1 parent 60 65.1 63.316 1.78361 4.9994 0.356767 -#> ds 1 parent 60 65.8 63.316 2.48361 4.9994 0.496785 -#> ds 1 parent 90 47.8 50.029 -2.22862 3.9502 -0.564182 -#> ds 1 parent 90 53.5 50.029 3.47138 3.9502 0.878792 -#> ds 1 parent 120 37.6 39.529 -1.92946 3.1212 -0.618182 -#> ds 1 parent 120 39.3 39.529 -0.22946 3.1212 -0.073516 -#> ds 2 parent 0 107.9 101.711 6.18875 8.0309 0.770613 -#> ds 2 parent 0 102.1 101.711 0.38875 8.0309 0.048406 -#> ds 2 parent 1 103.8 100.174 3.62597 7.9096 0.458428 -#> ds 2 parent 1 108.6 100.174 8.42597 7.9096 1.065287 -#> ds 2 parent 3 91.0 97.169 -6.16895 7.6723 -0.804055 -#> ds 2 parent 3 84.9 97.169 -12.26895 7.6723 -1.599124 -#> ds 2 parent 7 79.3 91.427 -12.12652 7.2189 -1.679833 -#> ds 2 parent 7 100.9 91.427 9.47348 7.2189 1.312320 -#> ds 2 parent 14 77.3 82.182 -4.88174 6.4889 -0.752318 -#> ds 2 parent 14 83.5 82.182 1.31826 6.4889 0.203155 -#> ds 2 parent 28 66.8 66.402 0.39792 5.2430 0.075895 -#> ds 2 parent 28 63.3 66.402 -3.10208 5.2430 -0.591662 -#> ds 2 parent 60 40.8 40.789 0.01138 3.2206 0.003532 -#> ds 2 parent 60 44.8 40.789 4.01138 3.2206 1.245537 -#> ds 2 parent 90 27.8 25.830 1.97002 2.0395 0.965937 -#> ds 2 parent 90 27.0 25.830 1.17002 2.0395 0.573682 -#> ds 2 parent 120 15.2 16.357 -1.15721 1.2915 -0.895991 -#> ds 2 parent 120 15.5 16.357 -0.85721 1.2915 -0.663710 -#> ds 3 parent 0 97.7 101.907 -4.20726 8.0464 -0.522873 -#> ds 3 parent 0 88.2 101.907 -13.70726 8.0464 -1.703521 -#> ds 3 parent 1 109.9 99.522 10.37805 7.8581 1.320685 -#> ds 3 parent 1 97.8 99.522 -1.72195 7.8581 -0.219130 -#> ds 3 parent 3 100.5 94.918 5.58248 7.4945 0.744875 -#> ds 3 parent 3 77.4 94.918 -17.51752 7.4945 -2.337375 -#> ds 3 parent 7 78.3 86.338 -8.03788 6.8171 -1.179077 -#> ds 3 parent 7 90.3 86.338 3.96212 6.8171 0.581204 -#> ds 3 parent 14 76.0 73.147 2.85281 5.7756 0.493944 -#> ds 3 parent 14 79.1 73.147 5.95281 5.7756 1.030687 -#> ds 3 parent 28 46.0 52.504 -6.50373 4.1456 -1.568826 -#> ds 3 parent 28 53.4 52.504 0.89627 4.1456 0.216197 -#> ds 3 parent 60 25.1 24.605 0.49461 1.9428 0.254586 -#> ds 3 parent 60 21.4 24.605 -3.20539 1.9428 -1.649882 -#> ds 3 parent 90 11.0 12.090 -1.09046 0.9546 -1.142271 -#> ds 3 parent 90 14.2 12.090 2.10954 0.9546 2.209770 -#> ds 3 parent 120 5.8 5.941 -0.14094 0.4691 -0.300464 -#> ds 3 parent 120 6.1 5.941 0.15906 0.4691 0.339077 -#> ds 4 parent 0 95.3 101.177 -5.87672 7.9887 -0.735625 -#> ds 4 parent 0 102.0 101.177 0.82328 7.9887 0.103056 -#> ds 4 parent 1 104.4 100.716 3.68438 7.9523 0.463307 -#> ds 4 parent 1 105.4 100.716 4.68438 7.9523 0.589057 -#> ds 4 parent 3 113.7 99.800 13.90026 7.8800 1.763989 -#> ds 4 parent 3 82.3 99.800 -17.49974 7.8800 -2.220774 -#> ds 4 parent 7 98.1 97.993 0.10713 7.7374 0.013846 -#> ds 4 parent 7 87.8 97.993 -10.19287 7.7374 -1.317359 -#> ds 4 parent 14 97.9 94.909 2.99079 7.4939 0.399098 -#> ds 4 parent 14 104.8 94.909 9.89079 7.4939 1.319851 -#> ds 4 parent 28 85.0 89.030 -4.02995 7.0297 -0.573279 -#> ds 4 parent 28 77.2 89.030 -11.82995 7.0297 -1.682864 -#> ds 4 parent 60 82.2 76.923 5.27690 6.0737 0.868808 -#> ds 4 parent 60 86.1 76.923 9.17690 6.0737 1.510919 -#> ds 4 parent 90 70.5 67.073 3.42743 5.2959 0.647182 -#> ds 4 parent 90 61.7 67.073 -5.37257 5.2959 -1.014470 -#> ds 4 parent 120 60.0 58.483 1.51654 4.6178 0.328416 -#> ds 4 parent 120 56.4 58.483 -2.08346 4.6178 -0.451184 -#> ds 5 parent 0 92.6 101.752 -9.15161 8.0341 -1.139091 -#> ds 5 parent 0 116.5 101.752 14.74839 8.0341 1.835716 -#> ds 5 parent 1 108.0 100.069 7.93112 7.9013 1.003778 -#> ds 5 parent 1 104.9 100.069 4.83112 7.9013 0.611436 -#> ds 5 parent 3 100.5 96.786 3.71355 7.6421 0.485934 -#> ds 5 parent 3 89.5 96.786 -7.28645 7.6421 -0.953462 -#> ds 5 parent 7 91.7 90.541 1.15895 7.1490 0.162114 -#> ds 5 parent 7 95.1 90.541 4.55895 7.1490 0.637707 -#> ds 5 parent 14 82.2 80.566 1.63437 6.3613 0.256923 -#> ds 5 parent 14 84.5 80.566 3.93437 6.3613 0.618483 -#> ds 5 parent 28 60.5 63.791 -3.29084 5.0368 -0.653357 -#> ds 5 parent 28 72.8 63.791 9.00916 5.0368 1.788662 -#> ds 5 parent 60 38.3 37.412 0.88840 2.9540 0.300748 -#> ds 5 parent 60 40.7 37.412 3.28840 2.9540 1.113217 -#> ds 5 parent 90 22.5 22.685 -0.18500 1.7912 -0.103287 -#> ds 5 parent 90 20.8 22.685 -1.88500 1.7912 -1.052387 -#> ds 5 parent 120 13.4 13.755 -0.35534 1.0861 -0.327173 -#> ds 5 parent 120 13.8 13.755 0.04466 1.0861 0.041118</div><div class='input'> +#> ds 1 parent 0 104.1 101.592 2.50757 8.0255 0.312451 +#> ds 1 parent 0 105.0 101.592 3.40757 8.0255 0.424594 +#> ds 1 parent 1 98.5 100.796 -2.29571 7.9625 -0.288313 +#> ds 1 parent 1 96.1 100.796 -4.69571 7.9625 -0.589725 +#> ds 1 parent 3 101.9 99.221 2.67904 7.8381 0.341796 +#> ds 1 parent 3 85.2 99.221 -14.02096 7.8381 -1.788812 +#> ds 1 parent 7 99.1 96.145 2.95512 7.5951 0.389081 +#> ds 1 parent 7 93.0 96.145 -3.14488 7.5951 -0.414065 +#> ds 1 parent 14 88.1 90.989 -2.88944 7.1879 -0.401987 +#> ds 1 parent 14 84.1 90.989 -6.88944 7.1879 -0.958480 +#> ds 1 parent 28 80.2 81.493 -1.29305 6.4377 -0.200857 +#> ds 1 parent 28 91.3 81.493 9.80695 6.4377 1.523364 +#> ds 1 parent 60 65.1 63.344 1.75642 5.0039 0.351008 +#> ds 1 parent 60 65.8 63.344 2.45642 5.0039 0.490898 +#> ds 1 parent 90 47.8 50.018 -2.21764 3.9512 -0.561252 +#> ds 1 parent 90 53.5 50.018 3.48236 3.9512 0.881335 +#> ds 1 parent 120 37.6 39.495 -1.89515 3.1200 -0.607423 +#> ds 1 parent 120 39.3 39.495 -0.19515 3.1200 -0.062549 +#> ds 2 parent 0 107.9 101.592 6.30757 8.0255 0.785943 +#> ds 2 parent 0 102.1 101.592 0.50757 8.0255 0.063245 +#> ds 2 parent 1 103.8 100.058 3.74159 7.9043 0.473361 +#> ds 2 parent 1 108.6 100.058 8.54159 7.9043 1.080626 +#> ds 2 parent 3 91.0 97.060 -6.05952 7.6674 -0.790297 +#> ds 2 parent 3 84.9 97.060 -12.15952 7.6674 -1.585874 +#> ds 2 parent 7 79.3 91.329 -12.02867 7.2147 -1.667251 +#> ds 2 parent 7 100.9 91.329 9.57133 7.2147 1.326647 +#> ds 2 parent 14 77.3 82.102 -4.80185 6.4858 -0.740366 +#> ds 2 parent 14 83.5 82.102 1.39815 6.4858 0.215571 +#> ds 2 parent 28 66.8 66.351 0.44945 5.2415 0.085748 +#> ds 2 parent 28 63.3 66.351 -3.05055 5.2415 -0.582002 +#> ds 2 parent 60 40.8 40.775 0.02474 3.2211 0.007679 +#> ds 2 parent 60 44.8 40.775 4.02474 3.2211 1.249485 +#> ds 2 parent 90 27.8 25.832 1.96762 2.0407 0.964198 +#> ds 2 parent 90 27.0 25.832 1.16762 2.0407 0.572171 +#> ds 2 parent 120 15.2 16.366 -1.16561 1.2928 -0.901595 +#> ds 2 parent 120 15.5 16.366 -0.86561 1.2928 -0.669547 +#> ds 3 parent 0 97.7 101.592 -3.89243 8.0255 -0.485009 +#> ds 3 parent 0 88.2 101.592 -13.39243 8.0255 -1.668739 +#> ds 3 parent 1 109.9 99.218 10.68196 7.8379 1.362858 +#> ds 3 parent 1 97.8 99.218 -1.41804 7.8379 -0.180921 +#> ds 3 parent 3 100.5 94.634 5.86555 7.4758 0.784603 +#> ds 3 parent 3 77.4 94.634 -17.23445 7.4758 -2.305360 +#> ds 3 parent 7 78.3 86.093 -7.79273 6.8011 -1.145813 +#> ds 3 parent 7 90.3 86.093 4.20727 6.8011 0.618620 +#> ds 3 parent 14 76.0 72.958 3.04222 5.7634 0.527848 +#> ds 3 parent 14 79.1 72.958 6.14222 5.7634 1.065722 +#> ds 3 parent 28 46.0 52.394 -6.39404 4.1390 -1.544842 +#> ds 3 parent 28 53.4 52.394 1.00596 4.1390 0.243046 +#> ds 3 parent 60 25.1 24.582 0.51786 1.9419 0.266676 +#> ds 3 parent 60 21.4 24.582 -3.18214 1.9419 -1.638664 +#> ds 3 parent 90 11.0 12.092 -1.09202 0.9552 -1.143199 +#> ds 3 parent 90 14.2 12.092 2.10798 0.9552 2.206776 +#> ds 3 parent 120 5.8 5.948 -0.14810 0.4699 -0.315178 +#> ds 3 parent 120 6.1 5.948 0.15190 0.4699 0.323282 +#> ds 4 parent 0 95.3 101.592 -6.29243 8.0255 -0.784057 +#> ds 4 parent 0 102.0 101.592 0.40757 8.0255 0.050784 +#> ds 4 parent 1 104.4 101.125 3.27549 7.9885 0.410025 +#> ds 4 parent 1 105.4 101.125 4.27549 7.9885 0.535205 +#> ds 4 parent 3 113.7 100.195 13.50487 7.9151 1.706218 +#> ds 4 parent 3 82.3 100.195 -17.89513 7.9151 -2.260886 +#> ds 4 parent 7 98.1 98.362 -0.26190 7.7703 -0.033706 +#> ds 4 parent 7 87.8 98.362 -10.56190 7.7703 -1.359270 +#> ds 4 parent 14 97.9 95.234 2.66590 7.5232 0.354357 +#> ds 4 parent 14 104.8 95.234 9.56590 7.5232 1.271521 +#> ds 4 parent 28 85.0 89.274 -4.27372 7.0523 -0.606001 +#> ds 4 parent 28 77.2 89.274 -12.07372 7.0523 -1.712017 +#> ds 4 parent 60 82.2 77.013 5.18661 6.0838 0.852526 +#> ds 4 parent 60 86.1 77.013 9.08661 6.0838 1.493571 +#> ds 4 parent 90 70.5 67.053 3.44692 5.2970 0.650733 +#> ds 4 parent 90 61.7 67.053 -5.35308 5.2970 -1.010591 +#> ds 4 parent 120 60.0 58.381 1.61905 4.6119 0.351058 +#> ds 4 parent 120 56.4 58.381 -1.98095 4.6119 -0.429530 +#> ds 5 parent 0 92.6 101.592 -8.99243 8.0255 -1.120485 +#> ds 5 parent 0 116.5 101.592 14.90757 8.0255 1.857531 +#> ds 5 parent 1 108.0 99.914 8.08560 7.8929 1.024413 +#> ds 5 parent 1 104.9 99.914 4.98560 7.8929 0.631655 +#> ds 5 parent 3 100.5 96.641 3.85898 7.6343 0.505477 +#> ds 5 parent 3 89.5 96.641 -7.14102 7.6343 -0.935382 +#> ds 5 parent 7 91.7 90.412 1.28752 7.1423 0.180267 +#> ds 5 parent 7 95.1 90.412 4.68752 7.1423 0.656304 +#> ds 5 parent 14 82.2 80.463 1.73715 6.3563 0.273295 +#> ds 5 parent 14 84.5 80.463 4.03715 6.3563 0.635141 +#> ds 5 parent 28 60.5 63.728 -3.22788 5.0343 -0.641178 +#> ds 5 parent 28 72.8 63.728 9.07212 5.0343 1.802062 +#> ds 5 parent 60 38.3 37.399 0.90061 2.9544 0.304835 +#> ds 5 parent 60 40.7 37.399 3.30061 2.9544 1.117174 +#> ds 5 parent 90 22.5 22.692 -0.19165 1.7926 -0.106913 +#> ds 5 parent 90 20.8 22.692 -1.89165 1.7926 -1.055273 +#> ds 5 parent 120 13.4 13.768 -0.36790 1.0876 -0.338259 +#> ds 5 parent 120 13.8 13.768 0.03210 1.0876 0.029517</div><div class='input'> </div></pre> </div> <div class="col-md-3 hidden-xs hidden-sm" id="pkgdown-sidebar"> diff --git a/docs/dev/reference/summary.saem.mmkin.html b/docs/dev/reference/summary.saem.mmkin.html index 81054813..0d661ee9 100644 --- a/docs/dev/reference/summary.saem.mmkin.html +++ b/docs/dev/reference/summary.saem.mmkin.html @@ -76,7 +76,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.0.2.9000</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -260,15 +260,15 @@ saemix authors for the parts inherited from saemix.</p> quiet <span class='op'>=</span> <span class='cn'>TRUE</span>, error_model <span class='op'>=</span> <span class='st'>"tc"</span>, cores <span class='op'>=</span> <span class='fl'>5</span><span class='op'>)</span> <span class='va'>f_saem_dfop_sfo</span> <span class='op'><-</span> <span class='fu'><a href='saem.html'>saem</a></span><span class='op'>(</span><span class='va'>f_mmkin_dfop_sfo</span><span class='op'>)</span> </div><div class='output co'>#> Running main SAEM algorithm -#> [1] "Sat Feb 13 12:33:52 2021" +#> [1] "Mon Feb 15 17:13:15 2021" #> .... #> Minimisation finished -#> [1] "Sat Feb 13 12:34:03 2021"</div><div class='input'><span class='fu'><a href='https://rdrr.io/pkg/saemix/man/summary-methods.html'>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> +#> [1] "Mon Feb 15 17:13:26 2021"</div><div class='input'><span class='fu'><a href='https://rdrr.io/pkg/saemix/man/summary-methods.html'>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> </div><div class='output co'>#> saemix version used for fitting: 3.1.9000 -#> mkin version used for pre-fitting: 1.0.2.9000 +#> mkin version used for pre-fitting: 1.0.3.9000 #> R version used for fitting: 4.0.3 -#> Date of fit: Sat Feb 13 12:34:04 2021 -#> Date of summary: Sat Feb 13 12:34:04 2021 +#> Date of fit: Mon Feb 15 17:13:27 2021 +#> Date of summary: Mon Feb 15 17:13:27 2021 #> #> Equations: #> d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -283,7 +283,7 @@ saemix authors for the parts inherited from saemix.</p> #> #> Model predictions using solution type analytical #> -#> Fitted in 11.899 s using 300, 100 iterations +#> Fitted in 12.204 s using 300, 100 iterations #> #> Variance model: Two-component variance function #> diff --git a/docs/dev/reference/synthetic_data_for_UBA_2014-1.png b/docs/dev/reference/synthetic_data_for_UBA_2014-1.png Binary files differindex 351b21aa..89975db5 100644 --- a/docs/dev/reference/synthetic_data_for_UBA_2014-1.png +++ b/docs/dev/reference/synthetic_data_for_UBA_2014-1.png diff --git a/docs/dev/reference/synthetic_data_for_UBA_2014.html b/docs/dev/reference/synthetic_data_for_UBA_2014.html index 1edc7c1e..33a0ace2 100644 --- a/docs/dev/reference/synthetic_data_for_UBA_2014.html +++ b/docs/dev/reference/synthetic_data_for_UBA_2014.html @@ -87,7 +87,7 @@ Compare also the code in the example section to see the degradation models." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -136,7 +136,7 @@ Compare also the code in the example section to see the degradation models." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -297,10 +297,10 @@ Compare also the code in the example section to see the degradation models." /> quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</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> </div><div class='img'><img src='synthetic_data_for_UBA_2014-1.png' alt='' width='700' height='433' /></div><div class='input'> <span class='fu'><a href='https://rdrr.io/pkg/saemix/man/summary-methods.html'>summary</a></span><span class='op'>(</span><span class='va'>fit</span><span class='op'>)</span> -</div><div class='output co'>#> mkin version used for fitting: 0.9.50.4 +</div><div class='output co'>#> mkin version used for fitting: 1.0.3.9000 #> R version used for fitting: 4.0.3 -#> Date of fit: Mon Nov 30 16:01:42 2020 -#> Date of summary: Mon Nov 30 16:01:42 2020 +#> Date of fit: Mon Feb 15 17:13:29 2021 +#> Date of summary: Mon Feb 15 17:13:29 2021 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -309,7 +309,7 @@ Compare also the code in the example section to see the degradation models." /> #> #> Model predictions using solution type deSolve #> -#> Fitted using 822 model solutions performed in 0.652 s +#> Fitted using 833 model solutions performed in 0.649 s #> #> Error model: Constant variance #> @@ -361,15 +361,15 @@ Compare also the code in the example section to see the degradation models." /> #> log_k_M2 2.819e-02 7.166e-02 -3.929e-01 1.000e+00 -2.658e-01 #> f_parent_qlogis -4.624e-01 -5.682e-01 7.478e-01 -2.658e-01 1.000e+00 #> f_M1_qlogis 1.614e-01 4.102e-01 -8.109e-01 5.419e-01 -8.605e-01 -#> sigma -7.941e-08 -9.143e-09 -1.268e-08 5.947e-08 5.657e-08 +#> sigma -2.900e-08 -8.030e-09 -2.741e-08 3.938e-08 -2.681e-08 #> f_M1_qlogis sigma -#> parent_0 1.614e-01 -7.941e-08 -#> log_k_parent 4.102e-01 -9.143e-09 -#> log_k_M1 -8.109e-01 -1.268e-08 -#> log_k_M2 5.419e-01 5.947e-08 -#> f_parent_qlogis -8.605e-01 5.657e-08 -#> f_M1_qlogis 1.000e+00 -2.382e-10 -#> sigma -2.382e-10 1.000e+00 +#> parent_0 1.614e-01 -2.900e-08 +#> log_k_parent 4.102e-01 -8.030e-09 +#> log_k_M1 -8.109e-01 -2.741e-08 +#> log_k_M2 5.419e-01 3.938e-08 +#> f_parent_qlogis -8.605e-01 -2.681e-08 +#> f_M1_qlogis 1.000e+00 4.971e-08 +#> sigma 4.971e-08 1.000e+00 #> #> Backtransformed parameters: #> Confidence intervals for internally transformed parameters are asymmetric. @@ -416,7 +416,7 @@ Compare also the code in the example section to see the degradation models." /> #> 7 parent 0.3 5.772e-01 -0.27717 #> 14 parent 3.5 3.264e-03 3.49674 #> 28 parent 3.2 1.045e-07 3.20000 -#> 90 parent 0.6 9.532e-10 0.60000 +#> 90 parent 0.6 9.530e-10 0.60000 #> 120 parent 3.5 -5.940e-10 3.50000 #> 1 M1 36.4 3.479e+01 1.61088 #> 1 M1 37.4 3.479e+01 2.61088 @@ -427,7 +427,7 @@ Compare also the code in the example section to see the degradation models." /> #> 14 M1 5.8 1.995e+00 3.80469 #> 14 M1 1.2 1.995e+00 -0.79531 #> 60 M1 0.5 2.111e-06 0.50000 -#> 90 M1 3.2 -9.671e-10 3.20000 +#> 90 M1 3.2 -9.670e-10 3.20000 #> 120 M1 1.5 7.670e-10 1.50000 #> 120 M1 0.6 7.670e-10 0.60000 #> 1 M2 4.8 4.455e+00 0.34517 diff --git a/docs/dev/reference/test_data_from_UBA_2014-1.png b/docs/dev/reference/test_data_from_UBA_2014-1.png Binary files differindex 9e0afad2..7bf0bd0f 100644 --- a/docs/dev/reference/test_data_from_UBA_2014-1.png +++ b/docs/dev/reference/test_data_from_UBA_2014-1.png diff --git a/docs/dev/reference/test_data_from_UBA_2014-2.png b/docs/dev/reference/test_data_from_UBA_2014-2.png Binary files differindex e889efde..fc1f77e0 100644 --- a/docs/dev/reference/test_data_from_UBA_2014-2.png +++ b/docs/dev/reference/test_data_from_UBA_2014-2.png diff --git a/docs/dev/reference/test_data_from_UBA_2014.html b/docs/dev/reference/test_data_from_UBA_2014.html index 89ec3480..539b8287 100644 --- a/docs/dev/reference/test_data_from_UBA_2014.html +++ b/docs/dev/reference/test_data_from_UBA_2014.html @@ -73,7 +73,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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -122,7 +122,7 @@ <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> @@ -203,25 +203,25 @@ </div><div class='output co'>#> <span class='warning'>Warning: Observations with value of zero were removed from the data</span></div><div class='input'> <span class='fu'><a href='plot.mkinfit.html'>plot_sep</a></span><span class='op'>(</span><span class='va'>f_soil</span>, lpos <span class='op'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span><span class='op'>(</span><span class='st'>"topright"</span>, <span class='st'>"topright"</span>, <span class='st'>"topright"</span>, <span class='st'>"bottomright"</span><span class='op'>)</span><span class='op'>)</span> </div><div class='img'><img src='test_data_from_UBA_2014-2.png' alt='' width='700' height='433' /></div><div class='input'> <span class='fu'><a href='https://rdrr.io/pkg/saemix/man/summary-methods.html'>summary</a></span><span class='op'>(</span><span class='va'>f_soil</span><span class='op'>)</span><span class='op'>$</span><span class='va'>bpar</span> </div><div class='output co'>#> Estimate se_notrans t value Pr(>t) Lower -#> parent_0 76.55425649 0.859186399 89.1008710 1.113861e-26 74.755959406 +#> parent_0 76.55425650 0.859186399 89.1008710 1.113861e-26 74.755959418 #> k_parent 0.12081956 0.004601918 26.2541722 1.077359e-16 0.111561575 -#> k_M1 0.84258614 0.806159820 1.0451850 1.545267e-01 0.113779670 -#> k_M2 0.04210880 0.017083035 2.4649483 1.170188e-02 0.018013857 -#> k_M3 0.01122918 0.007245855 1.5497385 6.885052e-02 0.002909431 -#> f_parent_to_M1 0.32240200 0.240783909 1.3389682 9.819073e-02 NA -#> f_parent_to_M2 0.16099855 0.033691953 4.7785463 6.531137e-05 NA -#> f_M1_to_M3 0.27921507 0.269423745 1.0363417 1.565266e-01 0.022978220 -#> f_M2_to_M3 0.55641253 0.595119954 0.9349586 1.807707e-01 0.008002509 +#> k_M1 0.84258615 0.806160102 1.0451846 1.545268e-01 0.113779609 +#> k_M2 0.04210880 0.017083034 2.4649483 1.170188e-02 0.018013857 +#> k_M3 0.01122918 0.007245856 1.5497385 6.885052e-02 0.002909431 +#> f_parent_to_M1 0.32240200 0.240783943 1.3389680 9.819076e-02 NA +#> f_parent_to_M2 0.16099855 0.033691952 4.7785464 6.531136e-05 NA +#> f_M1_to_M3 0.27921507 0.269423780 1.0363416 1.565267e-01 0.022978205 +#> f_M2_to_M3 0.55641252 0.595119966 0.9349586 1.807707e-01 0.008002509 #> sigma 1.14005399 0.149696423 7.6157731 1.727024e-07 0.826735778 #> Upper -#> parent_0 78.35255357 +#> parent_0 78.35255358 #> k_parent 0.13084582 -#> k_M1 6.23970352 +#> k_M1 6.23970702 #> k_M2 0.09843260 #> k_M3 0.04333992 #> f_parent_to_M1 NA #> f_parent_to_M2 NA -#> f_M1_to_M3 0.86450768 +#> f_M1_to_M3 0.86450775 #> f_M2_to_M3 0.99489895 #> sigma 1.45337221</div><div class='input'> <span class='fu'><a href='mkinerrmin.html'>mkinerrmin</a></span><span class='op'>(</span><span class='va'>f_soil</span><span class='op'>)</span> </div><div class='output co'>#> err.min n.optim df diff --git a/docs/dev/reference/transform_odeparms.html b/docs/dev/reference/transform_odeparms.html index 6e19505f..75d6a1f9 100644 --- a/docs/dev/reference/transform_odeparms.html +++ b/docs/dev/reference/transform_odeparms.html @@ -77,7 +77,7 @@ the ilr transformation is used." /> </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.0.1.9000</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> diff --git a/docs/dev/reference/update.mkinfit-1.png b/docs/dev/reference/update.mkinfit-1.png Binary files differindex 7d2f1bdb..df8473c1 100644 --- a/docs/dev/reference/update.mkinfit-1.png +++ b/docs/dev/reference/update.mkinfit-1.png diff --git a/docs/dev/reference/update.mkinfit-2.png b/docs/dev/reference/update.mkinfit-2.png Binary files differindex 8dcabcdc..13c99b44 100644 --- a/docs/dev/reference/update.mkinfit-2.png +++ b/docs/dev/reference/update.mkinfit-2.png diff --git a/docs/dev/reference/update.mkinfit.html b/docs/dev/reference/update.mkinfit.html index 10a93373..83f45028 100644 --- a/docs/dev/reference/update.mkinfit.html +++ b/docs/dev/reference/update.mkinfit.html @@ -75,7 +75,7 @@ override these starting values." /> </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">0.9.50.4</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.0.3.9000</span> </span> </div> @@ -124,7 +124,7 @@ override these starting values." /> <ul class="nav navbar-nav navbar-right"> <li> <a href="https://github.com/jranke/mkin/"> - <span class="fab fa fab fa-github fa-lg"></span> + <span class="fab fa-github fa-lg"></span> </a> </li> |
