From 48c463680b51fa767b4cd7bd62865f192d0354ac Mon Sep 17 00:00:00 2001
From: Johannes Ranke
Johannes Ranke
+Johannes Ranke and Katrin Lindenberger
-- cgit v1.2.3 From b9be19af5e3085216d0cd5af439332f631fa8b92 Mon Sep 17 00:00:00 2001 From: Johannes Rankediff --git a/docs/dev/articles/FOCUS_D.html b/docs/dev/articles/FOCUS_D.html index dd86f677..a35a255a 100644 --- a/docs/dev/articles/FOCUS_D.html +++ b/docs/dev/articles/FOCUS_D.html @@ -32,7 +32,7 @@ mkin - 0.9.50.4 + 1.0.3.9000 @@ -81,7 +81,7 @@Date: Mon, 15 Feb 2021 17:36:12 +0100 Subject: Fully rebuild docs, rerun tests and check --- GNUmakefile | 2 +- build.log | 3 +- check.log | 4 +- docs/dev/404.html | 2 +- docs/dev/articles/FOCUS_D.html | 23 +-- .../accessible-code-block-0.0.1/empty-anchor.js | 15 ++ .../articles/FOCUS_D_files/figure-html/plot-1.png | Bin 81432 -> 79176 bytes .../FOCUS_D_files/header-attrs-2.6/header-attrs.js | 12 ++ docs/dev/articles/FOCUS_L.html | 129 ++++++------ .../accessible-code-block-0.0.1/empty-anchor.js | 15 ++ .../figure-html/unnamed-chunk-10-1.png | Bin 43110 -> 42203 bytes .../figure-html/unnamed-chunk-12-1.png | Bin 84605 -> 82006 bytes .../figure-html/unnamed-chunk-13-1.png | Bin 33489 -> 32751 bytes .../figure-html/unnamed-chunk-15-1.png | Bin 59507 -> 57939 bytes .../figure-html/unnamed-chunk-4-1.png | Bin 35964 -> 35238 bytes .../figure-html/unnamed-chunk-6-1.png | Bin 36379 -> 35640 bytes .../figure-html/unnamed-chunk-8-1.png | Bin 42221 -> 41399 bytes .../figure-html/unnamed-chunk-9-1.png | Bin 41739 -> 40983 bytes .../FOCUS_L_files/header-attrs-2.6/header-attrs.js | 12 ++ docs/dev/articles/index.html | 2 +- docs/dev/articles/mkin.html | 62 +++--- .../accessible-code-block-0.0.1/empty-anchor.js | 15 ++ .../mkin_files/figure-html/unnamed-chunk-2-1.png | Bin 92716 -> 89958 bytes .../mkin_files/header-attrs-2.6/header-attrs.js | 12 ++ docs/dev/articles/twa.html | 13 +- .../accessible-code-block-0.0.1/empty-anchor.js | 15 ++ .../twa_files/header-attrs-2.6/header-attrs.js | 12 ++ docs/dev/articles/web_only/FOCUS_Z.html | 35 ++-- .../accessible-code-block-0.0.1/empty-anchor.js | 15 ++ .../figure-html/FOCUS_2006_Z_fits_1-1.png | Bin 69227 -> 66640 bytes .../figure-html/FOCUS_2006_Z_fits_10-1.png | Bin 109820 -> 106038 bytes .../figure-html/FOCUS_2006_Z_fits_11-1.png | Bin 109050 -> 105042 bytes .../figure-html/FOCUS_2006_Z_fits_11a-1.png | Bin 79154 -> 75626 bytes .../figure-html/FOCUS_2006_Z_fits_11b-1.png | Bin 35734 -> 35744 bytes .../figure-html/FOCUS_2006_Z_fits_2-1.png | Bin 69227 -> 66640 bytes .../figure-html/FOCUS_2006_Z_fits_3-1.png | Bin 69006 -> 66424 bytes .../figure-html/FOCUS_2006_Z_fits_5-1.png | Bin 83658 -> 80520 bytes .../figure-html/FOCUS_2006_Z_fits_6-1.png | Bin 108890 -> 105149 bytes .../figure-html/FOCUS_2006_Z_fits_7-1.png | Bin 108277 -> 104479 bytes .../figure-html/FOCUS_2006_Z_fits_9-1.png | Bin 91586 -> 88890 bytes .../FOCUS_Z_files/header-attrs-2.6/header-attrs.js | 12 ++ docs/dev/articles/web_only/NAFTA_examples.html | 181 ++++++++--------- .../accessible-code-block-0.0.1/empty-anchor.js | 15 ++ .../NAFTA_examples_files/figure-html/p10-1.png | Bin 80950 -> 78793 bytes .../NAFTA_examples_files/figure-html/p11-1.png | Bin 77737 -> 75470 bytes .../NAFTA_examples_files/figure-html/p12a-1.png | Bin 83111 -> 80755 bytes .../NAFTA_examples_files/figure-html/p12b-1.png | Bin 72088 -> 69885 bytes .../NAFTA_examples_files/figure-html/p13-1.png | Bin 79355 -> 77126 bytes .../NAFTA_examples_files/figure-html/p14-1.png | Bin 82078 -> 79693 bytes .../NAFTA_examples_files/figure-html/p15a-1.png | Bin 78261 -> 75945 bytes .../NAFTA_examples_files/figure-html/p15b-1.png | Bin 80090 -> 78004 bytes .../NAFTA_examples_files/figure-html/p16-1.png | Bin 95466 -> 93075 bytes .../NAFTA_examples_files/figure-html/p5a-1.png | Bin 84037 -> 81521 bytes .../NAFTA_examples_files/figure-html/p5b-1.png | Bin 81732 -> 79783 bytes .../NAFTA_examples_files/figure-html/p6-1.png | Bin 84055 -> 81974 bytes .../NAFTA_examples_files/figure-html/p7-1.png | Bin 103771 -> 101606 bytes .../NAFTA_examples_files/figure-html/p8-1.png | Bin 94196 -> 91429 bytes .../NAFTA_examples_files/figure-html/p9a-1.png | Bin 80132 -> 77612 bytes .../NAFTA_examples_files/figure-html/p9b-1.png | Bin 77691 -> 75129 bytes .../header-attrs-2.6/header-attrs.js | 12 ++ docs/dev/articles/web_only/benchmarks.html | 65 ++++-- .../accessible-code-block-0.0.1/empty-anchor.js | 15 ++ .../header-attrs-2.6/header-attrs.js | 12 ++ docs/dev/articles/web_only/compiled_models.html | 27 ++- .../accessible-code-block-0.0.1/empty-anchor.js | 15 ++ .../header-attrs-2.6/header-attrs.js | 12 ++ docs/dev/authors.html | 2 +- docs/dev/index.html | 45 +++- docs/dev/news/index.html | 16 +- docs/dev/pkgdown.yml | 2 +- docs/dev/reference/AIC.mmkin.html | 13 +- docs/dev/reference/CAKE_export.html | 4 +- docs/dev/reference/D24_2014.html | 2 +- docs/dev/reference/DFOP.solution.html | 4 +- docs/dev/reference/Extract.mmkin.html | 6 +- docs/dev/reference/FOCUS_2006_DFOP_ref_A_to_B.html | 4 +- docs/dev/reference/FOCUS_2006_FOMC_ref_A_to_F.html | 4 +- docs/dev/reference/FOCUS_2006_HS_ref_A_to_F.html | 4 +- docs/dev/reference/FOCUS_2006_SFO_ref_A_to_F.html | 4 +- docs/dev/reference/FOCUS_2006_datasets.html | 4 +- docs/dev/reference/FOMC.solution.html | 4 +- docs/dev/reference/HS.solution.html | 4 +- docs/dev/reference/IORE.solution.html | 4 +- docs/dev/reference/NAFTA_SOP_2015-1.png | Bin 64838 -> 61980 bytes docs/dev/reference/NAFTA_SOP_2015.html | 4 +- docs/dev/reference/NAFTA_SOP_Attachment-1.png | Bin 66148 -> 63822 bytes docs/dev/reference/NAFTA_SOP_Attachment.html | 8 +- docs/dev/reference/Rplot001.png | Bin 1011 -> 13995 bytes docs/dev/reference/Rplot002.png | Bin 16843 -> 13648 bytes docs/dev/reference/Rplot006.png | Bin 22103 -> 24545 bytes docs/dev/reference/Rplot007.png | Bin 25074 -> 24992 bytes docs/dev/reference/SFO.solution.html | 4 +- docs/dev/reference/SFORB.solution.html | 4 +- docs/dev/reference/add_err-1.png | Bin 111360 -> 108676 bytes docs/dev/reference/add_err-2.png | Bin 64003 -> 63336 bytes docs/dev/reference/add_err-3.png | Bin 60019 -> 58909 bytes docs/dev/reference/add_err.html | 4 +- docs/dev/reference/aw.html | 4 +- docs/dev/reference/confint.mkinfit.html | 6 +- docs/dev/reference/create_deg_func.html | 12 +- docs/dev/reference/dimethenamid_2018.html | 2 +- docs/dev/reference/endpoints.html | 2 +- docs/dev/reference/experimental_data_for_UBA-1.png | Bin 103559 -> 102212 bytes docs/dev/reference/experimental_data_for_UBA.html | 4 +- docs/dev/reference/f_time_norm_focus.html | 2 +- docs/dev/reference/focus_soil_moisture.html | 4 +- docs/dev/reference/get_deg_func.html | 4 +- docs/dev/reference/ilr.html | 4 +- docs/dev/reference/index.html | 2 +- docs/dev/reference/loftest-1.png | Bin 41288 -> 40351 bytes docs/dev/reference/loftest-2.png | Bin 40668 -> 39817 bytes docs/dev/reference/loftest-3.png | Bin 78452 -> 76976 bytes docs/dev/reference/loftest-4.png | Bin 76132 -> 74678 bytes docs/dev/reference/loftest-5.png | Bin 74691 -> 73446 bytes docs/dev/reference/loftest.html | 4 +- docs/dev/reference/logLik.mkinfit.html | 2 +- docs/dev/reference/logistic.solution-2.png | Bin 43807 -> 42118 bytes docs/dev/reference/logistic.solution.html | 10 +- docs/dev/reference/lrtest.mkinfit.html | 4 +- docs/dev/reference/max_twa_parent.html | 4 +- docs/dev/reference/mccall81_245T-1.png | Bin 65341 -> 62537 bytes docs/dev/reference/mccall81_245T.html | 44 ++-- docs/dev/reference/mixed-1.png | Bin 206373 -> 219866 bytes docs/dev/reference/mixed.html | 14 +- docs/dev/reference/mkin_long_to_wide.html | 4 +- docs/dev/reference/mkin_wide_to_long.html | 4 +- docs/dev/reference/mkinds.html | 4 +- docs/dev/reference/mkindsg.html | 10 +- docs/dev/reference/mkinerrmin.html | 4 +- docs/dev/reference/mkinerrplot.html | 4 +- docs/dev/reference/mkinfit-1.png | Bin 67810 -> 65835 bytes docs/dev/reference/mkinfit.html | 132 ++++++------ docs/dev/reference/mkinmod.html | 8 +- docs/dev/reference/mkinparplot-1.png | Bin 25707 -> 25702 bytes docs/dev/reference/mkinparplot.html | 7 +- docs/dev/reference/mkinplot.html | 4 +- docs/dev/reference/mkinpredict.html | 10 +- docs/dev/reference/mkinresplot.html | 2 +- docs/dev/reference/mmkin.html | 6 +- docs/dev/reference/nafta-1.png | Bin 64838 -> 61980 bytes docs/dev/reference/nafta.html | 4 +- docs/dev/reference/nlme-1.png | Bin 69449 -> 70133 bytes docs/dev/reference/nlme-2.png | Bin 89493 -> 94031 bytes docs/dev/reference/nlme.html | 28 +-- docs/dev/reference/nlme.mmkin.html | 4 +- docs/dev/reference/nobs.mkinfit.html | 4 +- docs/dev/reference/parms.html | 14 +- docs/dev/reference/plot.mixed.mmkin.html | 6 +- docs/dev/reference/plot.mkinfit-2.png | Bin 73247 -> 73254 bytes docs/dev/reference/plot.mkinfit-5.png | Bin 66920 -> 66560 bytes docs/dev/reference/plot.mkinfit-6.png | Bin 73078 -> 72717 bytes docs/dev/reference/plot.mkinfit-7.png | Bin 73909 -> 73553 bytes docs/dev/reference/plot.mkinfit.html | 2 +- docs/dev/reference/plot.mmkin-1.png | Bin 49402 -> 48997 bytes docs/dev/reference/plot.mmkin-2.png | Bin 49753 -> 49376 bytes docs/dev/reference/plot.mmkin-3.png | Bin 46090 -> 46202 bytes docs/dev/reference/plot.mmkin-4.png | Bin 33266 -> 33057 bytes docs/dev/reference/plot.mmkin-5.png | Bin 57777 -> 57372 bytes docs/dev/reference/plot.mmkin.html | 2 +- docs/dev/reference/plot.nafta.html | 4 +- docs/dev/reference/reexports.html | 4 +- docs/dev/reference/residuals.mkinfit.html | 6 +- docs/dev/reference/saem.html | 38 ++-- docs/dev/reference/schaefer07_complex_case-1.png | Bin 67659 -> 66965 bytes docs/dev/reference/schaefer07_complex_case.html | 14 +- docs/dev/reference/sigma_twocomp-1.png | Bin 44554 -> 43910 bytes docs/dev/reference/sigma_twocomp.html | 8 +- docs/dev/reference/summary.mkinfit.html | 12 +- docs/dev/reference/summary.nlme.mmkin.html | 226 ++++++++++----------- docs/dev/reference/summary.saem.mmkin.html | 14 +- .../reference/synthetic_data_for_UBA_2014-1.png | Bin 70005 -> 67191 bytes .../dev/reference/synthetic_data_for_UBA_2014.html | 32 +-- docs/dev/reference/test_data_from_UBA_2014-1.png | Bin 59592 -> 57395 bytes docs/dev/reference/test_data_from_UBA_2014-2.png | Bin 76645 -> 72786 bytes docs/dev/reference/test_data_from_UBA_2014.html | 26 +-- docs/dev/reference/transform_odeparms.html | 2 +- docs/dev/reference/update.mkinfit-1.png | Bin 43366 -> 42360 bytes docs/dev/reference/update.mkinfit-2.png | Bin 44304 -> 43389 bytes docs/dev/reference/update.mkinfit.html | 4 +- test.log | 28 +-- vignettes/FOCUS_D.html | 4 +- vignettes/FOCUS_L.html | 32 +-- vignettes/web_only/mkin_benchmarks.rda | Bin 1081 -> 1137 bytes 183 files changed, 1020 insertions(+), 739 deletions(-) create mode 100644 docs/dev/articles/FOCUS_D_files/accessible-code-block-0.0.1/empty-anchor.js create mode 100644 docs/dev/articles/FOCUS_D_files/header-attrs-2.6/header-attrs.js create mode 100644 docs/dev/articles/FOCUS_L_files/accessible-code-block-0.0.1/empty-anchor.js create mode 100644 docs/dev/articles/FOCUS_L_files/header-attrs-2.6/header-attrs.js create mode 100644 docs/dev/articles/mkin_files/accessible-code-block-0.0.1/empty-anchor.js create mode 100644 docs/dev/articles/mkin_files/header-attrs-2.6/header-attrs.js create mode 100644 docs/dev/articles/twa_files/accessible-code-block-0.0.1/empty-anchor.js create mode 100644 docs/dev/articles/twa_files/header-attrs-2.6/header-attrs.js create mode 100644 docs/dev/articles/web_only/FOCUS_Z_files/accessible-code-block-0.0.1/empty-anchor.js create mode 100644 docs/dev/articles/web_only/FOCUS_Z_files/header-attrs-2.6/header-attrs.js create mode 100644 docs/dev/articles/web_only/NAFTA_examples_files/accessible-code-block-0.0.1/empty-anchor.js create mode 100644 docs/dev/articles/web_only/NAFTA_examples_files/header-attrs-2.6/header-attrs.js create mode 100644 docs/dev/articles/web_only/benchmarks_files/accessible-code-block-0.0.1/empty-anchor.js create mode 100644 docs/dev/articles/web_only/benchmarks_files/header-attrs-2.6/header-attrs.js create mode 100644 docs/dev/articles/web_only/compiled_models_files/accessible-code-block-0.0.1/empty-anchor.js create mode 100644 docs/dev/articles/web_only/compiled_models_files/header-attrs-2.6/header-attrs.js (limited to 'docs/dev/reference/mkinresplot.html') diff --git a/GNUmakefile b/GNUmakefile index 8604d3b3..d7c68ebf 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -112,7 +112,7 @@ pd: roxygen "$(RBIN)/Rscript" -e "pkgdown::build_site(run_dont_run = TRUE, lazy = TRUE)" git add -A -pd_release: roxygen +pd_all: roxygen "$(RBIN)/Rscript" -e "pkgdown::build_site(run_dont_run = TRUE)" git add -A diff --git a/build.log b/build.log index 293831aa..d50a4860 100644 --- a/build.log +++ b/build.log @@ -6,4 +6,5 @@ * creating vignettes ... OK * checking for LF line-endings in source and make files and shell scripts * checking for empty or unneeded directories -* building ‘mkin_1.0.2.9000.tar.gz’ +* building ‘mkin_1.0.3.9000.tar.gz’ + diff --git a/check.log b/check.log index 2a4d87ad..ac59f6af 100644 --- a/check.log +++ b/check.log @@ -5,12 +5,12 @@ * using options ‘--no-tests --as-cran’ * checking for file ‘mkin/DESCRIPTION’ ... OK * checking extension type ... Package -* this is package ‘mkin’ version ‘1.0.2.9000’ +* this is package ‘mkin’ version ‘1.0.3.9000’ * package encoding: UTF-8 * checking CRAN incoming feasibility ... NOTE Maintainer: ‘Johannes Ranke ’ -Version contains large components (1.0.2.9000) +Version contains large components (1.0.3.9000) Unknown, possibly mis-spelled, fields in DESCRIPTION: ‘Remotes’ diff --git a/docs/dev/404.html b/docs/dev/404.html index ea547a2a..f9e51aa3 100644 --- a/docs/dev/404.html +++ b/docs/dev/404.html @@ -71,7 +71,7 @@ mkin - 1.0.2.9000 + 1.0.3.9000
vignettes/FOCUS_D.rmd
FOCUS_D.rmdA comprehensive report of the results is obtained using the summary method for mkinfit objects.
summary(fit)## mkin version used for fitting: 0.9.50.4
+## 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:50 2020
-## Date of summary: Mon Nov 30 16:01:50 2020
+## Date of fit: Mon Feb 15 17:13:36 2021
+## Date of summary: Mon Feb 15 17:13:37 2021
##
## Equations:
## d_parent/dt = - k_parent * parent
@@ -241,11 +240,11 @@
##
## Parameter correlation:
## parent_0 log_k_parent log_k_m1 f_parent_qlogis sigma
-## parent_0 1.000e+00 5.174e-01 -1.688e-01 -5.471e-01 -1.171e-06
-## log_k_parent 5.174e-01 1.000e+00 -3.263e-01 -5.426e-01 -8.481e-07
-## log_k_m1 -1.688e-01 -3.263e-01 1.000e+00 7.478e-01 8.209e-07
+## parent_0 1.000e+00 5.174e-01 -1.688e-01 -5.471e-01 -1.172e-06
+## log_k_parent 5.174e-01 1.000e+00 -3.263e-01 -5.426e-01 -8.483e-07
+## log_k_m1 -1.688e-01 -3.263e-01 1.000e+00 7.478e-01 8.205e-07
## f_parent_qlogis -5.471e-01 -5.426e-01 7.478e-01 1.000e+00 1.305e-06
-## sigma -1.171e-06 -8.481e-07 8.209e-07 1.305e-06 1.000e+00
+## sigma -1.172e-06 -8.483e-07 8.205e-07 1.305e-06 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
diff --git a/docs/dev/articles/FOCUS_D_files/accessible-code-block-0.0.1/empty-anchor.js b/docs/dev/articles/FOCUS_D_files/accessible-code-block-0.0.1/empty-anchor.js
new file mode 100644
index 00000000..ca349fd6
--- /dev/null
+++ b/docs/dev/articles/FOCUS_D_files/accessible-code-block-0.0.1/empty-anchor.js
@@ -0,0 +1,15 @@
+// Hide empty tag within highlighted CodeBlock for screen reader accessibility (see https://github.com/jgm/pandoc/issues/6352#issuecomment-626106786) -->
+// v0.0.1
+// Written by JooYoung Seo (jooyoung@psu.edu) and Atsushi Yasumoto on June 1st, 2020.
+
+document.addEventListener('DOMContentLoaded', function() {
+ const codeList = document.getElementsByClassName("sourceCode");
+ for (var i = 0; i < codeList.length; i++) {
+ var linkList = codeList[i].getElementsByTagName('a');
+ for (var j = 0; j < linkList.length; j++) {
+ if (linkList[j].innerHTML === "") {
+ linkList[j].setAttribute('aria-hidden', 'true');
+ }
+ }
+ }
+});
diff --git a/docs/dev/articles/FOCUS_D_files/figure-html/plot-1.png b/docs/dev/articles/FOCUS_D_files/figure-html/plot-1.png
index 8ddca415..abf26715 100644
Binary files a/docs/dev/articles/FOCUS_D_files/figure-html/plot-1.png and b/docs/dev/articles/FOCUS_D_files/figure-html/plot-1.png differ
diff --git a/docs/dev/articles/FOCUS_D_files/header-attrs-2.6/header-attrs.js b/docs/dev/articles/FOCUS_D_files/header-attrs-2.6/header-attrs.js
new file mode 100644
index 00000000..dd57d92e
--- /dev/null
+++ b/docs/dev/articles/FOCUS_D_files/header-attrs-2.6/header-attrs.js
@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+ var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+ var i, h, a;
+ for (i = 0; i < hs.length; i++) {
+ h = hs[i];
+ if (!/^h[1-6]$/i.test(h.tagName)) continue; // it should be a header h1-h6
+ a = h.attributes;
+ while (a.length > 0) h.removeAttribute(a[0].name);
+ }
+});
diff --git a/docs/dev/articles/FOCUS_L.html b/docs/dev/articles/FOCUS_L.html
index 2695db5e..547ec630 100644
--- a/docs/dev/articles/FOCUS_L.html
+++ b/docs/dev/articles/FOCUS_L.html
@@ -32,7 +32,7 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
vignettes/FOCUS_L.rmd
FOCUS_L.rmd## mkin version used for fitting: 0.9.50.4
+## 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:52 2020
-## Date of summary: Mon Nov 30 16:01:52 2020
+## Date of fit: Mon Feb 15 17:13:39 2021
+## Date of summary: Mon Feb 15 17:13:39 2021
##
## Equations:
## d_parent/dt = - k_parent * parent
@@ -234,17 +233,17 @@
## Warning in sqrt(1/diag(V)): NaNs produced
## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
## doubtful
-## mkin version used for fitting: 0.9.50.4
+## 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:53 2020
-## Date of summary: Mon Nov 30 16:01:53 2020
+## Date of fit: Mon Feb 15 17:13:40 2021
+## Date of summary: Mon Feb 15 17:13:40 2021
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted using 380 model solutions performed in 0.087 s
+## Fitted using 369 model solutions performed in 0.084 s
##
## Error model: Constant variance
##
@@ -272,22 +271,22 @@
##
## Results:
##
-## AIC BIC logLik
-## 95.88778 99.44927 -43.94389
+## AIC BIC logLik
+## 95.88781 99.44929 -43.9439
##
## Optimised, transformed parameters with symmetric confidence intervals:
## Estimate Std. Error Lower Upper
## parent_0 92.47 1.2820 89.720 95.220
-## log_alpha 16.92 NaN NaN NaN
-## log_beta 19.26 NaN NaN NaN
-## sigma 2.78 0.4501 1.814 3.745
+## log_alpha 13.78 NaN NaN NaN
+## log_beta 16.13 NaN NaN NaN
+## sigma 2.78 0.4598 1.794 3.766
##
## Parameter correlation:
-## parent_0 log_alpha log_beta sigma
-## parent_0 1.000000 NaN NaN 0.002218
-## log_alpha NaN 1 NaN NaN
-## log_beta NaN NaN 1 NaN
-## sigma 0.002218 NaN NaN 1.000000
+## parent_0 log_alpha log_beta sigma
+## parent_0 1.0000000 NaN NaN 0.0001671
+## log_alpha NaN 1 NaN NaN
+## log_beta NaN NaN 1 NaN
+## sigma 0.0001671 NaN NaN 1.0000000
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
@@ -295,9 +294,9 @@
## for estimators of untransformed parameters.
## Estimate t value Pr(>t) Lower Upper
## parent_0 9.247e+01 NA NA 89.720 95.220
-## alpha 2.223e+07 NA NA NA NA
-## beta 2.325e+08 NA NA NA NA
-## sigma 2.780e+00 NA NA 1.814 3.745
+## alpha 9.658e+05 NA NA NA NA
+## beta 1.010e+07 NA NA NA NA
+## sigma 2.780e+00 NA NA 1.794 3.766
##
## FOCUS Chi2 error levels in percent:
## err.min n.optim df
@@ -346,10 +345,10 @@

