From 8b7edd4eaf0d196e674a085f744d1a69260a6c91 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 16 Nov 2023 06:02:05 +0100 Subject: Update pkgdown docs to bootstrap 5 with search --- docs/articles/FOCUS_D.html | 202 +++----- docs/articles/FOCUS_D_files/figure-html/plot-1.png | Bin 79834 -> 80361 bytes .../FOCUS_D_files/figure-html/plot_2-1.png | Bin 24334 -> 25051 bytes docs/articles/FOCUS_L.html | 293 +++++------ docs/articles/index.html | 163 +++--- docs/articles/mkin.html | 192 +++---- docs/articles/prebuilt/2022_cyan_pathway.html | 552 ++++++++++++--------- .../figure-html/unnamed-chunk-13-1.png | Bin 363434 -> 363589 bytes .../figure-html/unnamed-chunk-14-1.png | Bin 363895 -> 364310 bytes .../figure-html/unnamed-chunk-15-1.png | Bin 365048 -> 365199 bytes .../figure-html/unnamed-chunk-20-1.png | Bin 378042 -> 378245 bytes .../figure-html/unnamed-chunk-21-1.png | Bin 371436 -> 371558 bytes .../figure-html/unnamed-chunk-22-1.png | Bin 373322 -> 373392 bytes .../figure-html/unnamed-chunk-7-1.png | Bin 373930 -> 373137 bytes .../figure-html/unnamed-chunk-8-1.png | Bin 373322 -> 373392 bytes docs/articles/prebuilt/2022_dmta_parent.html | 467 ++++++++++------- .../figure-html/convergence-saem-dfop-const-1.png | Bin 128165 -> 130849 bytes .../figure-html/convergence-saem-dfop-tc-1.png | Bin 109149 -> 111959 bytes .../convergence-saem-dfop-tc-no-ranef-k2-1.png | Bin 117456 -> 121296 bytes .../figure-html/convergence-saem-fomc-const-1.png | Bin 100175 -> 101694 bytes .../figure-html/convergence-saem-fomc-tc-1.png | Bin 92215 -> 98067 bytes .../figure-html/convergence-saem-hs-const-1.png | Bin 129829 -> 132456 bytes .../figure-html/convergence-saem-hs-tc-1.png | Bin 98778 -> 102390 bytes .../figure-html/convergence-saem-sfo-const-1.png | Bin 75641 -> 76259 bytes .../figure-html/convergence-saem-sfo-tc-1.png | Bin 62897 -> 64271 bytes .../figure-html/multistart-full-par-1.png | Bin 74368 -> 75099 bytes .../figure-html/multistart-reduced-par-1.png | Bin 70345 -> 70760 bytes .../multistart-reduced-par-llquant-1.png | Bin 60617 -> 61217 bytes .../plot-saem-dfop-tc-no-ranef-k2-1.png | Bin 159128 -> 158644 bytes docs/articles/prebuilt/2022_dmta_pathway.html | 254 ++++------ .../saem-sforb-path-1-tc-reduced-convergence-1.png | Bin 155608 -> 160917 bytes .../figure-html/unnamed-chunk-2-1.png | Bin 114303 -> 114625 bytes .../figure-html/unnamed-chunk-3-1.png | Bin 400937 -> 403548 bytes .../figure-html/unnamed-chunk-4-1.png | Bin 399954 -> 401796 bytes .../figure-html/unnamed-chunk-6-1.png | Bin 392564 -> 394501 bytes .../figure-html/unnamed-chunk-7-1.png | Bin 398327 -> 399532 bytes .../figure-html/unnamed-chunk-8-1.png | Bin 400937 -> 403548 bytes docs/articles/prebuilt/2023_mesotrione_parent.html | 223 ++++----- docs/articles/twa.html | 194 +++----- docs/articles/web_only/FOCUS_Z.html | 195 +++----- .../figure-html/FOCUS_2006_Z_fits_1-1.png | Bin 66689 -> 67444 bytes .../figure-html/FOCUS_2006_Z_fits_10-1.png | Bin 105896 -> 107009 bytes .../figure-html/FOCUS_2006_Z_fits_11-1.png | Bin 104799 -> 106098 bytes .../figure-html/FOCUS_2006_Z_fits_11a-1.png | Bin 75224 -> 76831 bytes .../figure-html/FOCUS_2006_Z_fits_11b-1.png | Bin 36301 -> 37494 bytes .../figure-html/FOCUS_2006_Z_fits_2-1.png | Bin 66689 -> 67444 bytes .../figure-html/FOCUS_2006_Z_fits_3-1.png | Bin 66448 -> 67259 bytes .../figure-html/FOCUS_2006_Z_fits_5-1.png | Bin 80380 -> 81751 bytes .../figure-html/FOCUS_2006_Z_fits_6-1.png | Bin 105172 -> 106406 bytes .../figure-html/FOCUS_2006_Z_fits_7-1.png | Bin 104538 -> 105359 bytes .../figure-html/FOCUS_2006_Z_fits_9-1.png | Bin 88806 -> 89110 bytes docs/articles/web_only/NAFTA_examples.html | 196 +++----- .../NAFTA_examples_files/figure-html/p10-1.png | Bin 79758 -> 81542 bytes .../NAFTA_examples_files/figure-html/p11-1.png | Bin 76315 -> 77600 bytes .../NAFTA_examples_files/figure-html/p12a-1.png | Bin 81697 -> 83512 bytes .../NAFTA_examples_files/figure-html/p12b-1.png | Bin 70800 -> 71409 bytes .../NAFTA_examples_files/figure-html/p13-1.png | Bin 78121 -> 78613 bytes .../NAFTA_examples_files/figure-html/p14-1.png | Bin 80656 -> 81557 bytes .../NAFTA_examples_files/figure-html/p15a-1.png | Bin 76974 -> 77580 bytes .../NAFTA_examples_files/figure-html/p15b-1.png | Bin 78970 -> 79748 bytes .../NAFTA_examples_files/figure-html/p16-1.png | Bin 93950 -> 94540 bytes .../NAFTA_examples_files/figure-html/p5a-1.png | Bin 82665 -> 83061 bytes .../NAFTA_examples_files/figure-html/p5b-1.png | Bin 80721 -> 81186 bytes .../NAFTA_examples_files/figure-html/p6-1.png | Bin 83052 -> 83142 bytes .../NAFTA_examples_files/figure-html/p7-1.png | Bin 102570 -> 102934 bytes .../NAFTA_examples_files/figure-html/p8-1.png | Bin 92407 -> 93632 bytes .../NAFTA_examples_files/figure-html/p9a-1.png | Bin 78605 -> 78782 bytes .../NAFTA_examples_files/figure-html/p9b-1.png | Bin 76240 -> 76883 bytes docs/articles/web_only/benchmarks.html | 217 ++++---- docs/articles/web_only/compiled_models.html | 216 ++++---- docs/articles/web_only/dimethenamid_2018.html | 295 +++++------ docs/articles/web_only/multistart.html | 193 +++---- .../figure-html/unnamed-chunk-3-1.png | Bin 64334 -> 65359 bytes .../figure-html/unnamed-chunk-4-1.png | Bin 52775 -> 53645 bytes .../figure-html/unnamed-chunk-5-1.png | Bin 22131 -> 22804 bytes docs/articles/web_only/saem_benchmarks.html | 219 ++++---- 76 files changed, 1794 insertions(+), 2277 deletions(-) (limited to 'docs/articles') diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index 303ddb6f..c80c5fd2 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -4,145 +4,104 @@ - + + Example evaluation of FOCUS Example Dataset D • mkin - - - + + + - - + - + + Skip to contents -
-
-
- -
- diff --git a/docs/articles/FOCUS_D_files/figure-html/plot-1.png b/docs/articles/FOCUS_D_files/figure-html/plot-1.png index f0b51c1f..c0832a1a 100644 Binary files a/docs/articles/FOCUS_D_files/figure-html/plot-1.png and b/docs/articles/FOCUS_D_files/figure-html/plot-1.png differ diff --git a/docs/articles/FOCUS_D_files/figure-html/plot_2-1.png b/docs/articles/FOCUS_D_files/figure-html/plot_2-1.png index f6180470..02cfcfb4 100644 Binary files a/docs/articles/FOCUS_D_files/figure-html/plot_2-1.png and b/docs/articles/FOCUS_D_files/figure-html/plot_2-1.png differ diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index 7b5acf17..7aa90c4a 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -4,142 +4,104 @@ - + + Example evaluation of FOCUS Laboratory Data L1 to L3 • mkin - - - + + + - - + - + + Skip to contents -
-
-
-

