From 4f62f39b8979cb3a5c52d65d425e530dc0770665 Mon Sep 17 00:00:00 2001
From: Johannes Ranke Last change 31 January 2019
-(rebuilt 2025-02-14)
+(rebuilt 2025-02-16)
Source: vignettes/FOCUS_D.rmd
FOCUS_D.rmd
mkinparplot
function.
summary(fit)
## mkin version used for fitting: 1.2.10
## R version used for fitting: 4.4.2
-## Date of fit: Fri Feb 14 08:59:09 2025
-## Date of summary: Fri Feb 14 08:59:09 2025
+## Date of fit: Sun Feb 16 17:04:33 2025
+## Date of summary: Sun Feb 16 17:04:33 2025
##
## Equations:
## d_parent/dt = - k_parent * parent
@@ -197,7 +197,7 @@ the mkinparplot
function.
##
## Model predictions using solution type analytical
##
-## Fitted using 401 model solutions performed in 0.053 s
+## Fitted using 401 model solutions performed in 0.051 s
##
## Error model: Constant variance
##
diff --git a/docs/dev/articles/FOCUS_L.html b/docs/dev/articles/FOCUS_L.html
index badf4822..fe1e7312 100644
--- a/docs/dev/articles/FOCUS_L.html
+++ b/docs/dev/articles/FOCUS_L.html
@@ -85,7 +85,7 @@
Ranke
Last change 18 May 2023
-(rebuilt 2025-02-14)
+(rebuilt 2025-02-16)
Source: vignettes/FOCUS_L.rmd
FOCUS_L.rmd
@@ -120,15 +120,15 @@ report.
summary(m.L1.SFO)
## mkin version used for fitting: 1.2.10
## R version used for fitting: 4.4.2
-## Date of fit: Fri Feb 14 08:59:11 2025
-## Date of summary: Fri Feb 14 08:59:11 2025
+## Date of fit: Sun Feb 16 17:04:35 2025
+## Date of summary: Sun Feb 16 17:04:35 2025
##
## Equations:
## d_parent/dt = - k_parent * parent
##
## Model predictions using solution type analytical
##
-## Fitted using 133 model solutions performed in 0.01 s
+## Fitted using 133 model solutions performed in 0.011 s
##
## Error model: Constant variance
##
@@ -228,8 +228,8 @@ error level is checked.
## non-finite result may be dubious
## mkin version used for fitting: 1.2.10
## R version used for fitting: 4.4.2
-## Date of fit: Fri Feb 14 08:59:11 2025
-## Date of summary: Fri Feb 14 08:59:11 2025
+## Date of fit: Sun Feb 16 17:04:35 2025
+## Date of summary: Sun Feb 16 17:04:35 2025
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -386,8 +386,8 @@ error level is checked.
summary(m.L2.FOMC, data = FALSE)
## mkin version used for fitting: 1.2.10
## R version used for fitting: 4.4.2
-## Date of fit: Fri Feb 14 08:59:12 2025
-## Date of summary: Fri Feb 14 08:59:12 2025
+## Date of fit: Sun Feb 16 17:04:35 2025
+## Date of summary: Sun Feb 16 17:04:35 2025
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -473,8 +473,8 @@ error level.
summary(m.L2.DFOP, data = FALSE)
## mkin version used for fitting: 1.2.10
## R version used for fitting: 4.4.2
-## Date of fit: Fri Feb 14 08:59:12 2025
-## Date of summary: Fri Feb 14 08:59:12 2025
+## Date of fit: Sun Feb 16 17:04:36 2025
+## Date of summary: Sun Feb 16 17:04:36 2025
##
## Equations:
## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -596,8 +596,8 @@ summary and plot functions working on mkinfit objects.
summary(mm.L3[["DFOP", 1]])
## mkin version used for fitting: 1.2.10
## R version used for fitting: 4.4.2
-## Date of fit: Fri Feb 14 08:59:12 2025
-## Date of summary: Fri Feb 14 08:59:12 2025
+## Date of fit: Sun Feb 16 17:04:36 2025
+## Date of summary: Sun Feb 16 17:04:36 2025
##
## Equations:
## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -726,8 +726,8 @@ difference appears negligible.
summary(mm.L4[["SFO", 1]], data = FALSE)
## mkin version used for fitting: 1.2.10
## R version used for fitting: 4.4.2
-## Date of fit: Fri Feb 14 08:59:13 2025
-## Date of summary: Fri Feb 14 08:59:13 2025
+## Date of fit: Sun Feb 16 17:04:36 2025
+## Date of summary: Sun Feb 16 17:04:37 2025
##
## Equations:
## d_parent/dt = - k_parent * parent
@@ -791,15 +791,15 @@ difference appears negligible.
summary(mm.L4[["FOMC", 1]], data = FALSE)
## mkin version used for fitting: 1.2.10
## R version used for fitting: 4.4.2
-## Date of fit: Fri Feb 14 08:59:13 2025
-## Date of summary: Fri Feb 14 08:59:13 2025
+## Date of fit: Sun Feb 16 17:04:36 2025
+## Date of summary: Sun Feb 16 17:04:37 2025
##
## 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.013 s
+## Fitted using 224 model solutions performed in 0.014 s
##
## Error model: Constant variance
##
diff --git a/docs/dev/articles/mkin.html b/docs/dev/articles/mkin.html
index 30b2182f..a1d4fd3c 100644
--- a/docs/dev/articles/mkin.html
+++ b/docs/dev/articles/mkin.html
@@ -85,7 +85,7 @@
Ranke
Last change 18 May 2023
-(rebuilt 2025-02-14)
+(rebuilt 2025-02-16)
Source: vignettes/mkin.rmd
mkin.rmd
diff --git a/docs/dev/articles/prebuilt/2022_cyan_pathway.html b/docs/dev/articles/prebuilt/2022_cyan_pathway.html
index b93e5e7e..0a37915d 100644
--- a/docs/dev/articles/prebuilt/2022_cyan_pathway.html
+++ b/docs/dev/articles/prebuilt/2022_cyan_pathway.html
@@ -85,7 +85,7 @@
Ranke
Last change on 13 February
-2023, last compiled on 14 Februar 2025
+2023, last compiled on 16 Februar 2025
Source: vignettes/prebuilt/2022_cyan_pathway.rmd
2022_cyan_pathway.rmd
@@ -2254,7 +2254,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:42:26 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan/dt = - k_cyan * cyan
@@ -2382,7 +2382,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:42:06 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan/dt = - k_cyan * cyan
@@ -2512,7 +2512,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:42:57 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan
@@ -2657,7 +2657,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:42:50 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan
@@ -2795,7 +2795,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:43:33 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -2941,7 +2941,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:46:07 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -3087,7 +3087,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:43:36 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound *
@@ -3252,7 +3252,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:46:14 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound *
@@ -3417,7 +3417,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:43:42 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan/dt = - ifelse(time <= tb, k1, k2) * cyan
@@ -3563,7 +3563,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:54:36 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan
@@ -3729,7 +3729,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:55:32 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -3920,7 +3920,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:57:56 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -4111,7 +4111,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:55:26 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound *
@@ -4307,7 +4307,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 07:58:06 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:40 2025
Equations:
d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound *
@@ -4508,7 +4508,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 08:11:01 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:41 2025
Equations:
d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan
@@ -4651,7 +4651,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 08:12:27 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:41 2025
Equations:
d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -4817,7 +4817,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 08:12:54 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:41 2025
Equations:
d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -4983,7 +4983,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 08:12:32 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:41 2025
Equations:
d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound *
@@ -5154,7 +5154,7 @@ saemix version used for fitting: 3.3
mkin version used for pre-fitting: 1.2.10
R version used for fitting: 4.4.2
Date of fit: Fri Feb 14 08:12:36 2025
-Date of summary: Fri Feb 14 08:12:55 2025
+Date of summary: Sun Feb 16 17:03:41 2025
Equations:
d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound *
@@ -5345,25 +5345,22 @@ attached base packages:
[8] base
other attached packages:
-[1] rmarkdown_2.29 nvimcom_0.9-167 saemix_3.3 npde_3.5
-[5] knitr_1.49 mkin_1.2.10
+[1] saemix_3.3 npde_3.5 knitr_1.49 mkin_1.2.10
loaded via a namespace (and not attached):
- [1] sass_0.4.9 utf8_1.2.4 generics_0.1.3 lattice_0.22-6
- [5] digest_0.6.37 magrittr_2.0.3 evaluate_1.0.1 grid_4.4.2
- [9] fastmap_1.2.0 cellranger_1.1.0 jsonlite_1.8.9 processx_3.8.4
-[13] pkgbuild_1.4.5 deSolve_1.40 mclust_6.1.1 ps_1.8.1
-[17] gridExtra_2.3 fansi_1.0.6 scales_1.3.0 codetools_0.2-20
-[21] textshaping_0.4.1 jquerylib_0.1.4 cli_3.6.3 rlang_1.1.4
-[25] munsell_0.5.1 cachem_1.1.0 yaml_2.3.10 inline_0.3.20
-[29] tools_4.4.2 dplyr_1.1.4 colorspace_2.1-1 ggplot2_3.5.1
-[33] vctrs_0.6.5 R6_2.5.1 zoo_1.8-12 lifecycle_1.0.4
-[37] fs_1.6.5 htmlwidgets_1.6.4 MASS_7.3-61 ragg_1.3.3
-[41] callr_3.7.6 pkgconfig_2.0.3 desc_1.4.3 pkgdown_2.1.1
-[45] pillar_1.9.0 bslib_0.8.0 gtable_0.3.6 glue_1.8.0
-[49] systemfonts_1.1.0 xfun_0.49 tibble_3.2.1 lmtest_0.9-40
-[53] tidyselect_1.2.1 htmltools_0.5.8.1 nlme_3.1-166 compiler_4.4.2
-[57] readxl_1.4.3
+ [1] gtable_0.3.6 jsonlite_1.8.9 dplyr_1.1.4 compiler_4.4.2
+ [5] tidyselect_1.2.1 gridExtra_2.3 jquerylib_0.1.4 systemfonts_1.1.0
+ [9] scales_1.3.0 textshaping_0.4.1 yaml_2.3.10 fastmap_1.2.0
+[13] lattice_0.22-6 ggplot2_3.5.1 R6_2.5.1 generics_0.1.3
+[17] lmtest_0.9-40 MASS_7.3-61 htmlwidgets_1.6.4 tibble_3.2.1
+[21] desc_1.4.3 munsell_0.5.1 bslib_0.8.0 pillar_1.9.0
+[25] rlang_1.1.4 utf8_1.2.4 inline_0.3.20 cachem_1.1.0
+[29] xfun_0.49 fs_1.6.5 sass_0.4.9 cli_3.6.3
+[33] pkgdown_2.1.1 magrittr_2.0.3 digest_0.6.37 grid_4.4.2
+[37] mclust_6.1.1 lifecycle_1.0.4 nlme_3.1-166 vctrs_0.6.5
+[41] evaluate_1.0.1 glue_1.8.0 ragg_1.3.3 zoo_1.8-12
+[45] fansi_1.0.6 colorspace_2.1-1 rmarkdown_2.29 pkgconfig_2.0.3
+[49] tools_4.4.2 htmltools_0.5.8.1
vignettes/prebuilt/2022_dmta_parent.rmd
2022_dmta_parent.rmd
vignettes/prebuilt/2022_dmta_pathway.rmd
2022_dmta_pathway.rmd
vignettes/prebuilt/2023_mesotrione_parent.rmd
2023_mesotrione_parent.rmd
vignettes/twa.rmd
twa.rmd
vignettes/web_only/FOCUS_Z.rmd
FOCUS_Z.rmd
vignettes/web_only/NAFTA_examples.rmd
NAFTA_examples.rmd
vignettes/web_only/benchmarks.rmd
benchmarks.rmd
vignettes/web_only/compiled_models.rmd
compiled_models.rmd
## test replications relative elapsed
-## 4 analytical 1 1.000 0.102
-## 3 deSolve, compiled 1 1.324 0.135
-## 2 Eigenvalue based 1 1.706 0.174
-## 1 deSolve, not compiled 1 22.627 2.308
+## 4 analytical 1 1.000 0.115
+## 3 deSolve, compiled 1 1.217 0.140
+## 2 Eigenvalue based 1 1.652 0.190
+## 1 deSolve, not compiled 1 20.522 2.360
We see that using the compiled model is by more than a factor of 10 faster than using deSolve without compiled code.
@@ -196,8 +196,8 @@ compiled code is available. }## Temporary DLL for differentials generated and loaded
## test replications relative elapsed
-## 2 deSolve, compiled 1 1.000 0.170
-## 1 deSolve, not compiled 1 23.865 4.057
+## 2 deSolve, compiled 1 1.000 0.180
+## 1 deSolve, not compiled 1 23.656 4.258
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.10 on
diff --git a/docs/dev/articles/web_only/dimethenamid_2018.html b/docs/dev/articles/web_only/dimethenamid_2018.html index 572f253d..0bbf0b73 100644 --- a/docs/dev/articles/web_only/dimethenamid_2018.html +++ b/docs/dev/articles/web_only/dimethenamid_2018.html @@ -85,7 +85,7 @@ Rankevignettes/web_only/dimethenamid_2018.rmd
dimethenamid_2018.rmd
vignettes/web_only/multistart.rmd
multistart.rmd
vignettes/web_only/saem_benchmarks.rmd
saem_benchmarks.rmd
‘R/plot.mixed.R’: Support more than 25 datasets
‘R/mkinfit.R’: Support passing the observed data as a ‘tibble’
‘R/parplot.R’: Support multistart objects with covariate models and filter negative values of scaled parameters (with a warning) for plotting.
’R/create_deg_func.R: Make sure that no reversible reactions are specified in the case of two observed variables, as this is not supported