summary(m.L2.FOMC, data = FALSE)
-## mkin version used for fitting: 0.9.50.4
+## 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:54 2020
-## Date of summary: Mon Nov 30 16:01:54 2020
+## Date of fit: Mon Feb 15 17:13:40 2021
+## Date of summary: Mon Feb 15 17:13:40 2021
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -391,10 +390,10 @@
##
## Parameter correlation:
## parent_0 log_alpha log_beta sigma
-## parent_0 1.000e+00 -1.151e-01 -2.085e-01 -7.436e-09
-## log_alpha -1.151e-01 1.000e+00 9.741e-01 -1.617e-07
-## log_beta -2.085e-01 9.741e-01 1.000e+00 -1.386e-07
-## sigma -7.436e-09 -1.617e-07 -1.386e-07 1.000e+00
+## parent_0 1.000e+00 -1.151e-01 -2.085e-01 -7.828e-09
+## log_alpha -1.151e-01 1.000e+00 9.741e-01 -1.602e-07
+## log_beta -2.085e-01 9.741e-01 1.000e+00 -1.372e-07
+## sigma -7.828e-09 -1.602e-07 -1.372e-07 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
@@ -427,10 +426,10 @@

summary(m.L2.DFOP, data = FALSE)
-## mkin version used for fitting: 0.9.50.4
+## 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:54 2020
-## Date of summary: Mon Nov 30 16:01:54 2020
+## Date of fit: Mon Feb 15 17:13:41 2021
+## Date of summary: Mon Feb 15 17:13:41 2021
##
## Equations:
## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -439,7 +438,7 @@
##
## Model predictions using solution type analytical
##
-## Fitted using 581 model solutions performed in 0.136 s
+## Fitted using 581 model solutions performed in 0.134 s
##
## Error model: Constant variance
##
@@ -470,18 +469,18 @@
## Optimised, transformed parameters with symmetric confidence intervals:
## Estimate Std. Error Lower Upper
## parent_0 93.950 9.998e-01 91.5900 96.3100
-## log_k1 3.117 1.929e+03 -4558.0000 4564.0000
+## log_k1 3.112 1.842e+03 -4353.0000 4359.0000
## log_k2 -1.088 6.285e-02 -1.2370 -0.9394
## g_qlogis -0.399 9.946e-02 -0.6342 -0.1638
## sigma 1.414 2.886e-01 0.7314 2.0960
##
## Parameter correlation:
-## parent_0 log_k1 log_k2 g_qlogis sigma
-## parent_0 1.000e+00 6.459e-07 9.147e-11 2.665e-01 8.413e-11
-## log_k1 6.459e-07 1.000e+00 1.061e-04 -2.087e-04 -9.802e-06
-## log_k2 9.147e-11 1.061e-04 1.000e+00 -7.903e-01 -2.429e-09
-## g_qlogis 2.665e-01 -2.087e-04 -7.903e-01 1.000e+00 4.049e-09
-## sigma 8.413e-11 -9.802e-06 -2.429e-09 4.049e-09 1.000e+00
+## parent_0 log_k1 log_k2 g_qlogis sigma
+## parent_0 1.000e+00 6.783e-07 -3.390e-10 2.665e-01 -2.967e-10
+## log_k1 6.783e-07 1.000e+00 1.116e-04 -2.196e-04 -1.031e-05
+## log_k2 -3.390e-10 1.116e-04 1.000e+00 -7.903e-01 2.917e-09
+## g_qlogis 2.665e-01 -2.196e-04 -7.903e-01 1.000e+00 -4.408e-09
+## sigma -2.967e-10 -1.031e-05 2.917e-09 -4.408e-09 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
@@ -489,7 +488,7 @@
## for estimators of untransformed parameters.
## Estimate t value Pr(>t) Lower Upper
## parent_0 93.9500 9.397e+01 2.036e-12 91.5900 96.3100
-## k1 22.5800 5.303e-04 4.998e-01 0.0000 Inf
+## k1 22.4800 5.553e-04 4.998e-01 0.0000 Inf
## k2 0.3369 1.591e+01 4.697e-07 0.2904 0.3909
## g 0.4016 1.680e+01 3.238e-07 0.3466 0.4591
## sigma 1.4140 4.899e+00 8.776e-04 0.7314 2.0960
@@ -501,7 +500,7 @@
##
## Estimated disappearance times:
## DT50 DT90 DT50back DT50_k1 DT50_k2
-## parent 0.5335 5.311 1.599 0.0307 2.058
+## parent 0.5335 5.311 1.599 0.03084 2.058
Here, the DFOP model is clearly the best-fit model for dataset L2 based on the chi^2 error level criterion. However, the failure to calculate the covariance matrix indicates that the parameter estimates correlate excessively. Therefore, the FOMC model may be preferred for this dataset.
We can extract the summary and plot for e.g. the DFOP fit, using square brackets for indexing which will result in the use of the summary and plot functions working on mkinfit objects.
summary(mm.L3[["DFOP", 1]])## mkin version used for fitting: 0.9.50.4
+## 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:55 2020
-## Date of summary: Mon Nov 30 16:01:55 2020
+## Date of fit: Mon Feb 15 17:13:41 2021
+## Date of summary: Mon Feb 15 17:13:42 2021
##
## Equations:
## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -545,7 +544,7 @@
##
## Model predictions using solution type analytical
##
-## Fitted using 376 model solutions performed in 0.081 s
+## Fitted using 376 model solutions performed in 0.082 s
##
## Error model: Constant variance
##
@@ -583,11 +582,11 @@
##
## Parameter correlation:
## parent_0 log_k1 log_k2 g_qlogis sigma
-## parent_0 1.000e+00 1.732e-01 2.282e-02 4.009e-01 -9.671e-08
-## log_k1 1.732e-01 1.000e+00 4.945e-01 -5.809e-01 7.148e-07
+## parent_0 1.000e+00 1.732e-01 2.282e-02 4.009e-01 -9.664e-08
+## log_k1 1.732e-01 1.000e+00 4.945e-01 -5.809e-01 7.147e-07
## log_k2 2.282e-02 4.945e-01 1.000e+00 -6.812e-01 1.022e-06
-## g_qlogis 4.009e-01 -5.809e-01 -6.812e-01 1.000e+00 -7.929e-07
-## sigma -9.671e-08 7.148e-07 1.022e-06 -7.929e-07 1.000e+00
+## g_qlogis 4.009e-01 -5.809e-01 -6.812e-01 1.000e+00 -7.926e-07
+## sigma -9.664e-08 7.147e-07 1.022e-06 -7.926e-07 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
@@ -646,10 +645,10 @@
The \(\chi^2\) error level of 3.3% as well as the plot suggest that the SFO model fits very well. The error level at which the \(\chi^2\) test passes is slightly lower for the FOMC model. However, the difference appears negligible.
summary(mm.L4[["SFO", 1]], data = FALSE)
-## mkin version used for fitting: 0.9.50.4
+## 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:55 2020
-## Date of summary: Mon Nov 30 16:01:55 2020
+## Date of fit: Mon Feb 15 17:13:42 2021
+## Date of summary: Mon Feb 15 17:13:42 2021
##
## Equations:
## d_parent/dt = - k_parent * parent
@@ -711,17 +710,17 @@
## parent 106 352
summary(mm.L4[["FOMC", 1]], data = FALSE)
-## mkin version used for fitting: 0.9.50.4
+## 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:55 2020
-## Date of summary: Mon Nov 30 16:01:56 2020
+## Date of fit: Mon Feb 15 17:13:42 2021
+## Date of summary: Mon Feb 15 17:13:42 2021
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted using 224 model solutions performed in 0.045 s
+## Fitted using 224 model solutions performed in 0.046 s
##
## Error model: Constant variance
##
@@ -756,10 +755,10 @@
##
## Parameter correlation:
## parent_0 log_alpha log_beta sigma
-## parent_0 1.000e+00 -4.696e-01 -5.543e-01 -2.456e-07
-## log_alpha -4.696e-01 1.000e+00 9.889e-01 2.169e-08
-## log_beta -5.543e-01 9.889e-01 1.000e+00 4.910e-08
-## sigma -2.456e-07 2.169e-08 4.910e-08 1.000e+00
+## parent_0 1.000e+00 -4.696e-01 -5.543e-01 -2.468e-07
+## log_alpha -4.696e-01 1.000e+00 9.889e-01 2.478e-08
+## log_beta -5.543e-01 9.889e-01 1.000e+00 5.211e-08
+## sigma -2.468e-07 2.478e-08 5.211e-08 1.000e+00
##
## Backtransformed parameters:
## Confidence intervals for internally transformed parameters are asymmetric.
@@ -783,7 +782,7 @@
References
-
+
Ranke, Johannes. 2014. “Prüfung und Validierung von Modellierungssoftware als Alternative zu ModelMaker 4.0.” Umweltbundesamt Projektnummer 27452.
diff --git a/docs/dev/articles/FOCUS_L_files/accessible-code-block-0.0.1/empty-anchor.js b/docs/dev/articles/FOCUS_L_files/accessible-code-block-0.0.1/empty-anchor.js
new file mode 100644
index 00000000..ca349fd6
--- /dev/null
+++ b/docs/dev/articles/FOCUS_L_files/accessible-code-block-0.0.1/empty-anchor.js
@@ -0,0 +1,15 @@
+// Hide empty tag within highlighted CodeBlock for screen reader accessibility (see https://github.com/jgm/pandoc/issues/6352#issuecomment-626106786) -->
+// v0.0.1
+// Written by JooYoung Seo (jooyoung@psu.edu) and Atsushi Yasumoto on June 1st, 2020.
+
+document.addEventListener('DOMContentLoaded', function() {
+ const codeList = document.getElementsByClassName("sourceCode");
+ for (var i = 0; i < codeList.length; i++) {
+ var linkList = codeList[i].getElementsByTagName('a');
+ for (var j = 0; j < linkList.length; j++) {
+ if (linkList[j].innerHTML === "") {
+ linkList[j].setAttribute('aria-hidden', 'true');
+ }
+ }
+ }
+});
diff --git a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-10-1.png b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-10-1.png
index 811c800e..e9c0b0a0 100644
Binary files a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-10-1.png and b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-10-1.png differ
diff --git a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-12-1.png b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-12-1.png
index 4c02b097..3e03954d 100644
Binary files a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-12-1.png and b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-12-1.png differ
diff --git a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-13-1.png b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-13-1.png
index 1aa97f8c..8c9e8fd4 100644
Binary files a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-13-1.png and b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-13-1.png differ
diff --git a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-15-1.png b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-15-1.png
index 36e862f6..b3aa8334 100644
Binary files a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-15-1.png and b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-15-1.png differ
diff --git a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-4-1.png b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-4-1.png
index 68b24b5e..477829a5 100644
Binary files a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-4-1.png and b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-4-1.png differ
diff --git a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png
index 53e33b68..c0e08884 100644
Binary files a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png and b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png differ
diff --git a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-8-1.png b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-8-1.png
index 47d5b335..310b4f3b 100644
Binary files a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-8-1.png and b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-8-1.png differ
diff --git a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-9-1.png b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-9-1.png
index f644c299..570f0026 100644
Binary files a/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-9-1.png and b/docs/dev/articles/FOCUS_L_files/figure-html/unnamed-chunk-9-1.png differ
diff --git a/docs/dev/articles/FOCUS_L_files/header-attrs-2.6/header-attrs.js b/docs/dev/articles/FOCUS_L_files/header-attrs-2.6/header-attrs.js
new file mode 100644
index 00000000..dd57d92e
--- /dev/null
+++ b/docs/dev/articles/FOCUS_L_files/header-attrs-2.6/header-attrs.js
@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+ var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+ var i, h, a;
+ for (i = 0; i < hs.length; i++) {
+ h = hs[i];
+ if (!/^h[1-6]$/i.test(h.tagName)) continue; // it should be a header h1-h6
+ a = h.attributes;
+ while (a.length > 0) h.removeAttribute(a[0].name);
+ }
+});
diff --git a/docs/dev/articles/index.html b/docs/dev/articles/index.html
index 57d0c0eb..17ee4a69 100644
--- a/docs/dev/articles/index.html
+++ b/docs/dev/articles/index.html
@@ -71,7 +71,7 @@
mkin
- 1.0.2.9000
+ 1.0.3.9000
diff --git a/docs/dev/articles/mkin.html b/docs/dev/articles/mkin.html
index 2de8b9f0..fed85a33 100644
--- a/docs/dev/articles/mkin.html
+++ b/docs/dev/articles/mkin.html
@@ -32,7 +32,7 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -81,7 +81,7 @@
-
-
+
@@ -95,14 +95,13 @@
-
-
+
Introduction to mkin
Johannes Ranke
- 2020-11-30
+ Last change 15 February 2021 (rebuilt 2021-02-15)
Source: vignettes/mkin.rmd
mkin.rmd
@@ -150,28 +149,34 @@
Background
-Many approaches are possible regarding the evaluation of chemical degradation data.
-The mkin package (Ranke 2019) implements the approach recommended in the kinetics report provided by the FOrum for Co-ordination of pesticide fate models and their USe (FOCUS Work Group on Degradation Kinetics 2006, 2014) for simple decline data series, data series with transformation products, commonly termed metabolites, and for data series for more than one compartment. It is also possible to include back reactions, so equilibrium reactions and equilibrium partitioning can be specified, although this oftentimes leads to an overparameterisation of the model.
+The mkin package (Ranke 2021) implements the approach to degradation kinetics recommended in the kinetics report provided by the FOrum for Co-ordination of pesticide fate models and their USe (FOCUS Work Group on Degradation Kinetics 2006, 2014). It covers data series describing the decline of one compound, data series with transformation products (commonly termed metabolites) and data series for more than one compartment. It is possible to include back reactions. Therefore, equilibrium reactions and equilibrium partitioning can be specified, although this often leads to an overparameterisation of the model.
When the first mkin code was published in 2010, the most commonly used tools for fitting more complex kinetic degradation models to experimental data were KinGUI (Schäfer et al. 2007), a MATLAB based tool with a graphical user interface that was specifically tailored to the task and included some output as proposed by the FOCUS Kinetics Workgroup, and ModelMaker, a general purpose compartment based tool providing infrastructure for fitting dynamic simulation models based on differential equations to data.
-The code was first uploaded to the BerliOS platform. When this was taken down, the version control history was imported into the R-Forge site (see e.g. the initial commit on 11 May 2010), where the code is still occasionally updated.
-At that time, the R package FME (Flexible Modelling Environment) (Soetaert and Petzoldt 2010) was already available, and provided a good basis for developing a package specifically tailored to the task. The remaining challenge was to make it as easy as possible for the users (including the author of this vignette) to specify the system of differential equations and to include the output requested by the FOCUS guidance, such as the relative standard deviation that has to be assumed for the residuals, such that the \(\chi^2\) goodness-of-fit test as defined by the FOCUS kinetics workgroup would pass using an significance level \(\alpha\) of 0.05. This relative error, expressed as a percentage, is often termed \(\chi^2\) error level or similar.
-Also, mkin introduced using analytical solutions for parent only kinetics for improved optimization speed. Later, Eigenvalue based solutions were introduced to mkin for the case of linear differential equations (i.e. where the FOMC or DFOP models were not used for the parent compound), greatly improving the optimization speed for these cases. This, however, has become somehow obsolete, as the use of compiled code described below gives even smaller execution times.
+The ‘mkin’ code was first uploaded to the BerliOS development platform. When this was taken down, the version control history was imported into the R-Forge site (see e.g. the initial commit on 11 May 2010), where the code is still being updated.
+At that time, the R package FME (Flexible Modelling Environment) (Soetaert and Petzoldt 2010) was already available, and provided a good basis for developing a package specifically tailored to the task. The remaining challenge was to make it as easy as possible for the users (including the author of this vignette) to specify the system of differential equations and to include the output requested by the FOCUS guidance, such as the \(\chi^2\) error level as defined in this guidance.
+Also, mkin introduced using analytical solutions for parent only kinetics for improved optimization speed. Later, Eigenvalue based solutions were introduced to mkin for the case of linear differential equations (i.e. where the FOMC or DFOP models were not used for the parent compound), greatly improving the optimization speed for these cases. This, has become somehow obsolete, as the use of compiled code described below gives even faster execution times.
The possibility to specify back-reactions and a biphasic model (SFORB) for metabolites were present in mkin from the very beginning.
Derived software tools
-Soon after the publication of mkin, two derived tools were published, namely KinGUII (available from Bayer Crop Science) and CAKE (commissioned to Tessella by Syngenta), which added a graphical user interface (GUI), and added fitting by iteratively reweighted least squares (IRLS) and characterisation of likely parameter distributions by Markov Chain Monte Carlo (MCMC) sampling.
-CAKE focuses on a smooth use experience, sacrificing some flexibility in the model definition, originally allowing only two primary metabolites in parallel. The current version 3.3 of CAKE release in March 2016 uses a basic scheme for up to six metabolites in a flexible arrangement, but does not support back-reactions (non-instantaneous equilibria) or biphasic kinetics for metabolites.
+Soon after the publication of mkin, two derived tools were published, namely KinGUII (developed at Bayer Crop Science) and CAKE (commissioned to Tessella by Syngenta), which added a graphical user interface (GUI), and added fitting by iteratively reweighted least squares (IRLS) and characterisation of likely parameter distributions by Markov Chain Monte Carlo (MCMC) sampling.
+CAKE focuses on a smooth use experience, sacrificing some flexibility in the model definition, originally allowing only two primary metabolites in parallel. The current version 3.4 of CAKE released in May 2020 uses a scheme for up to six metabolites in a flexible arrangement and supports biphasic modelling of metabolites, but does not support back-reactions (non-instantaneous equilibria).
KinGUI offers an even more flexible widget for specifying complex kinetic models. Back-reactions (non-instantaneous equilibria) were supported early on, but until 2014, only simple first-order models could be specified for transformation products. Starting with KinGUII version 2.1, biphasic modelling of metabolites was also available in KinGUII.
A further graphical user interface (GUI) that has recently been brought to a decent degree of maturity is the browser based GUI named gmkin. Please see its documentation page and manual for further information.
A comparison of scope, usability and numerical results obtained with these tools has been recently been published by Ranke, Wöltjen, and Meinecke (2018).
-
-
-Recent developments
-Currently (July 2019), the main features available in mkin which are not present in KinGUII or CAKE, are the speed increase by using compiled code when a compiler is present, parallel model fitting on multicore machines using the mmkin function, and the estimation of parameter confidence intervals based on transformed parameters.
-In addition, the possibility to use two alternative error models to constant variance have been integrated. The variance by variable error model introduced by Gao et al. (2011) has been available via an iteratively reweighted least squares (IRLS) procedure since mkin version 0.9-22. With release 0.9.49.5, the IRLS algorithm has been replaced by direct or step-wise maximisation of the likelihood function, which makes it possible not only to fit the variance by variable error model but also a two-component error model inspired by error models developed in analytical chemistry.
+
+
+Unique features
+Currently, the main unique features available in mkin are
+
+- the speed increase by using compiled code when a compiler is present,
+- parallel model fitting on multicore machines using the
mmkin function,
+- the estimation of parameter confidence intervals based on transformed parameters (see below) and
+- the possibility to use the two-component error model
+
+
+The iteratively reweighted least squares fitting of different variances for each variable as introduced by Gao et al. (2011) has been available in mkin since version 0.9-22. With release 0.9.49.5, the IRLS algorithm has been complemented by direct or step-wise maximisation of the likelihood function, which makes it possible not only to fit the variance by variable error model but also a two-component error model inspired by error models developed in analytical chemistry (Ranke and Meinecke 2019).
@@ -179,13 +184,13 @@
For rate constants, the log transformation is used, as proposed by Bates and Watts (1988, 77, 149). Approximate intervals are constructed for the transformed rate constants (compare Bates and Watts 1988, 135), i.e. for their logarithms. Confidence intervals for the rate constants are then obtained using the appropriate backtransformation using the exponential function.
In the first version of mkin allowing for specifying models using formation fractions, a home-made reparameterisation was used in order to ensure that the sum of formation fractions would not exceed unity.
This method is still used in the current version of KinGUII (v2.1 from April 2014), with a modification that allows for fixing the pathway to sink to zero. CAKE uses penalties in the objective function in order to enforce this constraint.
-In 2012, an alternative reparameterisation of the formation fractions was proposed together with René Lehmann (Ranke and Lehmann 2012), based on isometric logratio transformation (ILR). The aim was to improve the validity of the linear approximation of the objective function during the parameter estimation procedure as well as in the subsequent calculation of parameter confidence intervals.
+In 2012, an alternative reparameterisation of the formation fractions was proposed together with René Lehmann (Ranke and Lehmann 2012), based on isometric logratio transformation (ILR). The aim was to improve the validity of the linear approximation of the objective function during the parameter estimation procedure as well as in the subsequent calculation of parameter confidence intervals. In the current version of mkin, a logit transformation is used for parameters that are bound between 0 and 1, such as the g parameter of the DFOP model.
Confidence intervals based on transformed parameters
In the first attempt at providing improved parameter confidence intervals introduced to mkin in 2013, confidence intervals obtained from FME on the transformed parameters were simply all backtransformed one by one to yield asymmetric confidence intervals for the backtransformed parameters.
However, while there is a 1:1 relation between the rate constants in the model and the transformed parameters fitted in the model, the parameters obtained by the isometric logratio transformation are calculated from the set of formation fractions that quantify the paths to each of the compounds formed from a specific parent compound, and no such 1:1 relation exists.
-Therefore, parameter confidence intervals for formation fractions obtained with this method only appear valid for the case of a single transformation product, where only one formation fraction is to be estimated, directly corresponding to one component of the ilr transformed parameter.
+Therefore, parameter confidence intervals for formation fractions obtained with this method only appear valid for the case of a single transformation product, where currently the logit transformation is used for the formation fraction.
The confidence intervals obtained by backtransformation for the cases where a 1:1 relation between transformed and original parameter exist are considered by the author of this vignette to be more accurate than those obtained using a re-estimation of the Hessian matrix after backtransformation, as implemented in the FME package.
@@ -200,36 +205,39 @@
References
-
+
Bates, D., and D. Watts. 1988. Nonlinear Regression and Its Applications. Wiley-Interscience.
-FOCUS Work Group on Degradation Kinetics. 2006. Guidance Document on Estimating Persistence and Degradation Kinetics from Environmental Fate Studies on Pesticides in Eu Registration. Report of the Focus Work Group on Degradation Kinetics. http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics.
+FOCUS Work Group on Degradation Kinetics. 2006. Guidance Document on Estimating Persistence and Degradation Kinetics from Environmental Fate Studies on Pesticides in Eu Registration. Report of the Focus Work Group on Degradation Kinetics. http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics.
-———. 2014. Generic Guidance for Estimating Persistence and Degradation Kinetics from Environmental Fate Studies on Pesticides in Eu Registration. 1.1 ed. http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics.
+———. 2014. Generic Guidance for Estimating Persistence and Degradation Kinetics from Environmental Fate Studies on Pesticides in Eu Registration. 1.1 ed. http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics.
-Gao, Z., J.W. Green, J. Vanderborght, and W. Schmitt. 2011. “Improving Uncertainty Analysis in Kinetic Evaluations Using Iteratively Reweighted Least Squares.” Journal. Environmental Science and Technology 45: 4429–37.
+Gao, Z., J. W. Green, J. Vanderborght, and W. Schmitt. 2011. “Improving Uncertainty Analysis in Kinetic Evaluations Using Iteratively Reweighted Least Squares.” Journal. Environmental Science and Technology 45: 4429–37.
-Ranke, J. 2019. ‘mkin‘: Kinetic Evaluation of Chemical Degradation Data. https://CRAN.R-project.org/package=mkin.
+Ranke, J. 2021. ‘mkin‘: Kinetic Evaluation of Chemical Degradation Data. https://CRAN.R-project.org/package=mkin.
Ranke, J., and R. Lehmann. 2012. “Parameter Reliability in Kinetic Evaluation of Environmental Metabolism Data - Assessment and the Influence of Model Specification.” In SETAC World 20-24 May. Berlin.
-———. 2015. “To T-Test or Not to T-Test, That Is the Question.” In XV Symposium on Pesticide Chemistry 2-4 September 2015. Piacenza. http://chem.uft.uni-bremen.de/ranke/posters/piacenza_2015.pdf.
+———. 2015. “To T-Test or Not to T-Test, That Is the Question.” In XV Symposium on Pesticide Chemistry 2-4 September 2015. Piacenza. http://chem.uft.uni-bremen.de/ranke/posters/piacenza_2015.pdf.
+
+
+Ranke, Johannes, and Stefan Meinecke. 2019. “Error Models for the Kinetic Evaluation of Chemical Degradation Data.” Environments 6 (12). https://doi.org/10.3390/environments6120124.
-Ranke, Johannes, Janina Wöltjen, and Stefan Meinecke. 2018. “Comparison of Software Tools for Kinetic Evaluation of Chemical Degradation Data.” Environmental Sciences Europe 30 (1): 17. https://doi.org/10.1186/s12302-018-0145-1.
+Ranke, Johannes, Janina Wöltjen, and Stefan Meinecke. 2018. “Comparison of Software Tools for Kinetic Evaluation of Chemical Degradation Data.” Environmental Sciences Europe 30 (1): 17. https://doi.org/10.1186/s12302-018-0145-1.
Schäfer, D., B. Mikolasch, P. Rainbird, and B. Harvey. 2007. “KinGUI: A New Kinetic Software Tool for Evaluations According to FOCUS Degradation Kinetics.” In Proceedings of the Xiii Symposium Pesticide Chemistry, edited by Del Re A. A. M., Capri E., Fragoulis G., and Trevisan M., 916–23. Piacenza.
-Soetaert, Karline, and Thomas Petzoldt. 2010. “Inverse Modelling, Sensitivity and Monte Carlo Analysis in R Using Package FME.” Journal of Statistical Software 33 (3): 1–28. https://www.jstatsoft.org/v33/i03/.
+Soetaert, Karline, and Thomas Petzoldt. 2010. “Inverse Modelling, Sensitivity and Monte Carlo Analysis in R Using Package FME.” Journal of Statistical Software 33 (3): 1–28. https://www.jstatsoft.org/v33/i03/.
diff --git a/docs/dev/articles/mkin_files/accessible-code-block-0.0.1/empty-anchor.js b/docs/dev/articles/mkin_files/accessible-code-block-0.0.1/empty-anchor.js
new file mode 100644
index 00000000..ca349fd6
--- /dev/null
+++ b/docs/dev/articles/mkin_files/accessible-code-block-0.0.1/empty-anchor.js
@@ -0,0 +1,15 @@
+// Hide empty tag within highlighted CodeBlock for screen reader accessibility (see https://github.com/jgm/pandoc/issues/6352#issuecomment-626106786) -->
+// v0.0.1
+// Written by JooYoung Seo (jooyoung@psu.edu) and Atsushi Yasumoto on June 1st, 2020.
+
+document.addEventListener('DOMContentLoaded', function() {
+ const codeList = document.getElementsByClassName("sourceCode");
+ for (var i = 0; i < codeList.length; i++) {
+ var linkList = codeList[i].getElementsByTagName('a');
+ for (var j = 0; j < linkList.length; j++) {
+ if (linkList[j].innerHTML === "") {
+ linkList[j].setAttribute('aria-hidden', 'true');
+ }
+ }
+ }
+});
diff --git a/docs/dev/articles/mkin_files/figure-html/unnamed-chunk-2-1.png b/docs/dev/articles/mkin_files/figure-html/unnamed-chunk-2-1.png
index 9b82cd62..bf38fdd7 100644
Binary files a/docs/dev/articles/mkin_files/figure-html/unnamed-chunk-2-1.png and b/docs/dev/articles/mkin_files/figure-html/unnamed-chunk-2-1.png differ
diff --git a/docs/dev/articles/mkin_files/header-attrs-2.6/header-attrs.js b/docs/dev/articles/mkin_files/header-attrs-2.6/header-attrs.js
new file mode 100644
index 00000000..dd57d92e
--- /dev/null
+++ b/docs/dev/articles/mkin_files/header-attrs-2.6/header-attrs.js
@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+ var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+ var i, h, a;
+ for (i = 0; i < hs.length; i++) {
+ h = hs[i];
+ if (!/^h[1-6]$/i.test(h.tagName)) continue; // it should be a header h1-h6
+ a = h.attributes;
+ while (a.length > 0) h.removeAttribute(a[0].name);
+ }
+});
diff --git a/docs/dev/articles/twa.html b/docs/dev/articles/twa.html
index 42ed6fa5..30eeb5a6 100644
--- a/docs/dev/articles/twa.html
+++ b/docs/dev/articles/twa.html
@@ -32,7 +32,7 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -81,7 +81,7 @@
-
-
+
@@ -95,14 +95,13 @@
-
-
+
Calculation of time weighted average concentrations with mkin
Johannes Ranke
- 2020-11-30
+ Last change 18 September 2019 (rebuilt 2021-02-15)
Source: vignettes/twa.rmd
twa.rmd
@@ -143,9 +142,9 @@
\frac{1}{k_1} \left( 1 - e^{- k_1 t_b} \right) +
\frac{e^{- k_1 t_b}}{k_2} \left( 1 - e^{- k_2 (t - t_b)} \right) \right) \]
Note that a method for calculating maximum moving window time weighted average concentrations for a model fitted by ‘mkinfit’ or from parent decline model parameters is included in the max_twa_parent() function. If the same is needed for metabolites, the function pfm::max_twa() from the ‘pfm’ package can be used.
-
+
-FOCUS Work Group on Degradation Kinetics. 2014. Generic Guidance for Estimating Persistence and Degradation Kinetics from Environmental Fate Studies on Pesticides in Eu Registration. 1.1 ed. http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics.
+FOCUS Work Group on Degradation Kinetics. 2014. Generic Guidance for Estimating Persistence and Degradation Kinetics from Environmental Fate Studies on Pesticides in Eu Registration. 1.1 ed. http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics.
diff --git a/docs/dev/articles/twa_files/accessible-code-block-0.0.1/empty-anchor.js b/docs/dev/articles/twa_files/accessible-code-block-0.0.1/empty-anchor.js
new file mode 100644
index 00000000..ca349fd6
--- /dev/null
+++ b/docs/dev/articles/twa_files/accessible-code-block-0.0.1/empty-anchor.js
@@ -0,0 +1,15 @@
+// Hide empty tag within highlighted CodeBlock for screen reader accessibility (see https://github.com/jgm/pandoc/issues/6352#issuecomment-626106786) -->
+// v0.0.1
+// Written by JooYoung Seo (jooyoung@psu.edu) and Atsushi Yasumoto on June 1st, 2020.
+
+document.addEventListener('DOMContentLoaded', function() {
+ const codeList = document.getElementsByClassName("sourceCode");
+ for (var i = 0; i < codeList.length; i++) {
+ var linkList = codeList[i].getElementsByTagName('a');
+ for (var j = 0; j < linkList.length; j++) {
+ if (linkList[j].innerHTML === "") {
+ linkList[j].setAttribute('aria-hidden', 'true');
+ }
+ }
+ }
+});
diff --git a/docs/dev/articles/twa_files/header-attrs-2.6/header-attrs.js b/docs/dev/articles/twa_files/header-attrs-2.6/header-attrs.js
new file mode 100644
index 00000000..dd57d92e
--- /dev/null
+++ b/docs/dev/articles/twa_files/header-attrs-2.6/header-attrs.js
@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+ var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+ var i, h, a;
+ for (i = 0; i < hs.length; i++) {
+ h = hs[i];
+ if (!/^h[1-6]$/i.test(h.tagName)) continue; // it should be a header h1-h6
+ a = h.attributes;
+ while (a.length > 0) h.removeAttribute(a[0].name);
+ }
+});
diff --git a/docs/dev/articles/web_only/FOCUS_Z.html b/docs/dev/articles/web_only/FOCUS_Z.html
index 15c41eb7..694b33ca 100644
--- a/docs/dev/articles/web_only/FOCUS_Z.html
+++ b/docs/dev/articles/web_only/FOCUS_Z.html
@@ -32,7 +32,7 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -81,7 +81,7 @@
-
-
+
@@ -95,14 +95,13 @@
-
-
+
Example evaluation of FOCUS dataset Z
Johannes Ranke
- 2020-11-30
+ Last change 16 January 2018 (rebuilt 2021-02-15)
Source: vignettes/web_only/FOCUS_Z.rmd
FOCUS_Z.rmd
@@ -239,12 +238,12 @@
summary(m.Z.FOCUS, data = FALSE)$bpar
## Estimate se_notrans t value Pr(>t) Lower Upper
-## Z0_0 96.839001 1.994273 48.5585 4.0276e-42 92.827060 100.850943
-## k_Z0 2.215367 0.118456 18.7021 1.0410e-23 1.989432 2.466960
-## k_Z1 0.478310 0.028258 16.9265 6.2430e-22 0.424712 0.538673
-## k_Z2 0.451628 0.042139 10.7176 1.6313e-14 0.374337 0.544877
-## k_Z3 0.058692 0.015245 3.8498 1.7806e-04 0.034806 0.098972
-## f_Z2_to_Z3 0.471498 0.058350 8.0805 9.6614e-11 0.357741 0.588294
+## Z0_0 96.838822 1.994274 48.5584 4.0280e-42 92.826981 100.850664
+## k_Z0 2.215393 0.118458 18.7019 1.0413e-23 1.989456 2.466989
+## k_Z1 0.478305 0.028258 16.9266 6.2418e-22 0.424708 0.538666
+## k_Z2 0.451627 0.042139 10.7176 1.6314e-14 0.374339 0.544872
+## k_Z3 0.058692 0.015245 3.8499 1.7803e-04 0.034808 0.098965
+## f_Z2_to_Z3 0.471502 0.058351 8.0805 9.6608e-11 0.357769 0.588274
## sigma 3.984431 0.383402 10.3923 4.5575e-14 3.213126 4.755736
endpoints(m.Z.FOCUS)
@@ -255,9 +254,9 @@
## $distimes
## DT50 DT90
## Z0 0.31288 1.0394
-## Z1 1.44916 4.8140
+## Z1 1.44917 4.8141
## Z2 1.53478 5.0984
-## Z3 11.80983 39.2314
+## Z3 11.80986 39.2315
This fit corresponds to the final result chosen in Appendix 7 of the FOCUS report. Confidence intervals returned by mkin are based on internally transformed parameters, however.
@@ -353,13 +352,13 @@
##
## $SFORB
## Z0_b1 Z0_b2 Z3_b1 Z3_b2
-## 2.4471371 0.0075126 0.0800070 0.0000000
+## 2.4471322 0.0075125 0.0800069 0.0000000
##
## $distimes
## DT50 DT90 DT50back DT50_Z0_b1 DT50_Z0_b2 DT50_Z3_b1 DT50_Z3_b2
-## Z0 0.3043 1.1848 0.35666 0.28325 92.265 NA NA
+## Z0 0.3043 1.1848 0.35666 0.28325 92.266 NA NA
## Z1 1.5148 5.0320 NA NA NA NA NA
-## Z2 1.6414 5.4525 NA NA NA NA NA
+## Z2 1.6414 5.4526 NA NA NA NA NA
## Z3 NA NA NA NA NA 8.6636 Inf
It is clear the degradation rate of Z3 towards the end of the experiment is very low as DT50_Z3_b2 (the second Eigenvalue of the system of two differential equations representing the SFORB system for Z3, corresponding to the slower rate constant of the DFOP model) is reported to be infinity. However, this appears to be a feature of the data.
@@ -367,9 +366,9 @@
References
-
+
-FOCUS Work Group on Degradation Kinetics. 2014. Generic Guidance for Estimating Persistence and Degradation Kinetics from Environmental Fate Studies on Pesticides in Eu Registration. 1.1 ed. http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics.
+FOCUS Work Group on Degradation Kinetics. 2014. Generic Guidance for Estimating Persistence and Degradation Kinetics from Environmental Fate Studies on Pesticides in Eu Registration. 1.1 ed. http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics.
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/accessible-code-block-0.0.1/empty-anchor.js b/docs/dev/articles/web_only/FOCUS_Z_files/accessible-code-block-0.0.1/empty-anchor.js
new file mode 100644
index 00000000..ca349fd6
--- /dev/null
+++ b/docs/dev/articles/web_only/FOCUS_Z_files/accessible-code-block-0.0.1/empty-anchor.js
@@ -0,0 +1,15 @@
+// Hide empty tag within highlighted CodeBlock for screen reader accessibility (see https://github.com/jgm/pandoc/issues/6352#issuecomment-626106786) -->
+// v0.0.1
+// Written by JooYoung Seo (jooyoung@psu.edu) and Atsushi Yasumoto on June 1st, 2020.
+
+document.addEventListener('DOMContentLoaded', function() {
+ const codeList = document.getElementsByClassName("sourceCode");
+ for (var i = 0; i < codeList.length; i++) {
+ var linkList = codeList[i].getElementsByTagName('a');
+ for (var j = 0; j < linkList.length; j++) {
+ if (linkList[j].innerHTML === "") {
+ linkList[j].setAttribute('aria-hidden', 'true');
+ }
+ }
+ }
+});
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png
index 575def46..2213c446 100644
Binary files a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png and b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png
index 22305ab1..61b04d3a 100644
Binary files a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png and b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png
index 2213f493..409f1203 100644
Binary files a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png and b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png
index fc5e5556..4d6820cd 100644
Binary files a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png and b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png
index 5c29341c..2e504961 100644
Binary files a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png and b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png
index 575def46..2213c446 100644
Binary files a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png and b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png
index 98ce34a7..7ab743af 100644
Binary files a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png and b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png
index d04a411e..2e0dce77 100644
Binary files a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png and b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png
index 29a74490..458299c1 100644
Binary files a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png and b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png
index 0acfa2a4..eb833066 100644
Binary files a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png and b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png
index ca191b00..e7501cbb 100644
Binary files a/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png and b/docs/dev/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png differ
diff --git a/docs/dev/articles/web_only/FOCUS_Z_files/header-attrs-2.6/header-attrs.js b/docs/dev/articles/web_only/FOCUS_Z_files/header-attrs-2.6/header-attrs.js
new file mode 100644
index 00000000..dd57d92e
--- /dev/null
+++ b/docs/dev/articles/web_only/FOCUS_Z_files/header-attrs-2.6/header-attrs.js
@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+ var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+ var i, h, a;
+ for (i = 0; i < hs.length; i++) {
+ h = hs[i];
+ if (!/^h[1-6]$/i.test(h.tagName)) continue; // it should be a header h1-h6
+ a = h.attributes;
+ while (a.length > 0) h.removeAttribute(a[0].name);
+ }
+});
diff --git a/docs/dev/articles/web_only/NAFTA_examples.html b/docs/dev/articles/web_only/NAFTA_examples.html
index fca15672..b9784415 100644
--- a/docs/dev/articles/web_only/NAFTA_examples.html
+++ b/docs/dev/articles/web_only/NAFTA_examples.html
@@ -32,7 +32,7 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -81,7 +81,7 @@
-
-
+
@@ -95,14 +95,13 @@
-
-
+
Evaluation of example datasets from Attachment 1 to the US EPA SOP for the NAFTA guidance
Johannes Ranke
- 2020-11-30
+ 26 February 2019 (rebuilt 2021-02-15)
Source: vignettes/web_only/NAFTA_examples.rmd
NAFTA_examples.rmd
@@ -158,7 +157,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
##
@@ -167,7 +166,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
@@ -209,7 +208,7 @@
## Estimate Pr(>t) Lower Upper
## parent_0 9.84e+01 1.24e-27 97.8078 98.9187
## k1 1.55e-02 4.10e-04 0.0143 0.0167
-## k2 1.10e-11 5.00e-01 0.0000 Inf
+## k2 8.63e-12 5.00e-01 0.0000 Inf
## g 6.89e-01 2.92e-03 0.6626 0.7142
## sigma 6.48e-01 2.38e-05 0.4147 0.8813
##
@@ -218,7 +217,7 @@
## DT50 DT90 DT50_rep
## SFO 86.6 2.88e+02 8.66e+01
## IORE 85.5 7.17e+02 2.16e+02
-## DFOP 83.6 1.03e+11 6.29e+10
+## DFOP 83.6 1.32e+11 8.04e+10
##
## Representative half-life:
## [1] 215.87
@@ -260,7 +259,7 @@
## Estimate Pr(>t) Lower Upper
## parent_0 9.66e+01 1.57e-25 95.3476 97.8979
## k1 2.55e-02 7.33e-06 0.0233 0.0278
-## k2 3.60e-11 5.00e-01 0.0000 Inf
+## k2 3.22e-11 5.00e-01 0.0000 Inf
## g 8.61e-01 7.55e-06 0.8314 0.8867
## sigma 1.46e+00 6.93e-06 0.9661 1.9483
##
@@ -269,7 +268,7 @@
## DT50 DT90 DT50_rep
## SFO 38.6 1.28e+02 3.86e+01
## IORE 34.0 1.77e+02 5.32e+01
-## DFOP 34.1 9.07e+09 1.93e+10
+## DFOP 34.1 1.01e+10 2.15e+10
##
## Representative half-life:
## [1] 53.17
@@ -311,7 +310,7 @@
## Estimate Pr(>t) Lower Upper
## parent_0 9.89e+01 9.44e-49 95.4640 102.2573
## k1 1.81e-02 1.75e-01 0.0116 0.0281
-## k2 2.89e-10 5.00e-01 0.0000 Inf
+## k2 3.63e-10 5.00e-01 0.0000 Inf
## g 6.06e-01 2.19e-01 0.4826 0.7178
## sigma 7.40e+00 2.97e-15 6.0201 8.7754
##
@@ -320,7 +319,7 @@
## DT50 DT90 DT50_rep
## SFO 94.3 3.13e+02 9.43e+01
## IORE 96.7 1.51e+03 4.55e+02
-## DFOP 96.4 4.75e+09 2.40e+09
+## DFOP 96.4 3.77e+09 1.91e+09
##
## Representative half-life:
## [1] 454.55
@@ -422,7 +421,7 @@
## Estimate Pr(>t) Lower Upper
## parent_0 9.85e+01 2.54e-20 97.390 99.672
## k1 1.38e-01 3.52e-05 0.131 0.146
-## k2 9.03e-13 5.00e-01 0.000 Inf
+## k2 9.02e-13 5.00e-01 0.000 Inf
## g 6.52e-01 8.13e-06 0.642 0.661
## sigma 7.88e-01 6.13e-02 0.481 1.095
##
@@ -431,7 +430,7 @@
## DT50 DT90 DT50_rep
## SFO 16.9 5.63e+01 1.69e+01
## IORE 11.6 3.37e+02 1.01e+02
-## DFOP 10.5 1.38e+12 7.67e+11
+## DFOP 10.5 1.38e+12 7.69e+11
##
## Representative half-life:
## [1] 101.43
@@ -443,15 +442,16 @@
p9b <- nafta(NAFTA_SOP_Attachment[["p9b"]])
## Warning in sqrt(diag(covar)): NaNs produced
+## Warning in sqrt(diag(covar_notrans)): NaNs produced
## Warning in sqrt(1/diag(V)): NaNs produced
## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
## doubtful
## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c
## The half-life obtained from the IORE model may be used
-
+
plot(p9b)

