From cf54ccca37d27480dbf8d59eb027300518f7ad75 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 19 May 2023 17:08:43 +0200 Subject: Prepare release of v1.2.4 - Update DESCRIPTION - Update Makefile to document how to use R-patched - Remove markup from two URLs to avoid CRAN NOTE - Switch two vignettes from html_document to html_vignette to save space in the docs directory, also avoiding a CRAN NOTE - Complete rebuild of pkgdown docs for release --- DESCRIPTION | 2 +- GNUmakefile | 3 + R/D24_2014.R | 2 +- R/dimethenamid_2018.R | 2 +- _pkgdown.yml | 4 +- docs/404.html | 2 +- docs/articles/FOCUS_D.html | 20 +- docs/articles/FOCUS_L.html | 150 +- .../figure-html/unnamed-chunk-10-1.png | Bin 42972 -> 42974 bytes .../figure-html/unnamed-chunk-6-1.png | Bin 36606 -> 36579 bytes docs/articles/index.html | 4 +- docs/articles/mkin.html | 12 +- .../mkin_files/figure-html/unnamed-chunk-2-1.png | Bin 91107 -> 91109 bytes docs/articles/prebuilt/2022_cyan_pathway.html | 3262 +++++++++----------- .../figure-html/unnamed-chunk-13-1.png | Bin 363943 -> 363589 bytes .../figure-html/unnamed-chunk-14-1.png | Bin 365867 -> 364310 bytes .../figure-html/unnamed-chunk-15-1.png | Bin 363662 -> 365199 bytes .../figure-html/unnamed-chunk-20-1.png | Bin 378667 -> 378245 bytes .../figure-html/unnamed-chunk-21-1.png | Bin 372548 -> 371558 bytes .../figure-html/unnamed-chunk-22-1.png | Bin 373913 -> 373392 bytes .../figure-html/unnamed-chunk-7-1.png | Bin 373737 -> 373137 bytes .../figure-html/unnamed-chunk-8-1.png | Bin 373913 -> 373392 bytes docs/articles/prebuilt/2022_dmta_parent.html | 6 +- docs/articles/prebuilt/2022_dmta_pathway.html | 168 +- .../saem-sforb-path-1-tc-reduced-convergence-1.png | Bin 160921 -> 160917 bytes .../figure-html/unnamed-chunk-2-1.png | Bin 108560 -> 114625 bytes .../figure-html/unnamed-chunk-3-1.png | Bin 403164 -> 403548 bytes .../figure-html/unnamed-chunk-4-1.png | Bin 403636 -> 401796 bytes .../figure-html/unnamed-chunk-6-1.png | Bin 393985 -> 394501 bytes .../figure-html/unnamed-chunk-7-1.png | Bin 400319 -> 399532 bytes .../figure-html/unnamed-chunk-8-1.png | Bin 403164 -> 403548 bytes docs/articles/twa.html | 4 +- docs/articles/web_only/FOCUS_Z.html | 42 +- .../figure-html/FOCUS_2006_Z_fits_10-1.png | Bin 107009 -> 107009 bytes .../figure-html/FOCUS_2006_Z_fits_11-1.png | Bin 106095 -> 106098 bytes .../figure-html/FOCUS_2006_Z_fits_11a-1.png | Bin 76831 -> 76831 bytes .../figure-html/FOCUS_2006_Z_fits_11b-1.png | Bin 37495 -> 37494 bytes .../figure-html/FOCUS_2006_Z_fits_5-1.png | Bin 81750 -> 81751 bytes .../figure-html/FOCUS_2006_Z_fits_6-1.png | Bin 106404 -> 106406 bytes .../figure-html/FOCUS_2006_Z_fits_9-1.png | Bin 89119 -> 89110 bytes docs/articles/web_only/NAFTA_examples.html | 189 +- .../NAFTA_examples_files/figure-html/p10-1.png | Bin 81540 -> 81542 bytes .../NAFTA_examples_files/figure-html/p15a-1.png | Bin 77571 -> 77580 bytes .../NAFTA_examples_files/figure-html/p15b-1.png | Bin 79748 -> 79748 bytes .../NAFTA_examples_files/figure-html/p5b-1.png | Bin 81186 -> 81186 bytes .../NAFTA_examples_files/figure-html/p6-1.png | Bin 83142 -> 83142 bytes .../NAFTA_examples_files/figure-html/p7-1.png | Bin 102935 -> 102934 bytes docs/articles/web_only/benchmarks.html | 33 +- docs/articles/web_only/compiled_models.html | 22 +- docs/articles/web_only/dimethenamid_2018.html | 55 +- docs/articles/web_only/multistart.html | 28 +- .../figure-html/unnamed-chunk-3-1.png | Bin 66934 -> 65359 bytes .../figure-html/unnamed-chunk-4-1.png | Bin 53020 -> 53645 bytes .../figure-html/unnamed-chunk-5-1.png | Bin 22355 -> 22804 bytes docs/articles/web_only/saem_benchmarks.html | 53 +- docs/authors.html | 6 +- docs/index.html | 2 +- docs/news/index.html | 12 +- docs/pkgdown.yml | 2 +- docs/reference/AIC.mmkin.html | 10 +- docs/reference/CAKE_export.html | 2 +- docs/reference/D24_2014.html | 4 +- docs/reference/DFOP.solution.html | 2 +- docs/reference/Extract.mmkin.html | 4 +- docs/reference/FOCUS_2006_DFOP_ref_A_to_B.html | 2 +- docs/reference/FOCUS_2006_FOMC_ref_A_to_F.html | 2 +- docs/reference/FOCUS_2006_HS_ref_A_to_F.html | 2 +- docs/reference/FOCUS_2006_SFO_ref_A_to_F.html | 2 +- docs/reference/FOCUS_2006_datasets.html | 2 +- docs/reference/FOMC.solution.html | 2 +- docs/reference/HS.solution.html | 2 +- docs/reference/IORE.solution.html | 2 +- docs/reference/NAFTA_SOP_2015.html | 2 +- docs/reference/NAFTA_SOP_Attachment.html | 6 +- docs/reference/Rplot004.png | Bin 59002 -> 59003 bytes docs/reference/Rplot005.png | Bin 20145 -> 20147 bytes docs/reference/SFO.solution.html | 2 +- docs/reference/SFORB.solution.html | 2 +- docs/reference/add_err.html | 2 +- docs/reference/anova.saem.mmkin.html | 2 +- docs/reference/aw.html | 2 +- docs/reference/confint.mkinfit.html | 44 +- docs/reference/create_deg_func.html | 10 +- docs/reference/dimethenamid_2018-1.png | Bin 253269 -> 253295 bytes docs/reference/dimethenamid_2018.html | 118 +- docs/reference/ds_mixed-1.png | Bin 219137 -> 219135 bytes docs/reference/ds_mixed.html | 2 +- docs/reference/endpoints.html | 2 +- docs/reference/experimental_data_for_UBA-1.png | Bin 103470 -> 103465 bytes docs/reference/experimental_data_for_UBA.html | 2 +- docs/reference/f_time_norm_focus.html | 2 +- docs/reference/focus_soil_moisture.html | 2 +- docs/reference/get_deg_func.html | 2 +- docs/reference/hierarchical_kinetics.html | 2 +- docs/reference/illparms.html | 4 +- docs/reference/ilr.html | 2 +- docs/reference/index.html | 2 +- docs/reference/intervals.saem.mmkin.html | 2 +- docs/reference/llhist.html | 2 +- docs/reference/loftest-3.png | Bin 78360 -> 78355 bytes docs/reference/loftest-5.png | Bin 74677 -> 74668 bytes docs/reference/loftest.html | 2 +- docs/reference/logLik.mkinfit.html | 2 +- docs/reference/logLik.saem.mmkin.html | 2 +- docs/reference/logistic.solution.html | 8 +- docs/reference/lrtest.mkinfit.html | 2 +- docs/reference/max_twa_parent.html | 2 +- docs/reference/mccall81_245T.html | 32 +- docs/reference/mean_degparms.html | 2 +- docs/reference/mhmkin-2.png | Bin 112676 -> 112653 bytes docs/reference/mhmkin.html | 2 +- docs/reference/mixed-1.png | Bin 215795 -> 215883 bytes docs/reference/mixed.html | 12 +- docs/reference/mkin_long_to_wide.html | 2 +- docs/reference/mkin_wide_to_long.html | 2 +- docs/reference/mkinds.html | 2 +- docs/reference/mkindsg.html | 2 +- docs/reference/mkinerrmin.html | 2 +- docs/reference/mkinerrplot.html | 2 +- docs/reference/mkinfit.html | 66 +- docs/reference/mkinmod.html | 6 +- docs/reference/mkinparplot-1.png | Bin 26970 -> 26968 bytes docs/reference/mkinparplot.html | 4 +- docs/reference/mkinplot.html | 2 +- docs/reference/mkinpredict.html | 10 +- docs/reference/mkinresplot.html | 2 +- docs/reference/mmkin-1.png | Bin 111798 -> 111795 bytes docs/reference/mmkin-2.png | Bin 108900 -> 108911 bytes docs/reference/mmkin-3.png | Bin 97013 -> 97016 bytes docs/reference/mmkin.html | 20 +- docs/reference/multistart-1.png | Bin 66388 -> 64992 bytes docs/reference/multistart-2.png | Bin 56780 -> 52708 bytes docs/reference/multistart.html | 12 +- docs/reference/nafta.html | 2 +- docs/reference/nlme-2.png | Bin 90383 -> 90402 bytes docs/reference/nlme.html | 8 +- docs/reference/nlme.mmkin-1.png | Bin 123640 -> 123639 bytes docs/reference/nlme.mmkin-3.png | Bin 173484 -> 173489 bytes docs/reference/nlme.mmkin.html | 33 +- docs/reference/nobs.mkinfit.html | 2 +- docs/reference/parms.html | 16 +- docs/reference/parplot.html | 2 +- docs/reference/plot.mixed.mmkin-2.png | Bin 174715 -> 174714 bytes docs/reference/plot.mixed.mmkin-3.png | Bin 173537 -> 173536 bytes docs/reference/plot.mixed.mmkin-4.png | Bin 176615 -> 176617 bytes docs/reference/plot.mixed.mmkin.html | 4 +- docs/reference/plot.mkinfit-2.png | Bin 74714 -> 74712 bytes docs/reference/plot.mkinfit-5.png | Bin 66266 -> 66268 bytes docs/reference/plot.mkinfit-7.png | Bin 73424 -> 73422 bytes docs/reference/plot.mkinfit.html | 2 +- docs/reference/plot.mmkin-4.png | Bin 33494 -> 33490 bytes docs/reference/plot.mmkin-5.png | Bin 58989 -> 58991 bytes docs/reference/plot.mmkin.html | 2 +- docs/reference/plot.nafta.html | 2 +- docs/reference/read_spreadsheet.html | 2 +- docs/reference/reexports.html | 2 +- docs/reference/residuals.mkinfit.html | 2 +- docs/reference/saem-4.png | Bin 174283 -> 174282 bytes docs/reference/saem.html | 18 +- docs/reference/schaefer07_complex_case-1.png | Bin 67796 -> 67810 bytes docs/reference/schaefer07_complex_case.html | 14 +- docs/reference/set_nd_nq.html | 2 +- docs/reference/sigma_twocomp.html | 2 +- docs/reference/status.html | 6 +- docs/reference/summary.mkinfit.html | 12 +- docs/reference/summary.mmkin.html | 10 +- docs/reference/summary.nlme.mmkin.html | 26 +- docs/reference/summary.saem.mmkin.html | 522 ++-- docs/reference/summary_listing.html | 2 +- docs/reference/synthetic_data_for_UBA_2014.html | 32 +- docs/reference/test_data_from_UBA_2014.html | 20 +- docs/reference/transform_odeparms.html | 2 +- docs/reference/update.mkinfit.html | 2 +- log/build.log | 2 +- log/check.log | 21 +- log/test.log | 24 +- man/D24_2014.Rd | 2 +- man/dimethenamid_2018.Rd | 2 +- vignettes/FOCUS_D.html | 16 +- vignettes/FOCUS_L.html | 1964 +++--------- vignettes/FOCUS_L.rmd | 7 +- vignettes/mkin.html | 1952 ++---------- vignettes/mkin.rmd | 10 +- vignettes/web_only/mkin_benchmarks.rda | Bin 1864 -> 1922 bytes vignettes/web_only/saem_benchmarks.rda | Bin 772 -> 855 bytes 185 files changed, 3284 insertions(+), 6004 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8a2a4529..a445a978 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: mkin Type: Package Title: Kinetic Evaluation of Chemical Degradation Data Version: 1.2.4 -Date: 2023-04-20 +Date: 2023-05-16 Authors@R: c( person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "johannes.ranke@jrwb.de", diff --git a/GNUmakefile b/GNUmakefile index d43a9026..76163ab6 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -9,6 +9,9 @@ WINBIN := $(PKGSRC)_$(PKGVERS).zip # pre-prelease version) use `make RBIN=/path/to/other/R/` or `export RBIN=...` # If no alternate bin folder is specified, the default is to use the folder # containing the first instance of R on the PATH. +# If using a patched version of R, you may want to use the same libraries +# as for the Debian packaged version, by using +# `export R_LIBS_SITE=${R_LIBS_SITE-'/usr/local/lib/R/site-library:/usr/lib/R/site-library:/usr/lib/R/library'}` RBIN ?= $(shell dirname "`which R`") RDEVBIN=/home/jranke/svn/R/r-devel/build/bin diff --git a/R/D24_2014.R b/R/D24_2014.R index 338e6a76..aaed029c 100644 --- a/R/D24_2014.R +++ b/R/D24_2014.R @@ -20,7 +20,7 @@ #' @source Hellenic Ministry of Rural Development and Agriculture (2014) #' Final addendum to the Renewal Assessment Report - public version - 2,4-D #' Volume 3 Annex B.8 Fate and behaviour in the environment -#' \url{https://open.efsa.europa.eu/study-inventory/EFSA-Q-2013-00811} +#' https://open.efsa.europa.eu/study-inventory/EFSA-Q-2013-00811 #' @examples #' print(D24_2014) #' \dontrun{ diff --git a/R/dimethenamid_2018.R b/R/dimethenamid_2018.R index 00ed9073..ff40a5db 100644 --- a/R/dimethenamid_2018.R +++ b/R/dimethenamid_2018.R @@ -15,7 +15,7 @@ #' @source Rapporteur Member State Germany, Co-Rapporteur Member State Bulgaria (2018) #' Renewal Assessment Report Dimethenamid-P Volume 3 - B.8 Environmental fate and behaviour #' Rev. 2 - November 2017 -#' \url{https://open.efsa.europa.eu/study-inventory/EFSA-Q-2014-00716} +#' https://open.efsa.europa.eu/study-inventory/EFSA-Q-2014-00716 #' @examples #' print(dimethenamid_2018) #' dmta_ds <- lapply(1:7, function(i) { diff --git a/_pkgdown.yml b/_pkgdown.yml index 5c67d88f..6bf7c14a 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -1,8 +1,8 @@ url: https://pkgdown.jrwb.de/mkin development: - mode: devel - version_label: info + mode: release + version_label: default template: bootswatch: spacelab diff --git a/docs/404.html b/docs/404.html index 4d888396..b9ab1f25 100644 --- a/docs/404.html +++ b/docs/404.html @@ -32,7 +32,7 @@ mkin - 1.2.3.1 + 1.2.4 diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index 0d2f56f5..19367c68 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -33,7 +33,7 @@ mkin - 1.2.3 + 1.2.4 @@ -135,7 +135,7 @@ D Ranke

Last change 31 January 2019 -(rebuilt 2023-04-20)

+(rebuilt 2023-05-19) Source: vignettes/FOCUS_D.rmd @@ -237,10 +237,10 @@ the mkinparplot function.

summary method for mkinfit objects.

 summary(fit)
-
## mkin version used for fitting:    1.2.3 
-## R version used for fitting:       4.2.3 
-## Date of fit:     Thu Apr 20 07:37:14 2023 
-## Date of summary: Thu Apr 20 07:37:14 2023 
+
## mkin version used for fitting:    1.2.4 
+## R version used for fitting:       4.3.0 
+## Date of fit:     Fri May 19 09:20:23 2023 
+## Date of summary: Fri May 19 09:20:23 2023 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
@@ -248,7 +248,7 @@ the mkinparplot function.

 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 401 model solutions performed in 0.047 s
+## Fitted using 401 model solutions performed in 0.048 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -292,10 +292,10 @@ the mkinparplot function.

 ## 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.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
+## log_k_parent     5.174e-01    1.000e+00 -3.263e-01      -5.426e-01 -8.479e-07
+## log_k_m1        -1.688e-01   -3.263e-01  1.000e+00       7.478e-01  8.211e-07
 ## f_parent_qlogis -5.471e-01   -5.426e-01  7.478e-01       1.000e+00  1.305e-06
-## sigma           -1.172e-06   -8.483e-07  8.205e-07       1.305e-06  1.000e+00
+## sigma           -1.172e-06   -8.479e-07  8.211e-07       1.305e-06  1.000e+00
 ## 
 ## Backtransformed parameters:
 ## Confidence intervals for internally transformed parameters are asymmetric.
diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html
index e47ed9d7..dabb16f2 100644
--- a/docs/articles/FOCUS_L.html
+++ b/docs/articles/FOCUS_L.html
@@ -33,7 +33,7 @@
       
       
         mkin
-        1.2.3
+        1.2.4
       
     
 
@@ -134,8 +134,8 @@ to L3
                         
Johannes
 Ranke

             
-            
Last change 18 May 2022
-(rebuilt 2023-04-20)

+            
Last change 18 May 2023
+(rebuilt 2023-05-19)

       
       Source: vignettes/FOCUS_L.rmd
       
@@ -169,10 +169,10 @@ report.

 
 m.L1.SFO <- mkinfit("SFO", FOCUS_2006_L1_mkin, quiet = TRUE)
 summary(m.L1.SFO)

-
## mkin version used for fitting:    1.2.3 
-## R version used for fitting:       4.2.3 
-## Date of fit:     Thu Apr 20 07:37:15 2023 
-## Date of summary: Thu Apr 20 07:37:15 2023 
+
## mkin version used for fitting:    1.2.4 
+## R version used for fitting:       4.3.0 
+## Date of fit:     Fri May 19 09:20:25 2023 
+## Date of summary: Fri May 19 09:20:25 2023 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
@@ -276,17 +276,17 @@ objects.

 
## 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:    1.2.3 
-## R version used for fitting:       4.2.3 
-## Date of fit:     Thu Apr 20 07:37:16 2023 
-## Date of summary: Thu Apr 20 07:37:16 2023 
+
## mkin version used for fitting:    1.2.4 
+## R version used for fitting:       4.3.0 
+## Date of fit:     Fri May 19 09:20:25 2023 
+## Date of summary: Fri May 19 09:20:25 2023 
 ## 
 ## 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.025 s
+## Fitted using 342 model solutions performed in 0.021 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -314,22 +314,22 @@ objects.

 ## 
 ## Results:
 ## 
-##        AIC      BIC   logLik
-##   95.88781 99.44929 -43.9439
+##        AIC      BIC    logLik
+##   95.88782 99.44931 -43.94391
 ## 
 ## Optimised, transformed parameters with symmetric confidence intervals:
 ##           Estimate Std. Error  Lower  Upper
 ## parent_0     92.47     1.2820 89.720 95.220
-## log_alpha    13.78        NaN    NaN    NaN
-## log_beta     16.13        NaN    NaN    NaN
-## sigma         2.78     0.4598  1.794  3.766
+## log_alpha    13.20        NaN    NaN    NaN
+## log_beta     15.54        NaN    NaN    NaN
+## sigma         2.78     0.4607  1.792  3.768
 ## 
 ## Parameter correlation:
-##            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
+##           parent_0 log_alpha log_beta    sigma
+## parent_0  1.000000       NaN      NaN 0.000603
+## log_alpha      NaN         1      NaN      NaN
+## log_beta       NaN       NaN        1      NaN
+## sigma     0.000603       NaN      NaN 1.000000
 ## 
 ## Backtransformed parameters:
 ## Confidence intervals for internally transformed parameters are asymmetric.
@@ -337,9 +337,9 @@ objects.

 ## for estimators of untransformed parameters.
 ##           Estimate t value Pr(>t)  Lower  Upper
 ## parent_0 9.247e+01      NA     NA 89.720 95.220
-## 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
+## alpha    5.386e+05      NA     NA     NA     NA
+## beta     5.633e+06      NA     NA     NA     NA
+## sigma    2.780e+00      NA     NA  1.792  3.768
 ## 
 ## FOCUS Chi2 error levels in percent:
 ##          err.min n.optim df
@@ -347,8 +347,8 @@ objects.

 ## parent     3.619       3  6
 ## 
 ## Estimated disappearance times:
-##        DT50  DT90 DT50back
-## parent 7.25 24.08     7.25

+##         DT50  DT90 DT50back
+## parent 7.249 24.08    7.249

 
We get a warning that the default optimisation algorithm
 Port did not converge, which is an indication that the
 model is overparameterised, i.e. contains too many parameters
@@ -427,17 +427,17 @@ kinetics.

 

 
 summary(m.L2.FOMC, data = FALSE)

-
## mkin version used for fitting:    1.2.3 
-## R version used for fitting:       4.2.3 
-## Date of fit:     Thu Apr 20 07:37:16 2023 
-## Date of summary: Thu Apr 20 07:37:16 2023 
+
## mkin version used for fitting:    1.2.4 
+## R version used for fitting:       4.3.0 
+## Date of fit:     Fri May 19 09:20:25 2023 
+## Date of summary: Fri May 19 09:20:25 2023 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 239 model solutions performed in 0.015 s
+## Fitted using 239 model solutions performed in 0.013 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -472,10 +472,10 @@ kinetics.

 ## 
 ## Parameter correlation:
 ##             parent_0  log_alpha   log_beta      sigma
-## 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
+## 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
 ## 
 ## Backtransformed parameters:
 ## Confidence intervals for internally transformed parameters are asymmetric.
@@ -511,10 +511,10 @@ the data.

 

 
 summary(m.L2.DFOP, data = FALSE)

-
## mkin version used for fitting:    1.2.3 
-## R version used for fitting:       4.2.3 
-## Date of fit:     Thu Apr 20 07:37:16 2023 
-## Date of summary: Thu Apr 20 07:37:16 2023 
+
## mkin version used for fitting:    1.2.4 
+## R version used for fitting:       4.3.0 
+## Date of fit:     Fri May 19 09:20:25 2023 
+## Date of summary: Fri May 19 09:20:25 2023 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -523,7 +523,7 @@ the data.

 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 581 model solutions performed in 0.04 s
+## Fitted using 581 model solutions performed in 0.038 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -554,18 +554,18 @@ the data.

 ## 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.112  1.842e+03 -4353.0000 4359.0000
+## log_k1      3.113  1.849e+03 -4369.0000 4375.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.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
+## parent_0  1.000e+00  6.763e-07 -8.944e-10  2.665e-01 -1.083e-09
+## log_k1    6.763e-07  1.000e+00  1.112e-04 -2.187e-04 -1.027e-05
+## log_k2   -8.944e-10  1.112e-04  1.000e+00 -7.903e-01  9.464e-09
+## g_qlogis  2.665e-01 -2.187e-04 -7.903e-01  1.000e+00 -1.532e-08
+## sigma    -1.083e-09 -1.027e-05  9.464e-09 -1.532e-08  1.000e+00
 ## 
 ## Backtransformed parameters:
 ## Confidence intervals for internally transformed parameters are asymmetric.
@@ -573,7 +573,7 @@ the data.

 ## 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.4800 5.553e-04 4.998e-01  0.0000     Inf
+## k1        22.4900 5.533e-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
@@ -585,7 +585,7 @@ the data.

 ## 
 ## Estimated disappearance times:
 ##          DT50  DT90 DT50back DT50_k1 DT50_k2
-## parent 0.5335 5.311    1.599 0.03084   2.058

+## parent 0.5335 5.311    1.599 0.03083   2.058

 
Here, the DFOP model is clearly the best-fit model for dataset L2
 based on the chi^2 error level criterion.

 
@@ -628,10 +628,10 @@ 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:    1.2.3 
-## R version used for fitting:       4.2.3 
-## Date of fit:     Thu Apr 20 07:37:17 2023 
-## Date of summary: Thu Apr 20 07:37:17 2023 
+
## mkin version used for fitting:    1.2.4 
+## R version used for fitting:       4.3.0 
+## Date of fit:     Fri May 19 09:20:26 2023 
+## Date of summary: Fri May 19 09:20:26 2023 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -640,7 +640,7 @@ summary and plot functions working on mkinfit objects.

 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 376 model solutions performed in 0.024 s
+## Fitted using 376 model solutions performed in 0.021 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -678,11 +678,11 @@ summary and plot functions working on mkinfit objects.

 ## 
 ## 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.664e-08
-## log_k1    1.732e-01  1.000e+00  4.945e-01 -5.809e-01  7.147e-07
+## parent_0  1.000e+00  1.732e-01  2.282e-02  4.009e-01 -9.696e-08
+## log_k1    1.732e-01  1.000e+00  4.945e-01 -5.809e-01  7.148e-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.926e-07
-## sigma    -9.664e-08  7.147e-07  1.022e-06 -7.926e-07  1.000e+00
+## g_qlogis  4.009e-01 -5.809e-01 -6.812e-01  1.000e+00 -7.930e-07
+## sigma    -9.696e-08  7.148e-07  1.022e-06 -7.930e-07  1.000e+00
 ## 
 ## Backtransformed parameters:
 ## Confidence intervals for internally transformed parameters are asymmetric.
@@ -755,17 +755,17 @@ 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:    1.2.3 
-## R version used for fitting:       4.2.3 
-## Date of fit:     Thu Apr 20 07:37:17 2023 
-## Date of summary: Thu Apr 20 07:37:17 2023 
+
## mkin version used for fitting:    1.2.4 
+## R version used for fitting:       4.3.0 
+## Date of fit:     Fri May 19 09:20:26 2023 
+## Date of summary: Fri May 19 09:20:26 2023 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 142 model solutions performed in 0.009 s
+## Fitted using 142 model solutions performed in 0.008 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -797,9 +797,9 @@ appears negligible.

 ## 
 ## Parameter correlation:
 ##               parent_0 log_k_parent     sigma
-## parent_0     1.000e+00    5.938e-01 3.387e-07
-## log_k_parent 5.938e-01    1.000e+00 5.830e-07
-## sigma        3.387e-07    5.830e-07 1.000e+00
+## parent_0     1.000e+00    5.938e-01 3.430e-07
+## log_k_parent 5.938e-01    1.000e+00 5.885e-07
+## sigma        3.430e-07    5.885e-07 1.000e+00
 ## 
 ## Backtransformed parameters:
 ## Confidence intervals for internally transformed parameters are asymmetric.
@@ -820,17 +820,17 @@ appears negligible.

 ## parent  106  352

 
 summary(mm.L4[["FOMC", 1]], data = FALSE)

-
## mkin version used for fitting:    1.2.3 
-## R version used for fitting:       4.2.3 
-## Date of fit:     Thu Apr 20 07:37:17 2023 
-## Date of summary: Thu Apr 20 07:37:17 2023 
+
## mkin version used for fitting:    1.2.4 
+## R version used for fitting:       4.3.0 
+## Date of fit:     Fri May 19 09:20:26 2023 
+## Date of summary: Fri May 19 09:20:26 2023 
 ## 
 ## 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.014 s
+## Fitted using 224 model solutions performed in 0.012 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -865,10 +865,10 @@ appears negligible.

 ## 
 ## Parameter correlation:
 ##             parent_0  log_alpha   log_beta      sigma
-## 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
+## parent_0   1.000e+00 -4.696e-01 -5.543e-01 -2.447e-07
+## log_alpha -4.696e-01  1.000e+00  9.889e-01  2.198e-08
+## log_beta  -5.543e-01  9.889e-01  1.000e+00  4.923e-08
+## sigma     -2.447e-07  2.198e-08  4.923e-08  1.000e+00
 ## 
 ## Backtransformed parameters:
 ## Confidence intervals for internally transformed parameters are asymmetric.
diff --git a/docs/articles/FOCUS_L_files/figure-html/unnamed-chunk-10-1.png b/docs/articles/FOCUS_L_files/figure-html/unnamed-chunk-10-1.png
index 11706305..c732be75 100644
Binary files a/docs/articles/FOCUS_L_files/figure-html/unnamed-chunk-10-1.png and b/docs/articles/FOCUS_L_files/figure-html/unnamed-chunk-10-1.png differ
diff --git a/docs/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png b/docs/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png
index c3f55dd6..dfeb7907 100644
Binary files a/docs/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png and b/docs/articles/FOCUS_L_files/figure-html/unnamed-chunk-6-1.png differ
diff --git a/docs/articles/index.html b/docs/articles/index.html
index 991f8994..7060b377 100644
--- a/docs/articles/index.html
+++ b/docs/articles/index.html
@@ -17,7 +17,7 @@
       
       
         mkin
-        1.2.3.1
+        1.2.4
       
     
 
@@ -111,7 +111,7 @@
         

         
Example evaluation of FOCUS Laboratory Data L1 to L3

         

-        
Introduction to mkin

+        
Short introduction to mkin

         

         
Testing hierarchical pathway kinetics with residue data on cyantraniliprole

         

diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html
index 88c63bef..6213916b 100644
--- a/docs/articles/mkin.html
+++ b/docs/articles/mkin.html
@@ -5,13 +5,13 @@
 
 
 
-Introduction to mkin • mkin
+Short introduction to mkin • mkin
 
 
 
 
 
-
+
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
-
-
-
+@media print {
+pre > code.sourceCode { white-space: pre-wrap; }
+pre > code.sourceCode > span { text-indent: -5em; padding-left: 5em; }
+}
+pre.numberSource code
+  { counter-reset: source-line 0; }
+pre.numberSource code > span
+  { position: relative; left: -4em; counter-increment: source-line; }
+pre.numberSource code > span > a:first-child::before
+  { content: counter(source-line);
+    position: relative; left: -1em; text-align: right; vertical-align: baseline;
+    border: none; display: inline-block;
+    -webkit-touch-callout: none; -webkit-user-select: none;
+    -khtml-user-select: none; -moz-user-select: none;
+    -ms-user-select: none; user-select: none;
+    padding: 0 4px; width: 4em;
+    color: #aaaaaa;
+  }
+pre.numberSource { margin-left: 3em; border-left: 1px solid #aaaaaa;  padding-left: 4px; }
+div.sourceCode
+  {   }
+@media screen {
+pre > code.sourceCode > span > a:first-child::before { text-decoration: underline; }
+}
+code span.al { color: #ff0000; font-weight: bold; } /* Alert */
+code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+code span.at { color: #7d9029; } /* Attribute */
+code span.bn { color: #40a070; } /* BaseN */
+code span.bu { color: #008000; } /* BuiltIn */
+code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+code span.ch { color: #4070a0; } /* Char */
+code span.cn { color: #880000; } /* Constant */
+code span.co { color: #60a0b0; font-style: italic; } /* Comment */
+code span.cv { color: #60a0b0; font-weight: bold; font-style: italic; } /* CommentVar */
+code span.do { color: #ba2121; font-style: italic; } /* Documentation */
+code span.dt { color: #902000; } /* DataType */
+code span.dv { color: #40a070; } /* DecVal */
+code span.er { color: #ff0000; font-weight: bold; } /* Error */
+code span.ex { } /* Extension */
+code span.fl { color: #40a070; } /* Float */
+code span.fu { color: #06287e; } /* Function */
+code span.im { color: #008000; font-weight: bold; } /* Import */
+code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+code span.op { color: #666666; } /* Operator */
+code span.ot { color: #007020; } /* Other */
+code span.pp { color: #bc7a00; } /* Preprocessor */
+code span.sc { color: #4070a0; } /* SpecialChar */
+code span.ss { color: #bb6688; } /* SpecialString */
+code span.st { color: #4070a0; } /* String */
+code span.va { color: #19177c; } /* Variable */
+code span.vs { color: #4070a0; } /* VerbatimString */
+code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
 
+
+
 
 
 
@@ -1350,206 +169,234 @@ div.csl-indent {
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
+
 
 
 
 
 
-

-
-
-
-

-

-

-

-

-
-

-
-
-
-
-