The residual plot can be easily obtained by

@@ -268,25 +230,25 @@ objects.

## Warning in mkinfit("FOMC", FOCUS_2006_L1_mkin, quiet = TRUE): Optimisation did not converge:
 ## false convergence (8)
-plot(m.L1.FOMC, show_errmin = TRUE, main = "FOCUS L1 - FOMC")
+plot(m.L1.FOMC, show_errmin = TRUE, main = "FOCUS L1 - FOMC")

-summary(m.L1.FOMC, data = FALSE)
+summary(m.L1.FOMC, data = FALSE)
## 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
-
## mkin version used for fitting:    1.2.5 
-## R version used for fitting:       4.3.1 
-## Date of fit:     Wed Aug  9 17:55:39 2023 
-## Date of summary: Wed Aug  9 17:55:39 2023 
+
## mkin version used for fitting:    1.2.6 
+## R version used for fitting:       4.3.2 
+## Date of fit:     Thu Nov 16 04:20:13 2023 
+## Date of summary: Thu Nov 16 04:20:13 2023 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 342 model solutions performed in 0.07 s
+## Fitted using 342 model solutions performed in 0.023 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -398,7 +360,7 @@ residual plot can be obtained simply by adding the argument
 show_residuals to the plot command.

 m.L2.SFO <- mkinfit("SFO", FOCUS_2006_L2_mkin, quiet=TRUE)