-
+
print(p9b)
## Sums of squares:
## SFO IORE DFOP
@@ -475,12 +475,12 @@
## sigma 1.288 1.76e-04 0.7456 1.830
##
## $DFOP
-## Estimate Pr(>t) Lower Upper
-## parent_0 94.7123 NA 93.1355 96.2891
-## k1 0.0389 NA 0.0266 0.0569
-## k2 0.0389 NA 0.0255 0.0592
-## g 0.5256 NA NA NA
-## sigma 1.5957 NA 0.9135 2.2779
+## Estimate Pr(>t) Lower Upper
+## parent_0 94.7123 1.61e-16 93.1355 96.2891
+## k1 0.0389 1.08e-04 0.0266 0.0569
+## k2 0.0389 2.23e-04 0.0255 0.0592
+## g 0.5256 NaN NA NA
+## sigma 1.5957 2.50e-04 0.9135 2.2779
##
##
## DTx values:
@@ -496,15 +496,18 @@
Example on page 10
-
+
p10 <- nafta(NAFTA_SOP_Attachment[["p10"]])
-## Warning in sqrt(diag(covar_notrans)): NaNs produced
+## Warning in sqrt(diag(covar)): NaNs produced
+## Warning in sqrt(1/diag(V)): NaNs produced
+## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
+## doubtful
## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c
## The half-life obtained from the IORE model may be used
-
+
plot(p10)

-
+
print(p10)
## Sums of squares:
## SFO IORE DFOP
@@ -530,9 +533,9 @@
## $DFOP
## Estimate Pr(>t) Lower Upper
## parent_0 101.7315 1.41e-09 91.6534 111.8097
-## k1 0.0495 5.63e-03 0.0240 0.1020
-## k2 0.0495 1.93e-03 0.0272 0.0903
-## g 0.4487 NaN 0.0000 1.0000
+## k1 0.0495 6.58e-03 0.0303 0.0809
+## k2 0.0495 2.60e-03 0.0410 0.0598
+## g 0.4487 5.00e-01 NA NA
## sigma 8.0152 2.50e-04 4.5886 11.4418
##
##
@@ -553,14 +556,14 @@
Example on page 11
-
+
p11 <- nafta(NAFTA_SOP_Attachment[["p11"]])
## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c
## The half-life obtained from the IORE model may be used
-
+
plot(p11)

-
+
print(p11)
## Sums of squares:
## SFO IORE DFOP
@@ -596,10 +599,10 @@
## DT50 DT90 DT50_rep
## SFO 2.16e+02 7.18e+02 2.16e+02
## IORE 9.73e+02 1.37e+08 4.11e+07
-## DFOP 3.07e+11 1.93e+12 6.97e+11
+## DFOP 3.07e+11 1.93e+12 6.98e+11
##
## Representative half-life:
-## [1] 41148171
+## [1] 41148170
In this case, the DFOP fit reported for PestDF resulted in a negative value for the slower rate constant, which is not possible in mkin. The other results are in agreement.
@@ -610,19 +613,21 @@
Example on page 12, upper panel
-
+
p12a <- nafta(NAFTA_SOP_Attachment[["p12a"]])
## Warning in summary.mkinfit(x): Could not calculate correlation; no covariance
-## matrix
-
-## Warning in summary.mkinfit(x): Could not calculate correlation; no covariance
## matrix
+## Warning in sqrt(diag(covar)): NaNs produced
+## Warning in sqrt(diag(covar_notrans)): NaNs produced
+## Warning in sqrt(1/diag(V)): NaNs produced
+## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
+## doubtful
## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c
## The half-life obtained from the IORE model may be used
-
+
plot(p12a)