-plot(m.L2.SFO, show_residuals = TRUE, show_errmin = TRUE,
+plot(m.L2.SFO, show_residuals = TRUE, show_errmin = TRUE,
      main = "FOCUS L2 - SFO")

The \(\chi^2\) error level of 14% @@ -422,22 +384,22 @@ kinetics.

For comparison, the FOMC model is fitted as well, and the \(\chi^2\) error level is checked.

 m.L2.FOMC <- mkinfit("FOMC", FOCUS_2006_L2_mkin, quiet = TRUE)
-plot(m.L2.FOMC, show_residuals = TRUE,
+plot(m.L2.FOMC, show_residuals = TRUE,
      main = "FOCUS L2 - FOMC")

-summary(m.L2.FOMC, data = FALSE)
-
## mkin version used for fitting:    1.2.5 
-## R version used for fitting:       4.3.1 
-## Date of fit:     Wed Aug  9 17:55:40 2023 
-## Date of summary: Wed Aug  9 17:55:40 2023 
+summary(m.L2.FOMC, data = FALSE)
+
## mkin version used for fitting:    1.2.6 
+## R version used for fitting:       4.3.2 
+## Date of fit:     Thu Nov 16 04:20:13 2023 
+## Date of summary: Thu Nov 16 04:20:14 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.044 s
+## Fitted using 239 model solutions performed in 0.014 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -506,15 +468,15 @@ the data.

Fitting the four parameter DFOP model further reduces the \(\chi^2\) error level.

 m.L2.DFOP <- mkinfit("DFOP", FOCUS_2006_L2_mkin, quiet = TRUE)
-plot(m.L2.DFOP, show_residuals = TRUE, show_errmin = TRUE,
+plot(m.L2.DFOP, show_residuals = TRUE, show_errmin = TRUE,
      main = "FOCUS L2 - DFOP")

-summary(m.L2.DFOP, data = FALSE)
-
## mkin version used for fitting:    1.2.5 
-## R version used for fitting:       4.3.1 
-## Date of fit:     Wed Aug  9 17:55:40 2023 
-## Date of summary: Wed Aug  9 17:55:40 2023 
+summary(m.L2.DFOP, data = FALSE)
+
## mkin version used for fitting:    1.2.6 
+## R version used for fitting:       4.3.2 
+## Date of fit:     Thu Nov 16 04:20:14 2023 
+## Date of summary: Thu Nov 16 04:20:14 2023 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -523,7 +485,7 @@ the data.

## ## Model predictions using solution type analytical ## -## Fitted using 581 model solutions performed in 0.119 s +## Fitted using 581 model solutions performed in 0.041 s ## ## Error model: Constant variance ## @@ -611,7 +573,7 @@ only the L3 dataset prepared above.

# Only use one core here, not to offend the CRAN checks mm.L3 <- mmkin(c("SFO", "FOMC", "DFOP"), cores = 1, list("FOCUS L3" = FOCUS_2006_L3_mkin), quiet = TRUE) -plot(mm.L3)
+plot(mm.L3)

The \(\chi^2\) error level of 21% as well as the plot suggest that the SFO model does not fit very well. The @@ -627,11 +589,11 @@ as a row index and datasets as a column index.

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.5 
-## R version used for fitting:       4.3.1 
-## Date of fit:     Wed Aug  9 17:55:41 2023 
-## Date of summary: Wed Aug  9 17:55:41 2023 
+summary(mm.L3[["DFOP", 1]])
+
## mkin version used for fitting:    1.2.6 
+## R version used for fitting:       4.3.2 
+## Date of fit:     Thu Nov 16 04:20:14 2023 
+## Date of summary: Thu Nov 16 04:20:14 2023 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -640,7 +602,7 @@ summary and plot functions working on mkinfit objects.

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

## 91 parent 15.0 15.18 -0.18181 ## 120 parent 12.0 10.19 1.81395
-plot(mm.L3[["DFOP", 1]], show_errmin = TRUE)
+plot(mm.L3[["DFOP", 1]], show_errmin = TRUE)

Here, a look to the model plot, the confidence intervals of the parameters and the correlation matrix suggest that the parameter @@ -746,7 +708,7 @@ below:

mm.L4 <- mmkin(c("SFO", "FOMC"), cores = 1, list("FOCUS L4" = FOCUS_2006_L4_mkin), quiet = TRUE) -plot(mm.L4)
+plot(mm.L4)

The \(\chi^2\) error level of 3.3% as well as the plot suggest that the SFO model fits very well. The error @@ -754,18 +716,18 @@ 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:    1.2.5 
-## R version used for fitting:       4.3.1 
-## Date of fit:     Wed Aug  9 17:55:42 2023 
-## Date of summary: Wed Aug  9 17:55:42 2023 
+summary(mm.L4[["SFO", 1]], data = FALSE)
+
## mkin version used for fitting:    1.2.6 
+## R version used for fitting:       4.3.2 
+## Date of fit:     Thu Nov 16 04:20:14 2023 
+## Date of summary: Thu Nov 16 04:20:15 2023 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 142 model solutions performed in 0.027 s
+## Fitted using 142 model solutions performed in 0.01 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -819,18 +781,18 @@ appears negligible.

## DT50 DT90 ## parent 106 352
-summary(mm.L4[["FOMC", 1]], data = FALSE)
-
## mkin version used for fitting:    1.2.5 
-## R version used for fitting:       4.3.1 
-## Date of fit:     Wed Aug  9 17:55:42 2023 
-## Date of summary: Wed Aug  9 17:55:42 2023 
+summary(mm.L4[["FOMC", 1]], data = FALSE)
+
## mkin version used for fitting:    1.2.6 
+## R version used for fitting:       4.3.2 
+## Date of fit:     Thu Nov 16 04:20:15 2023 
+## Date of summary: Thu Nov 16 04:20:15 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.04 s
+## Fitted using 224 model solutions performed in 0.014 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -900,34 +862,27 @@ Validierung von Modellierungssoftware als Alternative zu ModelMaker
 
 
 
-  
-
-  
 
-
 
 
-
-      
- diff --git a/docs/articles/index.html b/docs/articles/index.html index f6ad43c2..c6a8604e 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -1,109 +1,74 @@ -Articles • mkinArticles • mkin + + Skip to contents -
-
-
- +
+
+
@@ -141,23 +106,21 @@
Benchmark timings for saem.mmkin
-
-
+
-
+
- diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html index 3bd0d4d3..68755a66 100644 --- a/docs/articles/mkin.html +++ b/docs/articles/mkin.html @@ -4,141 +4,104 @@ - + + Short introduction to mkin • mkin - - - + + + - - + - + + Skip to contents -
-
-
-
-
- - -
- -
- diff --git a/docs/articles/prebuilt/2022_cyan_pathway.html b/docs/articles/prebuilt/2022_cyan_pathway.html index c22b07e4..5325018a 100644 --- a/docs/articles/prebuilt/2022_cyan_pathway.html +++ b/docs/articles/prebuilt/2022_cyan_pathway.html @@ -4,145 +4,104 @@ - + + Testing hierarchical pathway kinetics with residue data on cyantraniliprole • mkin - - - + + + - - + - + + Skip to contents -
-
-
- - - - +
-
- diff --git a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-13-1.png b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-13-1.png index 50f17cf4..b3d6066b 100644 Binary files a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-13-1.png and b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-13-1.png differ diff --git a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-14-1.png b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-14-1.png index 31e46086..341d48b9 100644 Binary files a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-14-1.png and b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-14-1.png differ diff --git a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-15-1.png b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-15-1.png index daefad97..92df5b6c 100644 Binary files a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-15-1.png and b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-15-1.png differ diff --git a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-20-1.png b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-20-1.png index 063e8615..1a17b3bc 100644 Binary files a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-20-1.png and b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-20-1.png differ diff --git a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-21-1.png b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-21-1.png index d666672d..15905501 100644 Binary files a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-21-1.png and b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-21-1.png differ diff --git a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-22-1.png b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-22-1.png index 55a517f0..cc7d0126 100644 Binary files a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-22-1.png and b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-22-1.png differ diff --git a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-7-1.png b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-7-1.png index 2693b983..48bfc544 100644 Binary files a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-7-1.png and b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-7-1.png differ diff --git a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-8-1.png b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-8-1.png index 55a517f0..cc7d0126 100644 Binary files a/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-8-1.png and b/docs/articles/prebuilt/2022_cyan_pathway_files/figure-html/unnamed-chunk-8-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent.html b/docs/articles/prebuilt/2022_dmta_parent.html index 9fdf75f7..952d028e 100644 --- a/docs/articles/prebuilt/2022_dmta_parent.html +++ b/docs/articles/prebuilt/2022_dmta_parent.html @@ -4,145 +4,104 @@ - + + Testing hierarchical parent degradation kinetics with residue data on dimethenamid and dimethenamid-P • mkin - - - + + + - - + - + + Skip to contents -
-
-
-
saemix version used for fitting:      3.2 
 mkin version used for pre-fitting:  1.2.6 
-R version used for fitting:         4.3.1 
-Date of fit:     Mon Oct 30 11:19:13 2023 
-Date of summary: Mon Oct 30 11:19:14 2023 
+R version used for fitting:         4.3.2 
+Date of fit:     Thu Nov 16 04:59:35 2023 
+Date of summary: Thu Nov 16 04:59:35 2023 
 
 Equations:
 d_DMTA/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -1304,7 +1263,7 @@ Data:
 
 Model predictions using solution type analytical 
 
-Fitted in 8.975 s
+Fitted in 4.4 s
 Using 300, 100 iterations and 9 chains
 
 Variance model: Two-component variance function 
@@ -1466,9 +1425,9 @@ Hierarchical mkin fit of the SFO model with error model const
 

 saemix version used for fitting:      3.2 
 mkin version used for pre-fitting:  1.2.6 
-R version used for fitting:         4.3.1 
-Date of fit:     Mon Oct 30 11:18:56 2023 
-Date of summary: Mon Oct 30 11:21:30 2023 
+R version used for fitting:         4.3.2 
+Date of fit:     Thu Nov 16 04:59:26 2023 
+Date of summary: Thu Nov 16 05:00:43 2023 
 
 Equations:
 d_DMTA/dt = - k_DMTA * DMTA
@@ -1478,7 +1437,7 @@ Data:
 
 Model predictions using solution type analytical 
 
-Fitted in 1.899 s
+Fitted in 0.788 s
 Using 300, 100 iterations and 9 chains
 
 Variance model: Constant variance 
@@ -1538,9 +1497,9 @@ Hierarchical mkin fit of the SFO model with error model tc
 

 saemix version used for fitting:      3.2 
 mkin version used for pre-fitting:  1.2.6 
-R version used for fitting:         4.3.1 
-Date of fit:     Mon Oct 30 11:19:00 2023 
-Date of summary: Mon Oct 30 11:21:30 2023 
+R version used for fitting:         4.3.2 
+Date of fit:     Thu Nov 16 04:59:28 2023 
+Date of summary: Thu Nov 16 05:00:43 2023 
 
 Equations:
 d_DMTA/dt = - k_DMTA * DMTA
@@ -1550,7 +1509,7 @@ Data:
 
 Model predictions using solution type analytical 
 
-Fitted in 5.364 s
+Fitted in 2.428 s
 Using 300, 100 iterations and 9 chains
 
 Variance model: Two-component variance function 
@@ -1612,9 +1571,9 @@ Hierarchical mkin fit of the FOMC model with error model const
 

 saemix version used for fitting:      3.2 
 mkin version used for pre-fitting:  1.2.6 
-R version used for fitting:         4.3.1 
-Date of fit:     Mon Oct 30 11:18:57 2023 
-Date of summary: Mon Oct 30 11:21:30 2023 
+R version used for fitting:         4.3.2 
+Date of fit:     Thu Nov 16 04:59:27 2023 
+Date of summary: Thu Nov 16 05:00:43 2023 
 
 Equations:
 d_DMTA/dt = - (alpha/beta) * 1/((time/beta) + 1) * DMTA
@@ -1624,7 +1583,7 @@ Data:
 
 Model predictions using solution type analytical 
 
-Fitted in 2.944 s
+Fitted in 1.28 s
 Using 300, 100 iterations and 9 chains
 
 Variance model: Constant variance 
@@ -1689,9 +1648,9 @@ Hierarchical mkin fit of the FOMC model with error model tc
 

 saemix version used for fitting:      3.2 
 mkin version used for pre-fitting:  1.2.6 
-R version used for fitting:         4.3.1 
-Date of fit:     Mon Oct 30 11:19:01 2023 
-Date of summary: Mon Oct 30 11:21:30 2023 
+R version used for fitting:         4.3.2 
+Date of fit:     Thu Nov 16 04:59:28 2023 
+Date of summary: Thu Nov 16 05:00:43 2023 
 
 Equations:
 d_DMTA/dt = - (alpha/beta) * 1/((time/beta) + 1) * DMTA
@@ -1701,7 +1660,7 @@ Data:
 
 Model predictions using solution type analytical 
 
-Fitted in 6.228 s
+Fitted in 2.793 s
 Using 300, 100 iterations and 9 chains
 
 Variance model: Two-component variance function 
@@ -1768,9 +1727,9 @@ Hierarchical mkin fit of the DFOP model with error model const
 

 saemix version used for fitting:      3.2 
 mkin version used for pre-fitting:  1.2.6 
-R version used for fitting:         4.3.1 
-Date of fit:     Mon Oct 30 11:18:57 2023 
-Date of summary: Mon Oct 30 11:21:30 2023 
+R version used for fitting:         4.3.2 
+Date of fit:     Thu Nov 16 04:59:27 2023 
+Date of summary: Thu Nov 16 05:00:43 2023 
 
 Equations:
 d_DMTA/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -1782,7 +1741,7 @@ Data:
 
 Model predictions using solution type analytical 
 
-Fitted in 3.231 s
+Fitted in 1.752 s
 Using 300, 100 iterations and 9 chains
 
 Variance model: Constant variance 
@@ -1852,9 +1811,9 @@ Hierarchical mkin fit of the DFOP model with error model tc
 

 saemix version used for fitting:      3.2 
 mkin version used for pre-fitting:  1.2.6 
-R version used for fitting:         4.3.1 
-Date of fit:     Mon Oct 30 11:19:01 2023 
-Date of summary: Mon Oct 30 11:21:30 2023 
+R version used for fitting:         4.3.2 
+Date of fit:     Thu Nov 16 04:59:29 2023 
+Date of summary: Thu Nov 16 05:00:43 2023 
 
 Equations:
 d_DMTA/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -1866,7 +1825,7 @@ Data:
 
 Model predictions using solution type analytical 
 
-Fitted in 6.71 s
+Fitted in 3.186 s
 Using 300, 100 iterations and 9 chains
 
 Variance model: Two-component variance function 
@@ -1938,27 +1897,166 @@ Hierarchical mkin fit of the HS model with error model const
 

 saemix version used for fitting:      3.2 
 mkin version used for pre-fitting:  1.2.6 
-R version used for fitting:         4.3.1 
-Date of fit:     Mon Oct 30 11:18:59 2023 
-Date of summary: Mon Oct 30 11:21:30 2023 
+R version used for fitting:         4.3.2 
+Date of fit:     Thu Nov 16 04:59:28 2023 
+Date of summary: Thu Nov 16 05:00:43 2023 
 
 Equations:
-d_DMTA/dt = - ifelse(time 
-

+d_DMTA/dt = - ifelse(time <= tb, k1, k2) * DMTA + +Data: +155 observations of 1 variable(s) grouped in 6 datasets + +Model predictions using solution type analytical + +Fitted in 2.28 s +Using 300, 100 iterations and 9 chains + +Variance model: Constant variance + +Starting values for degradation parameters: + DMTA_0 k1 k2 tb +97.82176 0.06931 0.02997 11.13945 + +Fixed degradation parameter values: +None + +Starting values for random effects (square root of initial entries in omega): + DMTA_0 k1 k2 tb +DMTA_0 97.82 0 0 0 +k1 0.00 1 0 0 +k2 0.00 0 1 0 +tb 0.00 0 0 1 + +Starting values for error model parameters: +a.1 + 1 + +Results: + +Likelihood computed by importance sampling + AIC BIC logLik + 714 712.1 -348 + +Optimised parameters: + est. lower upper +DMTA_0 98.16102 96.47747 99.84456 +k1 0.07876 0.05261 0.10491 +k2 0.02227 0.01706 0.02747 +tb 13.99089 -7.40049 35.38228 +a.1 1.82305 1.60700 2.03910 +SD.DMTA_0 1.88413 0.56204 3.20622 +SD.k1 0.34292 0.10482 0.58102 +SD.k2 0.19851 0.01718 0.37985 +SD.tb 1.68168 0.58064 2.78272 + +Correlation: + DMTA_0 k1 k2 +k1 0.0142 +k2 0.0001 -0.0025 +tb 0.0165 -0.1256 -0.0301 + +Random effects: + est. lower upper +SD.DMTA_0 1.8841 0.56204 3.2062 +SD.k1 0.3429 0.10482 0.5810 +SD.k2 0.1985 0.01718 0.3798 +SD.tb 1.6817 0.58064 2.7827 + +Variance model: + est. lower upper +a.1 1.823 1.607 2.039 + +Estimated disappearance times: + DT50 DT90 DT50back DT50_k1 DT50_k2 +DMTA 8.801 67.91 20.44 8.801 31.13 + +
+

Hierarchical mkin fit of the HS model with error model tc

 saemix version used for fitting:      3.2 
 mkin version used for pre-fitting:  1.2.6 
-R version used for fitting:         4.3.1 
-Date of fit:     Mon Oct 30 11:19:02 2023 
-Date of summary: Mon Oct 30 11:21:30 2023 
+R version used for fitting:         4.3.2 
+Date of fit:     Thu Nov 16 04:59:29 2023 
+Date of summary: Thu Nov 16 05:00:43 2023 
 
 Equations:
-d_DMTA/dt = - ifelse(time 
-

-
+d_DMTA/dt = - ifelse(time <= tb, k1, k2) * DMTA + +Data: +155 observations of 1 variable(s) grouped in 6 datasets + +Model predictions using solution type analytical + +Fitted in 3.658 s +Using 300, 100 iterations and 9 chains + +Variance model: Two-component variance function + +Starting values for degradation parameters: + DMTA_0 k1 k2 tb +98.45190 0.07525 0.02576 19.19375 + +Fixed degradation parameter values: +None + +Starting values for random effects (square root of initial entries in omega): + DMTA_0 k1 k2 tb +DMTA_0 98.45 0 0 0 +k1 0.00 1 0 0 +k2 0.00 0 1 0 +tb 0.00 0 0 1 + +Starting values for error model parameters: +a.1 b.1 + 1 1 + +Results: + +Likelihood computed by importance sampling + AIC BIC logLik + 667.1 665 -323.6 + +Optimised parameters: + est. lower upper +DMTA_0 97.76571 95.81350 99.71791 +k1 0.05855 0.03080 0.08630 +k2 0.02337 0.01664 0.03010 +tb 31.09638 29.38289 32.80987 +a.1 1.08835 0.88590 1.29080 +b.1 0.02964 0.02257 0.03671 +SD.DMTA_0 2.04877 0.42607 3.67147 +SD.k1 0.59166 0.25621 0.92711 +SD.k2 0.30698 0.09561 0.51835 +SD.tb 0.01274 -0.10914 0.13462 + +Correlation: + DMTA_0 k1 k2 +k1 0.0160 +k2 -0.0070 -0.0024 +tb -0.0668 -0.0103 -0.2013 + +Random effects: + est. lower upper +SD.DMTA_0 2.04877 0.42607 3.6715 +SD.k1 0.59166 0.25621 0.9271 +SD.k2 0.30698 0.09561 0.5183 +SD.tb 0.01274 -0.10914 0.1346 + +Variance model: + est. lower upper +a.1 1.08835 0.88590 1.29080 +b.1 0.02964 0.02257 0.03671 + +Estimated disappearance times: + DT50 DT90 DT50back DT50_k1 DT50_k2 +DMTA 11.84 51.71 15.57 11.84 29.66 + +
+

Hierarchical model convergence plots @@ -2007,23 +2105,23 @@ Convergence plot for the NLHM HS fit with two-component error

Session info

-
R version 4.3.1 (2023-06-16)
+
R version 4.3.2 (2023-10-31)
 Platform: x86_64-pc-linux-gnu (64-bit)
-Running under: Ubuntu 22.04.3 LTS
+Running under: Debian GNU/Linux 12 (bookworm)
 
 Matrix products: default
-BLAS:   /usr/lib/x86_64-linux-gnu/blas/libblas.so.3.10.0 
-LAPACK: /usr/lib/x86_64-linux-gnu/lapack/liblapack.so.3.10.0
+BLAS:   /usr/lib/x86_64-linux-gnu/blas/libblas.so.3.11.0 
+LAPACK: /usr/lib/x86_64-linux-gnu/lapack/liblapack.so.3.11.0
 
 locale:
- [1] LC_CTYPE=en_US.UTF-8       LC_NUMERIC=C              
- [3] LC_TIME=en_US.UTF-8        LC_COLLATE=en_US.UTF-8    
- [5] LC_MONETARY=en_US.UTF-8    LC_MESSAGES=en_US.UTF-8   
- [7] LC_PAPER=en_US.UTF-8       LC_NAME=C                 
+ [1] LC_CTYPE=de_DE.UTF-8       LC_NUMERIC=C              
+ [3] LC_TIME=de_DE.UTF-8        LC_COLLATE=de_DE.UTF-8    
+ [5] LC_MONETARY=de_DE.UTF-8    LC_MESSAGES=de_DE.UTF-8   
+ [7] LC_PAPER=de_DE.UTF-8       LC_NAME=C                 
  [9] LC_ADDRESS=C               LC_TELEPHONE=C            
-[11] LC_MEASUREMENT=en_US.UTF-8 LC_IDENTIFICATION=C       
+[11] LC_MEASUREMENT=de_DE.UTF-8 LC_IDENTIFICATION=C       
 
-time zone: Europe/Zurich
+time zone: Europe/Berlin
 tzcode source: system (glibc)
 
 attached base packages:
@@ -2031,59 +2129,52 @@ attached base packages:
 [8] base     
 
 other attached packages:
-[1] saemix_3.2 npde_3.3   knitr_1.44 mkin_1.2.6
+[1] saemix_3.2 npde_3.3   knitr_1.42 mkin_1.2.6
 
 loaded via a namespace (and not attached):
- [1] sass_0.4.7        utf8_1.2.3        generics_0.1.3    stringi_1.7.12   
- [5] lattice_0.21-9    digest_0.6.33     magrittr_2.0.3    evaluate_0.22    
- [9] grid_4.3.1        fastmap_1.1.1     rprojroot_2.0.3   jsonlite_1.8.7   
-[13] mclust_6.0.0      gridExtra_2.3     purrr_1.0.1       fansi_1.0.4      
-[17] scales_1.2.1      codetools_0.2-19  textshaping_0.3.6 jquerylib_0.1.4  
-[21] cli_3.6.1         rlang_1.1.1       munsell_0.5.0     cachem_1.0.8     
-[25] yaml_2.3.7        tools_4.3.1       memoise_2.0.1     dplyr_1.1.2      
-[29] colorspace_2.1-0  ggplot2_3.4.2     vctrs_0.6.3       R6_2.5.1         
-[33] zoo_1.8-12        lifecycle_1.0.3   stringr_1.5.0     fs_1.6.3         
-[37] MASS_7.3-60       ragg_1.2.5        pkgconfig_2.0.3   desc_1.4.2       
-[41] pkgdown_2.0.7     bslib_0.5.1       pillar_1.9.0      gtable_0.3.3     
-[45] glue_1.6.2        systemfonts_1.0.4 xfun_0.40         tibble_3.2.1     
-[49] lmtest_0.9-40     tidyselect_1.2.0  rstudioapi_0.15.0 htmltools_0.5.6.1
-[53] nlme_3.1-163      rmarkdown_2.23    compiler_4.3.1   
+ [1] sass_0.4.6 utf8_1.2.3 generics_0.1.3 stringi_1.7.12 + [5] lattice_0.21-8 digest_0.6.31 magrittr_2.0.3 evaluate_0.21 + [9] grid_4.3.2 fastmap_1.1.1 rprojroot_2.0.3 jsonlite_1.8.4 +[13] DBI_1.1.3 mclust_6.0.0 gridExtra_2.3 purrr_1.0.1 +[17] fansi_1.0.4 scales_1.2.1 codetools_0.2-19 textshaping_0.3.6 +[21] jquerylib_0.1.4 cli_3.6.1 rlang_1.1.1 munsell_0.5.0 +[25] cachem_1.0.8 yaml_2.3.7 tools_4.3.2 memoise_2.0.1 +[29] dplyr_1.1.2 colorspace_2.1-0 ggplot2_3.4.2 vctrs_0.6.2 +[33] R6_2.5.1 zoo_1.8-12 lifecycle_1.0.3 stringr_1.5.0 +[37] fs_1.6.2 MASS_7.3-60 ragg_1.2.5 pkgconfig_2.0.3 +[41] desc_1.4.2 pkgdown_2.0.7 bslib_0.4.2 pillar_1.9.0 +[45] gtable_0.3.3 glue_1.6.2 systemfonts_1.0.4 highr_0.10 +[49] xfun_0.39 tibble_3.2.1 lmtest_0.9-40 tidyselect_1.2.0 +[53] htmltools_0.5.5 nlme_3.1-163 rmarkdown_2.21 compiler_4.3.2

Hardware info

-
CPU model: Intel(R) Xeon(R) Gold 6134 CPU @ 3.20GHz
-
MemTotal:       247605564 kB
+
CPU model: AMD Ryzen 9 7950X 16-Core Processor
+
MemTotal:       64927712 kB

- - - - + -
- diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-const-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-const-1.png index 4c74de78..5cf68cb2 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-const-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-const-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-tc-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-tc-1.png index 4bd1ceb1..3fbe25a6 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-tc-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-tc-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-tc-no-ranef-k2-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-tc-no-ranef-k2-1.png index 612478e5..7b7dd575 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-tc-no-ranef-k2-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-dfop-tc-no-ranef-k2-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-fomc-const-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-fomc-const-1.png index 953ffb3c..77f1ad5d 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-fomc-const-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-fomc-const-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-fomc-tc-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-fomc-tc-1.png index 21ca0bce..d3bbbf9b 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-fomc-tc-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-fomc-tc-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-hs-const-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-hs-const-1.png index f15137d0..0f3b1184 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-hs-const-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-hs-const-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-hs-tc-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-hs-tc-1.png index 322668f0..901a1579 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-hs-tc-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-hs-tc-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-sfo-const-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-sfo-const-1.png index 4ceb281f..a3e3a51f 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-sfo-const-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-sfo-const-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-sfo-tc-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-sfo-tc-1.png index 07383871..b85691eb 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-sfo-tc-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/convergence-saem-sfo-tc-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-full-par-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-full-par-1.png index bd89ef9f..1c17b152 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-full-par-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-full-par-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-reduced-par-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-reduced-par-1.png index 97502695..4220267e 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-reduced-par-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-reduced-par-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-reduced-par-llquant-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-reduced-par-llquant-1.png index b74347bc..db387edf 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-reduced-par-llquant-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/multistart-reduced-par-llquant-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/plot-saem-dfop-tc-no-ranef-k2-1.png b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/plot-saem-dfop-tc-no-ranef-k2-1.png index 277b7c18..c9709e0b 100644 Binary files a/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/plot-saem-dfop-tc-no-ranef-k2-1.png and b/docs/articles/prebuilt/2022_dmta_parent_files/figure-html/plot-saem-dfop-tc-no-ranef-k2-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_pathway.html b/docs/articles/prebuilt/2022_dmta_pathway.html index 2c3f326a..9a0e181d 100644 --- a/docs/articles/prebuilt/2022_dmta_pathway.html +++ b/docs/articles/prebuilt/2022_dmta_pathway.html @@ -4,145 +4,104 @@ - + + Testing hierarchical pathway kinetics with residue data on dimethenamid and dimethenamid-P • mkin - - - + + + - - + - + + Skip to contents -
-
-
- -
- - -
- -
- diff --git a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/saem-sforb-path-1-tc-reduced-convergence-1.png b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/saem-sforb-path-1-tc-reduced-convergence-1.png index f1019504..a7187abc 100644 Binary files a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/saem-sforb-path-1-tc-reduced-convergence-1.png and b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/saem-sforb-path-1-tc-reduced-convergence-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-2-1.png b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-2-1.png index 84cd7c7f..ba36beb2 100644 Binary files a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-2-1.png and b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-2-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-3-1.png b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-3-1.png index de185aee..80376942 100644 Binary files a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-3-1.png and b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-3-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-4-1.png b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-4-1.png index e0d8cc09..15a30cfb 100644 Binary files a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-4-1.png and b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-4-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-6-1.png b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-6-1.png index a07b7aad..5445ddb5 100644 Binary files a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-6-1.png and b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-6-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-7-1.png b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-7-1.png index e50e0524..067b144d 100644 Binary files a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-7-1.png and b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-7-1.png differ diff --git a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-8-1.png b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-8-1.png index de185aee..80376942 100644 Binary files a/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-8-1.png and b/docs/articles/prebuilt/2022_dmta_pathway_files/figure-html/unnamed-chunk-8-1.png differ diff --git a/docs/articles/prebuilt/2023_mesotrione_parent.html b/docs/articles/prebuilt/2023_mesotrione_parent.html index 8f166a73..77f9bada 100644 --- a/docs/articles/prebuilt/2023_mesotrione_parent.html +++ b/docs/articles/prebuilt/2023_mesotrione_parent.html @@ -4,145 +4,104 @@ - + + Testing covariate modelling in hierarchical parent degradation kinetics with residue data on mesotrione • mkin - - - + + + - - + - + + Skip to contents -
-
-
- - - -
- -
- diff --git a/docs/articles/twa.html b/docs/articles/twa.html index 4b3e11a3..5452a5e5 100644 --- a/docs/articles/twa.html +++ b/docs/articles/twa.html @@ -4,145 +4,104 @@ - + + Calculation of time weighted average concentrations with mkin • mkin - - - + + + - - + - + + Skip to contents -
-
-
- -
- - - +
-
- diff --git a/docs/articles/web_only/FOCUS_Z.html b/docs/articles/web_only/FOCUS_Z.html index f19f59ad..7fd597d2 100644 --- a/docs/articles/web_only/FOCUS_Z.html +++ b/docs/articles/web_only/FOCUS_Z.html @@ -4,144 +4,104 @@ - + + Example evaluation of FOCUS dataset Z • mkin - - - + + + - - + - + + Skip to contents -
-
-
- - -
- diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png index be652d31..98bc135b 100644 Binary files a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png and b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_1-1.png differ diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png index 11c158fa..c1011a35 100644 Binary files a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png and b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_10-1.png differ diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png index fb44de27..dfd2dd50 100644 Binary files a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png and b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11-1.png differ diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png index 4603d247..74173f36 100644 Binary files a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png and b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11a-1.png differ diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png index 1454c938..1c5793cc 100644 Binary files a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png and b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_11b-1.png differ diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png index be652d31..98bc135b 100644 Binary files a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png and b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_2-1.png differ diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png index 59524035..0380ba43 100644 Binary files a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png and b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_3-1.png differ diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png index 77965455..8c594ec9 100644 Binary files a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png and b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_5-1.png differ diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png index 5ea3152e..84d473d6 100644 Binary files a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png and b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_6-1.png differ diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png index d87105fb..87af8874 100644 Binary files a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png and b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_7-1.png differ diff --git a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png index 06e3ff57..492cdcc8 100644 Binary files a/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png and b/docs/articles/web_only/FOCUS_Z_files/figure-html/FOCUS_2006_Z_fits_9-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples.html b/docs/articles/web_only/NAFTA_examples.html index 1c5be845..57b2ed1c 100644 --- a/docs/articles/web_only/NAFTA_examples.html +++ b/docs/articles/web_only/NAFTA_examples.html @@ -4,145 +4,104 @@ - + + Evaluation of example datasets from Attachment 1 to the US EPA SOP for the NAFTA guidance • mkin - - - + + + - - + - + + Skip to contents -
-
-
- - -
- diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png index de4a527f..1d4a25e0 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p10-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png index 55466e47..71fc4699 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p11-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png index d3143afa..a1d3a084 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p12a-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png index 3387ca69..1a6fdd03 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p12b-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png index 62a135f2..f9b9f637 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p13-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png index ae4d83a4..9f7b0cc5 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p14-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png index f82e6e64..aa55169e 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p15a-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png index 2cb20cf7..d17c7aae 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p15b-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png index 72df855b..75ac7e5b 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p16-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png index 391dfb95..12a62954 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p5a-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png index 034eed46..9e38e696 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p5b-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png index 86cd9755..e6e3abbe 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p6-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png index 10225504..7c5d4bab 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p7-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png index 5cd6c806..a1e3bf25 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p8-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png index 61359ea6..c247fd4e 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p9a-1.png differ diff --git a/docs/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png b/docs/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png index 85790b1e..99d593fc 100644 Binary files a/docs/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png and b/docs/articles/web_only/NAFTA_examples_files/figure-html/p9b-1.png differ diff --git a/docs/articles/web_only/benchmarks.html b/docs/articles/web_only/benchmarks.html index 7c4af88b..17c2f8d8 100644 --- a/docs/articles/web_only/benchmarks.html +++ b/docs/articles/web_only/benchmarks.html @@ -4,144 +4,104 @@ - + + Benchmark timings for mkin • mkin - - - + + + - - + - + + Skip to contents -
-
-
- -
- - - +
-
- diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html index 1aa88e05..210ddaf7 100644 --- a/docs/articles/web_only/compiled_models.html +++ b/docs/articles/web_only/compiled_models.html @@ -4,144 +4,103 @@ - + + Performance benefit by using compiled model definitions in mkin • mkin - - - + + + - - + - + + Skip to contents -
-
-
-
##                    test replications relative elapsed
-## 4            analytical            1    1.000   0.213
-## 3     deSolve, compiled            1    1.418   0.302
-## 2      Eigenvalue based            1    2.000   0.426
-## 1 deSolve, not compiled            1   23.535   5.013
+## 4 analytical 1 1.000 0.109 +## 3 deSolve, compiled 1 1.284 0.140 +## 2 Eigenvalue based 1 1.670 0.182 +## 1 deSolve, not compiled 1 21.927 2.390

We see that using the compiled model is by more than a factor of 10 faster than using deSolve without compiled code.

@@ -250,44 +209,37 @@ compiled code is available.

}
## Temporary DLL for differentials generated and loaded
##                    test replications relative elapsed
-## 2     deSolve, compiled            1    1.000   0.492
-## 1 deSolve, not compiled            1   20.398  10.036
-

Here we get a performance benefit of a factor of 20 using the version +## 2 deSolve, compiled 1 1.000 0.181 +## 1 deSolve, not compiled 1 23.646 4.280

+

Here we get a performance benefit of a factor of 24 using the version of the differential equation model compiled from C code!

This vignette was built with mkin 1.2.6 on

-
## R version 4.3.1 (2023-06-16)
+
## R version 4.3.2 (2023-10-31)
 ## Platform: x86_64-pc-linux-gnu (64-bit)
-## Running under: Ubuntu 22.04.3 LTS
-
## CPU model: Intel(R) Xeon(R) Gold 6134 CPU @ 3.20GHz
- - - -
+
## CPU model: AMD Ryzen 9 7950X 16-Core Processor
- + -
- diff --git a/docs/articles/web_only/dimethenamid_2018.html b/docs/articles/web_only/dimethenamid_2018.html index 1cffd561..4221ba07 100644 --- a/docs/articles/web_only/dimethenamid_2018.html +++ b/docs/articles/web_only/dimethenamid_2018.html @@ -4,145 +4,104 @@ - + + Example evaluations of the dimethenamid data from 2018 • mkin - - - + + + - - + - + + Skip to contents -
-
-
-

Using biexponential decline (DFOP) results in a slightly more random scatter of the residuals:

-plot(mixed(f_parent_mkin_const["DFOP", ]))
+plot(mixed(f_parent_mkin_const["DFOP", ]))

The population curve (bold line) in the above plot results from taking the mean of the individual transformed parameters, i.e. of log k1 @@ -242,7 +201,7 @@ dominates the average. This is alleviated if only rate constants that pass the t-test for significant difference from zero (on the untransformed scale) are considered in the averaging:

-plot(mixed(f_parent_mkin_const["DFOP", ]), test_log_parms = TRUE)
+plot(mixed(f_parent_mkin_const["DFOP", ]), test_log_parms = TRUE)

While this is visually much more satisfactory, such an average procedure could introduce a bias, as not all results from the individual @@ -254,7 +213,7 @@ degradation model and the error model (see below).

predicted residues is reduced by using the two-component error model:

-plot(mixed(f_parent_mkin_tc["DFOP", ]), test_log_parms = TRUE)
+plot(mixed(f_parent_mkin_tc["DFOP", ]), test_log_parms = TRUE)

However, note that in the case of using this error model, the fits to the Flaach and BBA 2.3 datasets appear to be ill-defined, indicated by @@ -344,7 +303,7 @@ effects does not improve the fits.

The selected model (DFOP with two-component error) fitted to the data assuming no correlations between random effects is shown below.

-plot(f_parent_nlme_dfop_tc)
+plot(f_parent_nlme_dfop_tc)

@@ -361,17 +320,8 @@ implemented in the saemix package, the convergence plots need to be manually checked for every fit. We define control settings that work well for all the parent data fits shown in this vignette.

-library(saemix)
-
Loading required package: npde
-
Package saemix, version 3.2
-  please direct bugs, questions and feedback to emmanuelle.comets@inserm.fr
-

-Attaching package: 'saemix'
-
The following objects are masked from 'package:npde':
-
-    kurtosis, skewness
-
-saemix_control <- saemixControl(nbiter.saemix = c(800, 300), nb.chains = 15,
+library(saemix)
+saemix_control <- saemixControl(nbiter.saemix = c(800, 300), nb.chains = 15,
     print = FALSE, save = FALSE, save.graphs = FALSE, displayProgress = FALSE)
 saemix_control_moreiter <- saemixControl(nbiter.saemix = c(1600, 300), nb.chains = 15,
     print = FALSE, save = FALSE, save.graphs = FALSE, displayProgress = FALSE)
@@ -379,7 +329,7 @@ Attaching package: 'saemix'
print = FALSE, save = FALSE, save.graphs = FALSE, displayProgress = FALSE)

The convergence plot for the SFO model using constant variance is shown below.

-
+
 f_parent_saemix_sfo_const <- mkin::saem(f_parent_mkin_const["SFO", ], quiet = TRUE,
   control = saemix_control, transformations = "saemix")
 plot(f_parent_saemix_sfo_const$so, plot.type = "convergence")
@@ -387,19 +337,19 @@ shown below.

Obviously the selected number of iterations is sufficient to reach convergence. This can also be said for the SFO fit using the two-component error model.

-
+
 f_parent_saemix_sfo_tc <- mkin::saem(f_parent_mkin_tc["SFO", ], quiet = TRUE,
   control = saemix_control, transformations = "saemix")
 plot(f_parent_saemix_sfo_tc$so, plot.type = "convergence")

When fitting the DFOP model with constant variance (see below), parameter convergence is not as unambiguous.

-
+
 f_parent_saemix_dfop_const <- mkin::saem(f_parent_mkin_const["DFOP", ], quiet = TRUE,
   control = saemix_control, transformations = "saemix")
 plot(f_parent_saemix_dfop_const$so, plot.type = "convergence")

-
+
 print(f_parent_saemix_dfop_const)
Kinetic nonlinear mixed-effects model fit by SAEM
 Structural model:
@@ -435,14 +385,14 @@ this model.

also observe that the estimated variance of k2 becomes very small, while being ill-defined, as illustrated by the excessive confidence interval of SD.k2.

-
+
 f_parent_saemix_dfop_tc <- mkin::saem(f_parent_mkin_tc["DFOP", ], quiet = TRUE,
   control = saemix_control, transformations = "saemix")
 f_parent_saemix_dfop_tc_moreiter <- mkin::saem(f_parent_mkin_tc["DFOP", ], quiet = TRUE,
   control = saemix_control_moreiter, transformations = "saemix")
 plot(f_parent_saemix_dfop_tc$so, plot.type = "convergence")

-
+
 print(f_parent_saemix_dfop_tc)
Kinetic nonlinear mixed-effects model fit by SAEM
 Structural model:
@@ -484,7 +434,7 @@ message.

The four combinations (SFO/const, SFO/tc, DFOP/const and DFOP/tc) and the version with increased iterations can be compared using the model comparison function of the saemix package:

-
+
 AIC_parent_saemix <- saemix::compare.saemix(
   f_parent_saemix_sfo_const$so,
   f_parent_saemix_sfo_tc$so,
@@ -492,7 +442,7 @@ comparison function of the saemix package:

f_parent_saemix_dfop_tc$so, f_parent_saemix_dfop_tc_moreiter$so)
Likelihoods calculated by importance sampling
-
+
 rownames(AIC_parent_saemix) <- c(
   "SFO const", "SFO tc", "DFOP const", "DFOP tc", "DFOP tc more iterations")
 print(AIC_parent_saemix)
@@ -506,7 +456,7 @@ DFOP tc more iterations 665.85 663.76
algorithms implemented in saemix, the likelihood from Gaussian quadrature is added to the best fit, and the AIC values obtained from the three methods are compared.

-
+
 f_parent_saemix_dfop_tc$so <-
   saemix::llgq.saemix(f_parent_saemix_dfop_tc$so)
 AIC_parent_saemix_methods <- c(
@@ -530,7 +480,7 @@ iterations makes a lot of difference. When using the LAPACK version
 coming with Debian Bullseye, the AIC based on Gaussian quadrature is
 almost the same as the one obtained with the other methods, also when
 using defaults for the fit.

-
+
 f_parent_saemix_dfop_tc_defaults <- mkin::saem(f_parent_mkin_tc["DFOP", ])
 f_parent_saemix_dfop_tc_defaults$so <-
   saemix::llgq.saemix(f_parent_saemix_dfop_tc_defaults$so)
@@ -550,7 +500,7 @@ using defaults for the fit.

The following table gives the AIC values obtained with both backend packages using the same control parameters (800 iterations burn-in, 300 iterations second phase, 15 chains).

-
+
 AIC_all <- data.frame(
   check.names = FALSE,
   "Degradation model" = c("SFO", "SFO", "DFOP", "DFOP"),
@@ -561,7 +511,7 @@ iterations second phase, 15 chains).

saemix_is = sapply(list(f_parent_saemix_sfo_const$so, f_parent_saemix_sfo_tc$so, f_parent_saemix_dfop_const$so, f_parent_saemix_dfop_tc$so), AIC, method = "is") ) -kable(AIC_all)
+kable(AIC_all)
@@ -624,48 +574,48 @@ satisfactory precision.

Session Info

-
+
-
R version 4.3.1 (2023-06-16)
+
R version 4.3.2 (2023-10-31)
 Platform: x86_64-pc-linux-gnu (64-bit)
-Running under: Ubuntu 22.04.3 LTS
+Running under: Debian GNU/Linux 12 (bookworm)
 
 Matrix products: default
-BLAS:   /usr/lib/x86_64-linux-gnu/blas/libblas.so.3.10.0 
-LAPACK: /usr/lib/x86_64-linux-gnu/lapack/liblapack.so.3.10.0
+BLAS:   /usr/lib/x86_64-linux-gnu/blas/libblas.so.3.11.0 
+LAPACK: /usr/lib/x86_64-linux-gnu/lapack/liblapack.so.3.11.0
 
 locale:
- [1] LC_CTYPE=en_US.UTF-8       LC_NUMERIC=C              
- [3] LC_TIME=C                  LC_COLLATE=en_US.UTF-8    
- [5] LC_MONETARY=en_US.UTF-8    LC_MESSAGES=en_US.UTF-8   
- [7] LC_PAPER=en_US.UTF-8       LC_NAME=C                 
+ [1] LC_CTYPE=de_DE.UTF-8       LC_NUMERIC=C              
+ [3] LC_TIME=C                  LC_COLLATE=de_DE.UTF-8    
+ [5] LC_MONETARY=de_DE.UTF-8    LC_MESSAGES=de_DE.UTF-8   
+ [7] LC_PAPER=de_DE.UTF-8       LC_NAME=C                 
  [9] LC_ADDRESS=C               LC_TELEPHONE=C            
-[11] LC_MEASUREMENT=en_US.UTF-8 LC_IDENTIFICATION=C       
+[11] LC_MEASUREMENT=de_DE.UTF-8 LC_IDENTIFICATION=C       
 
-time zone: Europe/Zurich
+time zone: Europe/Berlin
 tzcode source: system (glibc)
 
 attached base packages:
 [1] stats     graphics  grDevices utils     datasets  methods   base     
 
 other attached packages:
-[1] saemix_3.2   npde_3.3     nlme_3.1-163 mkin_1.2.6   knitr_1.44  
+[1] saemix_3.2   npde_3.3     nlme_3.1-163 mkin_1.2.6   knitr_1.42  
 
 loaded via a namespace (and not attached):
- [1] sass_0.4.7        utf8_1.2.3        generics_0.1.3    stringi_1.7.12   
- [5] lattice_0.21-9    digest_0.6.33     magrittr_2.0.3    evaluate_0.22    
- [9] grid_4.3.1        fastmap_1.1.1     rprojroot_2.0.3   jsonlite_1.8.7   
-[13] mclust_6.0.0      gridExtra_2.3     purrr_1.0.1       fansi_1.0.4      
-[17] scales_1.2.1      codetools_0.2-19  textshaping_0.3.6 jquerylib_0.1.4  
-[21] cli_3.6.1         rlang_1.1.1       munsell_0.5.0     cachem_1.0.8     
-[25] yaml_2.3.7        tools_4.3.1       parallel_4.3.1    memoise_2.0.1    
-[29] dplyr_1.1.2       colorspace_2.1-0  ggplot2_3.4.2     vctrs_0.6.3      
-[33] R6_2.5.1          zoo_1.8-12        lifecycle_1.0.3   stringr_1.5.0    
-[37] fs_1.6.3          MASS_7.3-60       ragg_1.2.5        pkgconfig_2.0.3  
-[41] desc_1.4.2        pkgdown_2.0.7     bslib_0.5.1       pillar_1.9.0     
-[45] gtable_0.3.3      glue_1.6.2        systemfonts_1.0.4 xfun_0.40        
-[49] tibble_3.2.1      lmtest_0.9-40     tidyselect_1.2.0  rstudioapi_0.15.0
-[53] htmltools_0.5.6.1 rmarkdown_2.23    compiler_4.3.1   
+ [1] sass_0.4.6 utf8_1.2.3 generics_0.1.3 stringi_1.7.12 + [5] lattice_0.21-8 digest_0.6.31 magrittr_2.0.3 evaluate_0.21 + [9] grid_4.3.2 fastmap_1.1.1 rprojroot_2.0.3 jsonlite_1.8.4 +[13] DBI_1.1.3 mclust_6.0.0 gridExtra_2.3 purrr_1.0.1 +[17] fansi_1.0.4 scales_1.2.1 codetools_0.2-19 textshaping_0.3.6 +[21] jquerylib_0.1.4 cli_3.6.1 rlang_1.1.1 munsell_0.5.0 +[25] cachem_1.0.8 yaml_2.3.7 tools_4.3.2 parallel_4.3.2 +[29] memoise_2.0.1 dplyr_1.1.2 colorspace_2.1-0 ggplot2_3.4.2 +[33] vctrs_0.6.2 R6_2.5.1 zoo_1.8-12 lifecycle_1.0.3 +[37] stringr_1.5.0 fs_1.6.2 MASS_7.3-60 ragg_1.2.5 +[41] pkgconfig_2.0.3 desc_1.4.2 pkgdown_2.0.7 bslib_0.4.2 +[45] pillar_1.9.0 gtable_0.3.3 glue_1.6.2 systemfonts_1.0.4 +[49] highr_0.10 xfun_0.39 tibble_3.2.1 lmtest_0.9-40 +[53] tidyselect_1.2.0 htmltools_0.5.5 rmarkdown_2.21 compiler_4.3.2

References @@ -690,34 +640,27 @@ November 2017.” - - -

- +
- - diff --git a/docs/articles/web_only/multistart.html b/docs/articles/web_only/multistart.html index dff087e4..4438adc3 100644 --- a/docs/articles/web_only/multistart.html +++ b/docs/articles/web_only/multistart.html @@ -4,144 +4,104 @@ - + +Short demo of the multistart method • mkin - - - + + + - - + - + + Skip to contents -
-
-
- -
- diff --git a/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-3-1.png b/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-3-1.png index 8be6ba61..f41dc889 100644 Binary files a/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-3-1.png and b/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-3-1.png differ diff --git a/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-4-1.png b/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-4-1.png index bc518c0c..9e206791 100644 Binary files a/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-4-1.png and b/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-4-1.png differ diff --git a/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-5-1.png b/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-5-1.png index 9ecdf4c9..c8e918cd 100644 Binary files a/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-5-1.png and b/docs/articles/web_only/multistart_files/figure-html/unnamed-chunk-5-1.png differ diff --git a/docs/articles/web_only/saem_benchmarks.html b/docs/articles/web_only/saem_benchmarks.html index 9180773e..91e41a5b 100644 --- a/docs/articles/web_only/saem_benchmarks.html +++ b/docs/articles/web_only/saem_benchmarks.html @@ -4,144 +4,104 @@ - + + Benchmark timings for saem.mmkin • mkin - - - + + + - - + - + + Skip to contents -
-
-
-
Degradation model
@@ -440,10 +400,10 @@ systems. All trademarks belong to their respective owners.

- - - - + + + +
Linux 1.2.6 3.21.1261.9712.3592.4241.1352.0252.4062.478
@@ -555,10 +515,10 @@ systems. All trademarks belong to their respective owners.

Linux 1.2.6 3.2 -2.116 -3.246 -3.602 -3.036 +2.161 +3.325 +3.669 +3.153 @@ -654,8 +614,8 @@ systems. All trademarks belong to their respective owners.

Linux 1.2.6 3.2 -11.712 -290.532 +12.007 +286.757 @@ -741,40 +701,33 @@ systems. All trademarks belong to their respective owners.

Linux 1.2.6 3.2 -479.161 +480.577
-
- - -
- -
- -- cgit v1.2.1