-
+
print(p12a)
## Sums of squares:
## SFO IORE DFOP
@@ -646,12 +651,12 @@
## sigma 3.965 NA NA NA
##
## $DFOP
-## Estimate Pr(>t) Lower Upper
-## parent_0 100.521 2.74e-10 NA NA
-## k1 0.124 2.53e-05 NA NA
-## k2 0.124 2.52e-02 NA NA
-## g 0.793 5.00e-01 NA NA
-## sigma 7.048 2.50e-04 NA NA
+## Estimate Pr(>t) Lower Upper
+## parent_0 100.521 2.74e-10 92.2366 108.805
+## k1 0.124 2.53e-05 0.0908 0.170
+## k2 0.124 2.52e-02 0.0456 0.339
+## g 0.793 NaN NA NA
+## sigma 7.048 2.50e-04 4.0349 10.061
##
##
## DTx values:
@@ -666,20 +671,18 @@
Example on page 12, lower panel
-
+
p12b <- nafta(NAFTA_SOP_Attachment[["p12b"]])
-## Warning in sqrt(diag(covar)): NaNs produced
## Warning in qt(alpha/2, rdf): NaNs produced
## Warning in qt(1 - alpha/2, rdf): NaNs produced
-## Warning in sqrt(1/diag(V)): NaNs produced
-## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
-## doubtful
+## Warning in sqrt(diag(covar_notrans)): NaNs produced
+## Warning in pt(abs(tval), rdf, lower.tail = FALSE): NaNs produced
## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c
## The half-life obtained from the IORE model may be used
-
+
plot(p12b)

-
+
print(p12b)
## Sums of squares:
## SFO IORE DFOP
@@ -704,11 +707,11 @@
##
## $DFOP
## Estimate Pr(>t) Lower Upper
-## parent_0 97.6840 NA NaN NaN
-## k1 0.0589 NA NA NA
-## k2 0.0589 NA NA NA
-## g 0.6473 NA NA NA
-## sigma 3.4323 NA NaN NaN
+## parent_0 97.6840 NaN NaN NaN
+## k1 0.0589 NaN NA NA
+## k2 0.0589 NaN NA NA
+## g 0.6473 NaN NA NA
+## sigma 3.4323 NaN NaN NaN
##
##
## DTx values:
@@ -723,18 +726,14 @@
Example on page 13
-
+
p13 <- nafta(NAFTA_SOP_Attachment[["p13"]])
-## Warning in sqrt(diag(covar)): NaNs produced
-## Warning in sqrt(1/diag(V)): NaNs produced
-## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
-## doubtful
## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c
## The half-life obtained from the IORE model may be used
-
+
plot(p13)

-
+
print(p13)
## Sums of squares:
## SFO IORE DFOP
@@ -760,9 +759,9 @@
## $DFOP
## Estimate Pr(>t) Lower Upper
## parent_0 92.73500 NA 8.95e+01 95.92118
-## k1 0.00258 NA 4.25e-04 0.01569
-## k2 0.00258 NA 1.76e-03 0.00379
-## g 0.16452 NA NA NA
+## k1 0.00258 NA 4.14e-04 0.01611
+## k2 0.00258 NA 1.74e-03 0.00383
+## g 0.16452 NA 0.00e+00 1.00000
## sigma 3.41172 NA 2.02e+00 4.79960
##
##
@@ -779,7 +778,7 @@
DT50 not observed in the study and DFOP problems in PestDF
-
+
p14 <- nafta(NAFTA_SOP_Attachment[["p14"]])
## Warning in sqrt(diag(covar)): NaNs produced
## Warning in sqrt(1/diag(V)): NaNs produced
@@ -787,10 +786,10 @@
## doubtful
## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c
## The half-life obtained from the IORE model may be used
-
+
plot(p14)

-
+
print(p14)
## Sums of squares:
## SFO IORE DFOP
@@ -817,7 +816,7 @@
## Estimate Pr(>t) Lower Upper
## parent_0 1.00e+02 2.96e-28 99.40280 101.2768
## k1 9.53e-03 1.20e-01 0.00638 0.0143
-## k2 5.33e-12 5.00e-01 0.00000 Inf
+## k2 6.08e-12 5.00e-01 0.00000 Inf
## g 3.98e-01 2.19e-01 0.30481 0.4998
## sigma 1.17e+00 7.68e-06 0.77406 1.5610
##
@@ -826,7 +825,7 @@
## DT50 DT90 DT50_rep
## SFO 2.48e+02 8.25e+02 2.48e+02
## IORE 4.34e+02 2.22e+04 6.70e+03
-## DFOP 3.48e+10 3.37e+11 1.30e+11
+## DFOP 3.05e+10 2.95e+11 1.14e+11
##
## Representative half-life:
## [1] 6697.44
@@ -835,14 +834,14 @@
N is less than 1 and DFOP fraction parameter is below zero
-
+
p15a <- nafta(NAFTA_SOP_Attachment[["p15a"]])
## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c
## The half-life obtained from the IORE model may be used
-
+
plot(p15a)

-
+
print(p15a)
## Sums of squares:
## SFO IORE DFOP
@@ -866,12 +865,12 @@
## sigma 3.105 1.78e-04 1.795 4.416
##
## $DFOP
-## Estimate Pr(>t) Lower Upper
-## parent_0 97.96751 NA 94.21913 101.7159
-## k1 0.00952 NA 0.00221 0.0411
-## k2 0.00952 NA 0.00626 0.0145
-## g 0.21241 NA 0.00000 1.0000
-## sigma 4.18778 NA 2.39747 5.9781
+## Estimate Pr(>t) Lower Upper
+## parent_0 97.96751 2.85e-13 94.21913 101.7159
+## k1 0.00952 6.28e-02 0.00250 0.0363
+## k2 0.00952 1.27e-04 0.00646 0.0140
+## g 0.21241 5.00e-01 0.00000 1.0000
+## sigma 4.18778 2.50e-04 2.39747 5.9781
##
##
## DTx values:
@@ -882,7 +881,7 @@
##
## Representative half-life:
## [1] 41.33
-
+
p15b <- nafta(NAFTA_SOP_Attachment[["p15b"]])
## Warning in sqrt(diag(covar)): NaNs produced
## Warning in sqrt(1/diag(V)): NaNs produced
@@ -890,10 +889,10 @@
## doubtful
## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c
## The half-life obtained from the IORE model may be used
-
+
plot(p15b)

-
+
print(p15b)
## Sums of squares:
## SFO IORE DFOP
@@ -911,7 +910,7 @@
##
## $IORE
## Estimate Pr(>t) Lower Upper
-## parent_0 99.83 1.81e-16 97.51348 102.14
+## parent_0 99.83 1.81e-16 97.51349 102.14
## k__iore_parent 0.38 3.22e-01 0.00352 41.05
## N_parent 0.00 5.00e-01 -1.07696 1.08
## sigma 2.21 2.57e-04 1.23245 3.19
@@ -938,16 +937,16 @@
The DFOP fraction parameter is greater than 1
-
+
p16 <- nafta(NAFTA_SOP_Attachment[["p16"]])
## The SFO model is rejected as S_SFO is equal or higher than the critical value S_c
## The representative half-life of the IORE model is longer than the one corresponding
## to the terminal degradation rate found with the DFOP model.
## The representative half-life obtained from the DFOP model may be used
-
+
plot(p16)

-
+
print(p16)
## Sums of squares:
## SFO IORE DFOP
@@ -998,7 +997,7 @@
References
-
+
US EPA. 2015. “Standard Operating Procedure for Using the NAFTA Guidance to Calculate Representative Half-Life Values and Characterizing Pesticide Degradation.”
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/accessible-code-block-0.0.1/empty-anchor.js b/docs/dev/articles/web_only/NAFTA_examples_files/accessible-code-block-0.0.1/empty-anchor.js
new file mode 100644
index 00000000..ca349fd6
--- /dev/null
+++ b/docs/dev/articles/web_only/NAFTA_examples_files/accessible-code-block-0.0.1/empty-anchor.js
@@ -0,0 +1,15 @@
+// Hide empty tag within highlighted CodeBlock for screen reader accessibility (see https://github.com/jgm/pandoc/issues/6352#issuecomment-626106786) -->
+// v0.0.1
+// Written by JooYoung Seo (jooyoung@psu.edu) and Atsushi Yasumoto on June 1st, 2020.
+
+document.addEventListener('DOMContentLoaded', function() {
+ const codeList = document.getElementsByClassName("sourceCode");
+ for (var i = 0; i < codeList.length; i++) {
+ var linkList = codeList[i].getElementsByTagName('a');
+ for (var j = 0; j < linkList.length; j++) {
+ if (linkList[j].innerHTML === "") {
+ linkList[j].setAttribute('aria-hidden', 'true');
+ }
+ }
+ }
+});
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png
index 38b251ea..f5420ce8 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png
index 77463495..0ae4bd9f 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png
index ccf8f77a..57a48119 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png
index 6b0dcaf2..c42d45f0 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png
index ce177190..52dea51e 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png
index f2f59ff7..ca1f29be 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png
index c5759a5b..f69e6d3b 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png
index 3640ea68..71fcd257 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png
index b61f28e2..820501a3 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png
index 8d38b89c..e264d2ea 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png
index 3f2da285..e5b656a4 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png
index 37274769..c9664c77 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png
index 515e9095..a81f814c 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png
index ebcc326c..75d72e7c 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png
index a6f4e763..3ce13a97 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png
index 2a8cf947..e2cf2f83 100644
Binary files a/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png and b/docs/dev/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png differ
diff --git a/docs/dev/articles/web_only/NAFTA_examples_files/header-attrs-2.6/header-attrs.js b/docs/dev/articles/web_only/NAFTA_examples_files/header-attrs-2.6/header-attrs.js
new file mode 100644
index 00000000..dd57d92e
--- /dev/null
+++ b/docs/dev/articles/web_only/NAFTA_examples_files/header-attrs-2.6/header-attrs.js
@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+ var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+ var i, h, a;
+ for (i = 0; i < hs.length; i++) {
+ h = hs[i];
+ if (!/^h[1-6]$/i.test(h.tagName)) continue; // it should be a header h1-h6
+ a = h.attributes;
+ while (a.length > 0) h.removeAttribute(a[0].name);
+ }
+});
diff --git a/docs/dev/articles/web_only/benchmarks.html b/docs/dev/articles/web_only/benchmarks.html
index 8e157c0f..a6d52649 100644
--- a/docs/dev/articles/web_only/benchmarks.html
+++ b/docs/dev/articles/web_only/benchmarks.html
@@ -32,7 +32,7 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -81,7 +81,7 @@
-
-
+
@@ -95,14 +95,13 @@
-
-
+
Benchmark timings for mkin
Johannes Ranke
- 2020-11-30
+ Last change 13 May 2020 (rebuilt 2021-02-15)
Source: vignettes/web_only/benchmarks.rmd
benchmarks.rmd
@@ -137,17 +136,11 @@
m1 = mkinsub("SFO"))
t3 <- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D)))[["elapsed"]]
t4 <- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D),
- error_model = "tc"))[["elapsed"]]
-## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): Optimisation did not converge:
-## iteration limit reached without convergence (10)
-
-## Warning in mkinfit(models[[model_index]], datasets[[dataset_index]], ...): Optimisation did not converge:
-## iteration limit reached without convergence (10)
-
-t5 <- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D),
+ error_model = "tc"))[["elapsed"]]
+t5 <- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D),
error_model = "obs"))[["elapsed"]]
Two metabolites, synthetic data:
-
+
m_synth_SFO_lin <- mkinmod(parent = mkinsub("SFO", "M1"),
M1 = mkinsub("SFO", "M2"),
M2 = mkinsub("SFO"),
@@ -174,7 +167,7 @@
error_model = "obs"))[["elapsed"]]
t11 <- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c),
error_model = "obs"))[["elapsed"]]
-
+
mkin_benchmarks[system_string, paste0("t", 1:11)] <-
c(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11)
save(mkin_benchmarks, file = "~/git/mkin/vignettes/web_only/mkin_benchmarks.rda")
@@ -235,6 +228,16 @@
1.786
3.729
+
+1.0.3
+1.722
+3.419
+
+
+1.0.3.9000
+2.770
+3.458
+
@@ -298,13 +301,25 @@
7.251
2.810
+
+1.0.3
+1.402
+6.343
+2.802
+
+
+1.0.3.9000
+1.405
+6.417
+2.824
+
Two metabolites
-Constant variance (t6 and t7), two-component error model (t8 and t9), and variance by variable (t10 and t11) for one model fitted to one dataset, i.e. one fit for each test.
+Constant variance (t6 and t7), two-component error model (t8 and t9), and variance by variable (t10 and t11) for one model fitted to one dataset, i.e. one fit for each test.
mkin version
@@ -388,6 +403,24 @@
1.958
3.105
+
+1.0.3
+0.771
+1.251
+1.464
+3.074
+1.940
+2.831
+
+
+1.0.3.9000
+0.772
+1.263
+1.483
+3.101
+1.958
+2.843
+
diff --git a/docs/dev/articles/web_only/benchmarks_files/accessible-code-block-0.0.1/empty-anchor.js b/docs/dev/articles/web_only/benchmarks_files/accessible-code-block-0.0.1/empty-anchor.js
new file mode 100644
index 00000000..ca349fd6
--- /dev/null
+++ b/docs/dev/articles/web_only/benchmarks_files/accessible-code-block-0.0.1/empty-anchor.js
@@ -0,0 +1,15 @@
+// Hide empty tag within highlighted CodeBlock for screen reader accessibility (see https://github.com/jgm/pandoc/issues/6352#issuecomment-626106786) -->
+// v0.0.1
+// Written by JooYoung Seo (jooyoung@psu.edu) and Atsushi Yasumoto on June 1st, 2020.
+
+document.addEventListener('DOMContentLoaded', function() {
+ const codeList = document.getElementsByClassName("sourceCode");
+ for (var i = 0; i < codeList.length; i++) {
+ var linkList = codeList[i].getElementsByTagName('a');
+ for (var j = 0; j < linkList.length; j++) {
+ if (linkList[j].innerHTML === "") {
+ linkList[j].setAttribute('aria-hidden', 'true');
+ }
+ }
+ }
+});
diff --git a/docs/dev/articles/web_only/benchmarks_files/header-attrs-2.6/header-attrs.js b/docs/dev/articles/web_only/benchmarks_files/header-attrs-2.6/header-attrs.js
new file mode 100644
index 00000000..dd57d92e
--- /dev/null
+++ b/docs/dev/articles/web_only/benchmarks_files/header-attrs-2.6/header-attrs.js
@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+ var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+ var i, h, a;
+ for (i = 0; i < hs.length; i++) {
+ h = hs[i];
+ if (!/^h[1-6]$/i.test(h.tagName)) continue; // it should be a header h1-h6
+ a = h.attributes;
+ while (a.length > 0) h.removeAttribute(a[0].name);
+ }
+});
diff --git a/docs/dev/articles/web_only/compiled_models.html b/docs/dev/articles/web_only/compiled_models.html
index a444f4bc..49a579fc 100644
--- a/docs/dev/articles/web_only/compiled_models.html
+++ b/docs/dev/articles/web_only/compiled_models.html
@@ -32,7 +32,7 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -81,7 +81,7 @@
-
-
+
@@ -95,14 +95,13 @@
-
-
+
Performance benefit by using compiled model definitions in mkin
Johannes Ranke
- 2020-11-30
+ 2021-02-15
Source: vignettes/web_only/compiled_models.rmd
compiled_models.rmd
@@ -160,10 +159,10 @@
print("R package rbenchmark is not available")
}
## test replications relative elapsed
-## 4 analytical 1 1.000 0.187
-## 3 deSolve, compiled 1 1.807 0.338
-## 2 Eigenvalue based 1 2.032 0.380
-## 1 deSolve, not compiled 1 43.048 8.050
+## 4 analytical 1 1.000 0.182
+## 3 deSolve, compiled 1 1.824 0.332
+## 2 Eigenvalue based 1 2.082 0.379
+## 1 deSolve, not compiled 1 46.181 8.405
We see that using the compiled model is by more than a factor of 10 faster than using deSolve without compiled code.
@@ -190,13 +189,13 @@
}
## Temporary DLL for differentials generated and loaded
## test replications relative elapsed
-## 2 deSolve, compiled 1 1.000 0.483
-## 1 deSolve, not compiled 1 29.969 14.475
-Here we get a performance benefit of a factor of 30 using the version of the differential equation model compiled from C code!
-This vignette was built with mkin 0.9.50.4 on
+## 2 deSolve, compiled 1 1.000 0.541
+## 1 deSolve, not compiled 1 29.091 15.738
+Here we get a performance benefit of a factor of 29 using the version of the differential equation model compiled from C code!
+This vignette was built with mkin 1.0.3.9000 on
## R version 4.0.3 (2020-10-10)
## Platform: x86_64-pc-linux-gnu (64-bit)
-## Running under: Debian GNU/Linux 10 (buster)
+## Running under: Debian GNU/Linux bullseye/sid
## CPU model: AMD Ryzen 7 1700 Eight-Core Processor
diff --git a/docs/dev/articles/web_only/compiled_models_files/accessible-code-block-0.0.1/empty-anchor.js b/docs/dev/articles/web_only/compiled_models_files/accessible-code-block-0.0.1/empty-anchor.js
new file mode 100644
index 00000000..ca349fd6
--- /dev/null
+++ b/docs/dev/articles/web_only/compiled_models_files/accessible-code-block-0.0.1/empty-anchor.js
@@ -0,0 +1,15 @@
+// Hide empty tag within highlighted CodeBlock for screen reader accessibility (see https://github.com/jgm/pandoc/issues/6352#issuecomment-626106786) -->
+// v0.0.1
+// Written by JooYoung Seo (jooyoung@psu.edu) and Atsushi Yasumoto on June 1st, 2020.
+
+document.addEventListener('DOMContentLoaded', function() {
+ const codeList = document.getElementsByClassName("sourceCode");
+ for (var i = 0; i < codeList.length; i++) {
+ var linkList = codeList[i].getElementsByTagName('a');
+ for (var j = 0; j < linkList.length; j++) {
+ if (linkList[j].innerHTML === "") {
+ linkList[j].setAttribute('aria-hidden', 'true');
+ }
+ }
+ }
+});
diff --git a/docs/dev/articles/web_only/compiled_models_files/header-attrs-2.6/header-attrs.js b/docs/dev/articles/web_only/compiled_models_files/header-attrs-2.6/header-attrs.js
new file mode 100644
index 00000000..dd57d92e
--- /dev/null
+++ b/docs/dev/articles/web_only/compiled_models_files/header-attrs-2.6/header-attrs.js
@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+ var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+ var i, h, a;
+ for (i = 0; i < hs.length; i++) {
+ h = hs[i];
+ if (!/^h[1-6]$/i.test(h.tagName)) continue; // it should be a header h1-h6
+ a = h.attributes;
+ while (a.length > 0) h.removeAttribute(a[0].name);
+ }
+});
diff --git a/docs/dev/authors.html b/docs/dev/authors.html
index 8ffb9f97..63050c0d 100644
--- a/docs/dev/authors.html
+++ b/docs/dev/authors.html
@@ -71,7 +71,7 @@
mkin
- 1.0.2.9000
+ 1.0.3.9000
diff --git a/docs/dev/index.html b/docs/dev/index.html
index ff9b201f..57328658 100644
--- a/docs/dev/index.html
+++ b/docs/dev/index.html
@@ -38,7 +38,7 @@
mkin
- 1.0.2.9000
+ 1.0.3.9000
@@ -133,23 +133,40 @@
Features
+
+
+General
- Highly flexible model specification using
mkinmod, including equilibrium reactions and using the single first-order reversible binding (SFORB) model, which will automatically create two latent state variables for the observed variable.
-- As of version 0.9-39, fitting of several models to several datasets, optionally in parallel, is supported, see for example
plot.mmkin.
- Model solution (forward modelling) in the function
mkinpredict is performed either using the analytical solution for the case of parent only degradation, an eigenvalue based solution if only simple first-order (SFO) or SFORB kinetics are used in the model, or using a numeric solver from the deSolve package (default is lsoda).
-- If a C compiler is installed, the kinetic models are compiled from automatically generated C code, see vignette
compiled_models. The autogeneration of C code was inspired by the ccSolve package. Thanks to Karline Soetaert for her work on that.
-- By default, kinetic rate constants and kinetic formation fractions are transformed internally using
transform_odeparms so their estimators can more reasonably be expected to follow a normal distribution. This has the side effect that no constraints are needed in the optimisation. Thanks to René Lehmann for the nice cooperation on this, especially the isometric log-ratio transformation that is now used for the formation fractions.
-- A side effect of this is that when parameter estimates are backtransformed to match the model definition, confidence intervals calculated from standard errors are also backtransformed to the correct scale, and will not include meaningless values like negative rate constants or formation fractions adding up to more than 1, which can not occur in a single experiment with a single defined radiolabel position.
- The usual one-sided t-test for significant difference from zero is nevertheless shown based on estimators for the untransformed parameters.
- Summary and plotting functions. The
summary of an mkinfit object is in fact a full report that should give enough information to be able to approximately reproduce the fit with other tools.
- The chi-squared error level as defined in the FOCUS kinetics guidance (see below) is calculated for each observed variable.
-- When a metabolite decline phase is not described well by SFO kinetics, SFORB kinetics can be used for the metabolite.
-- Three different error models can be selected using the argument
error_model to the mkinfit function.
- The ‘variance by variable’ error model which is often fitted using Iteratively Reweighted Least Squares (IRLS) should now be specified as
error_model = "obs".
-- A two-component error model similar to the one proposed by Rocke and Lorenzato can be selected using the argument
error_model = "tc".
+
+
+
+
+Unique in mkin
+
+- Three different error models can be selected using the argument
error_model to the mkinfit function. A two-component error model similar to the one proposed by Rocke and Lorenzato can be selected using the argument error_model = "tc".
+- Model comparisons using the Akaike Information Criterion (AIC) are supported which can also be used for non-constant variance. In such cases the FOCUS chi-squared error level is not meaningful.
+- By default, kinetic rate constants and kinetic formation fractions are transformed internally using
transform_odeparms so their estimators can more reasonably be expected to follow a normal distribution.
+- When parameter estimates are backtransformed to match the model definition, confidence intervals calculated from standard errors are also backtransformed to the correct scale, and will not include meaningless values like negative rate constants or formation fractions adding up to more than 1, which cannot occur in a single experiment with a single defined radiolabel position.
+- When a metabolite decline phase is not described well by SFO kinetics, SFORB kinetics can be used for the metabolite. Mathematically, the SFORB model is equivalent to the DFOP model used by other tools for biphasic metabolite curves. However, the SFORB model has the advantage that there is a mechanistic interpretation of the model parameters.
- Nonlinear mixed-effects models can be created from fits of the same degradation model to different datasets for the same compound by using the nlme.mmkin method. Note that the convergence of the nlme fits depends on the quality of the data. Convergence is better for simple models and data for many groups (e.g. soils).
+
+
+Performance
+
+- Parallel fitting of several models to several datasets is supported, see for example
plot.mmkin.
+- If a C compiler is installed, the kinetic models are compiled from automatically generated C code, see vignette
compiled_models. The autogeneration of C code was inspired by the ccSolve package. Thanks to Karline Soetaert for her work on that.
+- Even if no compiler is installed, many degradation models still give very good performance, as current versions of mkin also have analytical solutions for some models with one metabolite, and if SFO or SFORB are used for the parent compound, Eigenvalue based solutions of the degradation model are available.
+
+
+
GUI
@@ -158,7 +175,7 @@
News
-There is a ChangeLog, for the latest CRAN release and one for the github master branch.
+There is a list of changes for the latest CRAN release and one for each github branch, e.g. the main branch.
@@ -171,6 +188,16 @@
In 2011, Bayer Crop Science started to distribute an R based successor to KinGUI named KinGUII whose R code is based on mkin, but which added, among other refinements, a closed source graphical user interface (GUI), iteratively reweighted least squares (IRLS) optimisation of the variance for each of the observed variables, and Markov Chain Monte Carlo (MCMC) simulation functionality, similar to what is available e.g. in the FME package.
Somewhat in parallel, Syngenta has sponsored the development of an mkin and KinGUII based GUI application called CAKE, which also adds IRLS and MCMC, is more limited in the model formulation, but puts more weight on usability. CAKE is available for download from the CAKE website, where you can also find a zip archive of the R scripts derived from mkin, published under the GPL license.
Finally, there is KineticEval, which contains a further development of the scripts used for KinGUII, so the different tools will hopefully be able to learn from each other in the future as well.
+Thanks to René Lehmann, formerly working at the Umweltbundesamt, for the nice cooperation cooperation on parameter transformations, especially the isometric log-ratio transformation that is now used for formation fractions in case there are more than two transformation targets.
+Many inspirations for improvements of mkin resulted from doing kinetic evaluations of degradation data for my clients while working at Harlan Laboratories and at Eurofins Regulatory AG, and now as an independent consultant.
+Funding was received from the Umweltbundesamt in the course of the projects
+
+- Grant Number 112407 (Testing and validation of modelling software as an alternative to ModelMaker 4.0, 2014-2015)
+- Project Number 56703 (Optimization of gmkin for routine use in the Umweltbundesamt, 2015)
+- Project Number 112407 (Testing the feasibility of using an error model according to Rocke and Lorenzato for more realistic parameter estimates in the kinetic evaluation of degradation data, 2018-2019)
+- Project Number 120667 (Development of objective criteria for the evaluation of the visual fit in the kinetic evaluation of degradation data, 2019-2020)
+- Project 146839 (Checking the feasibility of using mixed-effects models for the derivation of kinetic modelling parameters from degradation studies, 2020-2021)
+
diff --git a/docs/dev/news/index.html b/docs/dev/news/index.html
index 1421edf4..31c392f7 100644
--- a/docs/dev/news/index.html
+++ b/docs/dev/news/index.html
@@ -71,7 +71,7 @@
mkin
- 1.0.2.9000
+ 1.0.3.9000
@@ -141,9 +141,9 @@
Source: NEWS.md
-
-
-mkin 1.0.2.9000 Unreleased
+
+
+mkin 1.0.3.9000 Unreleased
@@ -161,6 +161,14 @@
‘saem’: generic function to fit saemix models using ‘saemix_model’ and ‘saemix_data’, with a generator ‘saem.mmkin’, summary and plot methods
+
+
+
+mkin 1.0.3 Unreleased
+
+
+- Review and update README, the ‘Introduction to mkin’ vignette and some of the help pages
+
diff --git a/docs/dev/pkgdown.yml b/docs/dev/pkgdown.yml
index c74efaf7..4df60994 100644
--- a/docs/dev/pkgdown.yml
+++ b/docs/dev/pkgdown.yml
@@ -10,7 +10,7 @@ articles:
web_only/NAFTA_examples: NAFTA_examples.html
web_only/benchmarks: benchmarks.html
web_only/compiled_models: compiled_models.html
-last_built: 2021-02-13T12:27Z
+last_built: 2021-02-15T16:08Z
urls:
reference: https://pkgdown.jrwb.de/mkin/reference
article: https://pkgdown.jrwb.de/mkin/articles
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -122,7 +122,7 @@ same dataset." />
#> Warning: Optimisation did not converge:
-#> false convergence (8) # We get a warning because the FOMC model does not converge for the
+ # We get a warning because the FOMC model does not converge for the
# FOCUS A dataset, as it is well described by SFO
AIC(f["SFO", "FOCUS A"]) # We get a single number for a single fit
@@ -199,15 +198,15 @@ dataframe if there are several fits in the column).
AIC(f[, "FOCUS A"])
#> df AIC
#> SFO 3 55.28197
-#> FOMC 4 57.28211
+#> FOMC 4 57.28222
#> DFOP 5 59.28197#> df AIC
#> SFO 3 49.28197
-#> FOMC 4 49.28211
+#> FOMC 4 49.28222
#> DFOP 5 49.28197#> df BIC
#> SFO 3 55.52030
-#> FOMC 4 57.59987
+#> FOMC 4 57.59999
#> DFOP 5 59.67918
# For FOCUS C, the more complex models fit better
AIC(f[, "FOCUS C"])
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -122,7 +122,7 @@ specified as well." />
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -122,7 +122,7 @@ two exponential decline functions." />
@@ -121,7 +121,7 @@
-
-
+
@@ -220,7 +220,7 @@ either a list of mkinfit objects or a single mkinfit object.
)
#> $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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -125,7 +125,7 @@ in this fit." />
-
-
+
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -125,7 +125,7 @@ in this fit." />
-
-
+
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -125,7 +125,7 @@ in this fit." />
-
-
+
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -125,7 +125,7 @@ in this fit." />
@@ -121,7 +121,7 @@
@@ -122,7 +122,7 @@ a decreasing rate constant." />
@@ -122,7 +122,7 @@ between them." />
-
-
+
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -122,7 +122,7 @@ a concentration dependent rate constant." />
-
-
+
diff --git a/docs/dev/reference/NAFTA_SOP_2015-1.png b/docs/dev/reference/NAFTA_SOP_2015-1.png
index 4d823d77..4f0d7833 100644
Binary files a/docs/dev/reference/NAFTA_SOP_2015-1.png and b/docs/dev/reference/NAFTA_SOP_2015-1.png differ
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 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -121,7 +121,7 @@
-
-
+
diff --git a/docs/dev/reference/NAFTA_SOP_Attachment-1.png b/docs/dev/reference/NAFTA_SOP_Attachment-1.png
index 6eb10cde..9417685e 100644
Binary files a/docs/dev/reference/NAFTA_SOP_Attachment-1.png and b/docs/dev/reference/NAFTA_SOP_Attachment-1.png differ
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 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -121,7 +121,7 @@
-
-
+
@@ -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
plot(nafta_att_p5a)
diff --git a/docs/dev/reference/Rplot001.png b/docs/dev/reference/Rplot001.png
index 17a35806..7f498242 100644
Binary files a/docs/dev/reference/Rplot001.png and b/docs/dev/reference/Rplot001.png differ
diff --git a/docs/dev/reference/Rplot002.png b/docs/dev/reference/Rplot002.png
index 9b97a634..54c31a3f 100644
Binary files a/docs/dev/reference/Rplot002.png and b/docs/dev/reference/Rplot002.png differ
diff --git a/docs/dev/reference/Rplot006.png b/docs/dev/reference/Rplot006.png
index 730a7481..81525882 100644
Binary files a/docs/dev/reference/Rplot006.png and b/docs/dev/reference/Rplot006.png differ
diff --git a/docs/dev/reference/Rplot007.png b/docs/dev/reference/Rplot007.png
index fce3b6ee..10b7455a 100644
Binary files a/docs/dev/reference/Rplot007.png and b/docs/dev/reference/Rplot007.png differ
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 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -121,7 +121,7 @@
-
-
+
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -125,7 +125,7 @@ and no substance in the bound fraction." />
-
-
+
diff --git a/docs/dev/reference/add_err-1.png b/docs/dev/reference/add_err-1.png
index d2ce797f..9ba106db 100644
Binary files a/docs/dev/reference/add_err-1.png and b/docs/dev/reference/add_err-1.png differ
diff --git a/docs/dev/reference/add_err-2.png b/docs/dev/reference/add_err-2.png
index ac220c9e..3088c40e 100644
Binary files a/docs/dev/reference/add_err-2.png and b/docs/dev/reference/add_err-2.png differ
diff --git a/docs/dev/reference/add_err-3.png b/docs/dev/reference/add_err-3.png
index 40465b71..493a761a 100644
Binary files a/docs/dev/reference/add_err-3.png and b/docs/dev/reference/add_err-3.png differ
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -123,7 +123,7 @@ may depend on the predicted value and is specified as a standard deviation." />
@@ -123,7 +123,7 @@ by Burnham and Anderson (2004)." />
-
-
+
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)." />
mkin
- 1.0.1.9000
+ 1.0.3.9000
@@ -285,13 +285,13 @@ Profile-Likelihood Based Confidence Intervals, Applied Statistics, 37,
f_d_1 <- mkinfit(SFO_SFO, subset(FOCUS_2006_D, value != 0), quiet = TRUE)
system.time(ci_profile <- confint(f_d_1, method = "profile", cores = 1, quiet = TRUE))
#> user system elapsed
-#> 4.258 0.916 3.889 # Using more cores does not save much time here, as parent_0 takes up most of the time
+#> 4.295 1.008 3.959 # Using more cores does not save much time here, as parent_0 takes up most of the time
# If we additionally exclude parent_0 (the confidence of which is often of
# minor interest), we get a nice performance improvement if we use at least 4 cores
system.time(ci_profile_no_parent_0 <- confint(f_d_1, method = "profile",
c("k_parent_sink", "k_parent_m1", "k_m1_sink", "sigma"), cores = n_cores))
#> Profiling the likelihood#> user system elapsed
-#> 1.459 0.088 0.907 ci_profile
+#> 1.451 0.126 0.923 ci_profile
#> 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 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -121,7 +121,7 @@
#> Loading required package: rbenchmark#> 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 DFOP_SFO <- mkinmod(
@@ -193,8 +193,8 @@
deSolve = mkinfit(DFOP_SFO, FOCUS_D, solution_type = "deSolve", quiet = TRUE),
replications = 2)
#> 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# }
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
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." />
mkin
- 1.0.2.9000
+ 1.0.3.9000
diff --git a/docs/dev/reference/experimental_data_for_UBA-1.png b/docs/dev/reference/experimental_data_for_UBA-1.png
index 24cb54c5..33946ded 100644
Binary files a/docs/dev/reference/experimental_data_for_UBA-1.png and b/docs/dev/reference/experimental_data_for_UBA-1.png differ
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
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -149,7 +149,7 @@ Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl
-
-
+
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)." />
mkin
- 0.9.50.4
+ 1.0.3.9000
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -122,7 +122,7 @@ corresponds to pF2, MWHC to pF 1 and 1/3 bar to pF 2.5." />
@@ -121,7 +121,7 @@
@@ -122,7 +122,7 @@ transformations." />
diff --git a/docs/dev/reference/loftest-1.png b/docs/dev/reference/loftest-1.png
index 6b918fec..d6006ecc 100644
Binary files a/docs/dev/reference/loftest-1.png and b/docs/dev/reference/loftest-1.png differ
diff --git a/docs/dev/reference/loftest-2.png b/docs/dev/reference/loftest-2.png
index 60874bd3..4d0dc551 100644
Binary files a/docs/dev/reference/loftest-2.png and b/docs/dev/reference/loftest-2.png differ
diff --git a/docs/dev/reference/loftest-3.png b/docs/dev/reference/loftest-3.png
index 4837e7f2..6afd084b 100644
Binary files a/docs/dev/reference/loftest-3.png and b/docs/dev/reference/loftest-3.png differ
diff --git a/docs/dev/reference/loftest-4.png b/docs/dev/reference/loftest-4.png
index 9c18ac30..f94eede1 100644
Binary files a/docs/dev/reference/loftest-4.png and b/docs/dev/reference/loftest-4.png differ
diff --git a/docs/dev/reference/loftest-5.png b/docs/dev/reference/loftest-5.png
index 11f2bda7..43460a65 100644
Binary files a/docs/dev/reference/loftest-5.png and b/docs/dev/reference/loftest-5.png differ
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -124,7 +124,7 @@ lrtest.default from the lmtest package." />
diff --git a/docs/dev/reference/logistic.solution-2.png b/docs/dev/reference/logistic.solution-2.png
index 764996df..73e6436d 100644
Binary files a/docs/dev/reference/logistic.solution-2.png and b/docs/dev/reference/logistic.solution-2.png differ
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" />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -122,7 +122,7 @@ an increasing rate constant, supposedly caused by microbial growth" />
#> 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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -125,7 +125,7 @@ and can be expressed by fixing the parameters of the other." />
-
-
+
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -127,7 +127,7 @@ soil section of the FOCUS guidance." />
-
-
+
diff --git a/docs/dev/reference/mccall81_245T-1.png b/docs/dev/reference/mccall81_245T-1.png
index 5daa5f18..91fe060e 100644
Binary files a/docs/dev/reference/mccall81_245T-1.png and b/docs/dev/reference/mccall81_245T-1.png differ
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 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -181,30 +181,30 @@
fit.1 <- mkinfit(SFO_SFO_SFO, subset(mccall81_245T, soil == "Commerce"), quiet = TRUE)
#> Warning: Observations with value of zero were removed from the data#> 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#> $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
#> # formation fraction from phenol to anisol is practically 1. As we cannot
# fix formation fractions when using the ilr transformation, we can turn of
# the sink in the model generation
@@ -215,28 +215,28 @@
quiet = TRUE)
#> Warning: Observations with value of zero were removed from the data#> 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#> $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
#>
# }
diff --git a/docs/dev/reference/mixed-1.png b/docs/dev/reference/mixed-1.png
index 3400c4aa..28a376f4 100644
Binary files a/docs/dev/reference/mixed-1.png and b/docs/dev/reference/mixed-1.png differ
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 @@
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -121,7 +121,7 @@
-
-
+
@@ -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
# }
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -123,7 +123,7 @@ variable and several dependent variables as columns." />
@@ -123,7 +123,7 @@ mkinfit." />
@@ -124,7 +124,7 @@ provided by this package come as mkinds objects nevertheless." />
@@ -124,7 +124,7 @@ dataset if no data are supplied." />
#> <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 #> <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).
#> Observation unit: \%AR #> <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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -122,7 +122,7 @@ the chi-squared test as defined in the FOCUS kinetics report from 2006." />
@@ -125,7 +125,7 @@ using the argument show_errplot = TRUE." />
-
-
+
diff --git a/docs/dev/reference/mkinfit-1.png b/docs/dev/reference/mkinfit-1.png
index eed9064f..de2a90a9 100644
Binary files a/docs/dev/reference/mkinfit-1.png and b/docs/dev/reference/mkinfit-1.png differ
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -431,17 +431,17 @@ doi: 10.3390/environments6
# Use shorthand notation for parent only degradation
fit <- mkinfit("FOMC", FOCUS_2006_C, quiet = TRUE)
summary(fit)
-#> mkin version used for fitting: 0.9.50.4
+#> 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: 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: 10.3390/environments6
#> ---
#> Signif. codes: 0 ‘***’ 0.001 ‘**’ 0.01 ‘*’ 0.05 ‘.’ 0.1 ‘ ’ 1#> 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 #> $ff
@@ -574,10 +574,10 @@ doi: 10.3390/environments6
analytical = mkinfit(SFO_SFO, FOCUS_D, quiet = TRUE, error_model = "tc",
solution_type = "analytical"))
}
-#> Loading required package: rbenchmark#> test relative elapsed
-#> 3 analytical 1.000 0.526
-#> 1 deSolve_compiled 1.903 1.001
-#> 2 eigen 2.308 1.214# }
+#> test relative elapsed
+#> 3 analytical 1.000 0.563
+#> 1 deSolve_compiled 1.702 0.958
+#> 2 eigen 2.597 1.462# }
# Use stepwise fitting, using optimised parameters from parent only fit, FOMC-SFO
# \dontrun{
@@ -587,22 +587,21 @@ doi: 10.3390/environments6
#> Temporary DLL for differentials generated and loadedfit.FOMC_SFO <- mkinfit(FOMC_SFO, FOCUS_D, quiet = TRUE)
# Again, we get a warning and try a more sophisticated error model
fit.FOMC_SFO.tc <- mkinfit(FOMC_SFO, FOCUS_D, quiet = TRUE, error_model = "tc")
-#> Warning: Optimisation did not converge:
-#> iteration limit reached without convergence (10)# This model has a higher likelihood, but not significantly so
+# This model has a higher likelihood, but not significantly so
lrtest(fit.tc, fit.FOMC_SFO.tc)
#> 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# Also, the missing standard error for log_beta and the t-tests for alpha
+#> 1 7 -64.829
+#> 2 6 -64.983 -1 0.3075 0.5792# Also, the missing standard error for log_beta and the t-tests for alpha
# and beta indicate overparameterisation
summary(fit.FOMC_SFO.tc, data = FALSE)
-#> Warning: NaNs produced#> Warning: NaNs produced#> Warning: NaNs produced#> Warning: diag(.) had 0 or NA entries; non-finite result is doubtful#> mkin version used for fitting: 0.9.50.4
+#> Warning: NaNs produced#> Warning: NaNs produced#> Warning: diag(.) had 0 or NA entries; non-finite result is doubtful#> 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: 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: 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
+#> DT50 DT90 DT50back
+#> parent 6.812 22.7 6.834
+#> m1 136.661 454.0 NA
# We can easily use starting parameters from the parent only fit (only for illustration)
fit.FOMC = mkinfit("FOMC", FOCUS_2006_D, quiet = TRUE, error_model = "tc")
fit.FOMC_SFO <- mkinfit(FOMC_SFO, FOCUS_D, quiet = TRUE,
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -127,7 +127,7 @@ mkinmod." />
-
-
+
@@ -348,7 +348,7 @@ Evaluating and Calculating Degradation Kinetics in Environmental Media
parent = mkinsub("SFO", "m1", full_name = "Test compound"),
m1 = mkinsub("SFO", full_name = "Metabolite M1"),
name = "SFO_SFO", dll_dir = DLL_dir, unload = TRUE, overwrite = TRUE)
-
#> Copied DLL from /tmp/Rtmpy4eiQb/file554e573761a7.so to /home/jranke/.local/share/mkin/SFO_SFO.so# Now we can save the model and restore it in a new session
+#> Copied DLL from /tmp/Rtmp92fCb2/file133ad522561845.so to /home/jranke/.local/share/mkin/SFO_SFO.so# Now we can save the model and restore it in a new session
saveRDS(SFO_SFO.2, file = "~/SFO_SFO.rds")
# Terminate the R session here if you would like to check, and then do
library(mkin)
@@ -397,7 +397,7 @@ Evaluating and Calculating Degradation Kinetics in Environmental Media
#> })
#> return(predicted)
#> }
-#> <environment: 0x55555cac8d00>
+#> <environment: 0x5555572517f8>
# If we have several parallel metabolites
# (compare tests/testthat/test_synthetic_data_for_UBA_2014.R)
m_synth_DFOP_par <- mkinmod(
diff --git a/docs/dev/reference/mkinparplot-1.png b/docs/dev/reference/mkinparplot-1.png
index dcf3e4b5..c9ed49eb 100644
Binary files a/docs/dev/reference/mkinparplot-1.png and b/docs/dev/reference/mkinparplot-1.png differ
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -122,7 +122,7 @@ mkinfit." />
#> Temporary DLL for differentials generated and loaded#> Warning: Observations with value of zero were removed from the datamkinparplot(fit)
+#> Warning: Observations with value of zero were removed from the data#> Warning: Optimisation did not converge:
+#> false convergence (8)mkinparplot(fit)
# }
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -122,7 +122,7 @@ plot.mkinfit." />
-
-
+
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." />
mkin
- 0.9.50.4
+ 1.0.3.9000
@@ -123,7 +123,7 @@ kinetic parameters and initial values for the state variables." />
-
-
+
@@ -408,10 +408,10 @@ as these always return mapped output.
solution_type = "analytical", use_compiled = FALSE)[201,])
}
#> 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
+#> 1 eigen 4.4 0.022
+#> 3 deSolve 46.8 0.234
# \dontrun{
# Predict from a fitted model
f <- mkinfit(SFO_SFO, FOCUS_2006_C, quiet = TRUE)
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." />
mkin
- 1.0.1.9000
+ 1.0.3.9000
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." />
mkin
- 1.0.1.9000
+ 1.0.3.9000
@@ -234,9 +234,9 @@ plotting.
time_default






Rocke, David M. and Lorenzato, Stefan (1995) A two-component model for measurement error in analytical chemistry. Technometrics 37(2), 176-184.
+Ranke J and Meinecke S (2019) Error Models for the Kinetic Evaluation of Chemical +Degradation Data. Environments 6(12) 124 +doi: 10.3390/environments6120124 +.
times <- c(0, 1, 3, 7, 14, 28, 60, 90, 120) 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." /> mkin - 0.9.50.4 + 1.0.3.9000@@ -125,7 +125,7 @@ values." />
#> mkin version used for fitting: 0.9.50.4 +#> 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 mkin - 0.9.50.4 + 1.0.3.9000@@ -125,7 +125,7 @@ endpoints such as formation fractions and DT50 values. Optionally


summary(fit)
## mkin version used for fitting: 1.0.3
## R version used for fitting: 4.0.3
-## Date of fit: Mon Feb 15 14:11:17 2021
-## Date of summary: Mon Feb 15 14:11:17 2021
+## Date of fit: Mon Feb 15 17:29:02 2021
+## Date of summary: Mon Feb 15 17:29:03 2021
##
## Equations:
## d_parent/dt = - k_parent * parent
diff --git a/vignettes/FOCUS_L.html b/vignettes/FOCUS_L.html
index 0ed46483..3d8e02c2 100644
--- a/vignettes/FOCUS_L.html
+++ b/vignettes/FOCUS_L.html
@@ -1561,8 +1561,8 @@ FOCUS_2006_L1_mkin <- mkin_wide_to_long(FOCUS_2006_L1)
summary(m.L1.SFO)
## mkin version used for fitting: 1.0.3
## R version used for fitting: 4.0.3
-## Date of fit: Mon Feb 15 14:11:19 2021
-## Date of summary: Mon Feb 15 14:11:19 2021
+## Date of fit: Mon Feb 15 17:29:04 2021
+## Date of summary: Mon Feb 15 17:29:04 2021
##
## Equations:
## d_parent/dt = - k_parent * parent
@@ -1662,15 +1662,15 @@ summary(m.L1.SFO)
## doubtful
## mkin version used for fitting: 1.0.3
## R version used for fitting: 4.0.3
-## Date of fit: Mon Feb 15 14:11:19 2021
-## Date of summary: Mon Feb 15 14:11:19 2021
+## Date of fit: Mon Feb 15 17:29:04 2021
+## Date of summary: Mon Feb 15 17:29:04 2021
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted using 369 model solutions performed in 0.082 s
+## Fitted using 369 model solutions performed in 0.083 s
##
## Error model: Constant variance
##
@@ -1767,8 +1767,8 @@ plot(m.L2.FOMC, show_residuals = TRUE,
summary(m.L2.FOMC, data = FALSE)
## mkin version used for fitting: 1.0.3
## R version used for fitting: 4.0.3
-## Date of fit: Mon Feb 15 14:11:19 2021
-## Date of summary: Mon Feb 15 14:11:19 2021
+## Date of fit: Mon Feb 15 17:29:04 2021
+## Date of summary: Mon Feb 15 17:29:04 2021
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -1845,8 +1845,8 @@ plot(m.L2.DFOP, show_residuals = TRUE, show_errmin = TRUE,
summary(m.L2.DFOP, data = FALSE)
## mkin version used for fitting: 1.0.3
## R version used for fitting: 4.0.3
-## Date of fit: Mon Feb 15 14:11:20 2021
-## Date of summary: Mon Feb 15 14:11:20 2021
+## Date of fit: Mon Feb 15 17:29:05 2021
+## Date of summary: Mon Feb 15 17:29:05 2021
##
## Equations:
## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -1945,8 +1945,8 @@ plot(mm.L3)
summary(mm.L3[["DFOP", 1]])
## mkin version used for fitting: 1.0.3
## R version used for fitting: 4.0.3
-## Date of fit: Mon Feb 15 14:11:20 2021
-## Date of summary: Mon Feb 15 14:11:20 2021
+## Date of fit: Mon Feb 15 17:29:05 2021
+## Date of summary: Mon Feb 15 17:29:05 2021
##
## Equations:
## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -2053,8 +2053,8 @@ plot(mm.L4)
summary(mm.L4[["SFO", 1]], data = FALSE)
## mkin version used for fitting: 1.0.3
## R version used for fitting: 4.0.3
-## Date of fit: Mon Feb 15 14:11:20 2021
-## Date of summary: Mon Feb 15 14:11:20 2021
+## Date of fit: Mon Feb 15 17:29:05 2021
+## Date of summary: Mon Feb 15 17:29:05 2021
##
## Equations:
## d_parent/dt = - k_parent * parent
@@ -2117,15 +2117,15 @@ plot(mm.L4)
summary(mm.L4[["FOMC", 1]], data = FALSE)
## mkin version used for fitting: 1.0.3
## R version used for fitting: 4.0.3
-## Date of fit: Mon Feb 15 14:11:20 2021
-## Date of summary: Mon Feb 15 14:11:20 2021
+## Date of fit: Mon Feb 15 17:29:05 2021
+## Date of summary: Mon Feb 15 17:29:05 2021
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted using 224 model solutions performed in 0.046 s
+## Fitted using 224 model solutions performed in 0.047 s
##
## Error model: Constant variance
##
diff --git a/vignettes/web_only/mkin_benchmarks.rda b/vignettes/web_only/mkin_benchmarks.rda
index d2b82805..8c3369a2 100644
Binary files a/vignettes/web_only/mkin_benchmarks.rda and b/vignettes/web_only/mkin_benchmarks.rda differ
--
cgit v1.2.3