From d75378911cef79b3ed95daef71bf67db413d2ac8 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 17 Nov 2021 12:59:49 +0100 Subject: Update required saemix version, update tests --- vignettes/FOCUS_D.html | 8 ++++---- vignettes/FOCUS_L.html | 52 +++++++++++++++++++++++++------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) (limited to 'vignettes') diff --git a/vignettes/FOCUS_D.html b/vignettes/FOCUS_D.html index ba514c18..d9127473 100644 --- a/vignettes/FOCUS_D.html +++ b/vignettes/FOCUS_D.html @@ -360,7 +360,7 @@ pre code {

Example evaluation of FOCUS Example Dataset D

Johannes Ranke

-

Last change 31 January 2019 (rebuilt 2021-09-16)

+

Last change 31 January 2019 (rebuilt 2021-11-17)

@@ -435,9 +435,9 @@ print(FOCUS_2006_D)

A comprehensive report of the results is obtained using the summary method for mkinfit objects.

summary(fit)
## mkin version used for fitting:    1.1.0 
-## R version used for fitting:       4.1.1 
-## Date of fit:     Thu Sep 16 13:57:32 2021 
-## Date of summary: Thu Sep 16 13:57:33 2021 
+## R version used for fitting:       4.1.2 
+## Date of fit:     Wed Nov 17 12:15:48 2021 
+## Date of summary: Wed Nov 17 12:15:49 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
diff --git a/vignettes/FOCUS_L.html b/vignettes/FOCUS_L.html
index b6ebb606..96a823cf 100644
--- a/vignettes/FOCUS_L.html
+++ b/vignettes/FOCUS_L.html
@@ -1513,7 +1513,7 @@ div.tocify {
 
 
Example evaluation of FOCUS Laboratory Data L1 to L3

 
Johannes Ranke

-
Last change 17 November 2016 (rebuilt 2021-09-16)

+
Last change 17 November 2016 (rebuilt 2021-11-17)

 
 
 
@@ -1533,16 +1533,16 @@ FOCUS_2006_L1_mkin <- mkin_wide_to_long(FOCUS_2006_L1)
m.L1.SFO <- mkinfit("SFO", FOCUS_2006_L1_mkin, quiet = TRUE)
 summary(m.L1.SFO)
## mkin version used for fitting:    1.1.0 
-## R version used for fitting:       4.1.1 
-## Date of fit:     Thu Sep 16 13:57:35 2021 
-## Date of summary: Thu Sep 16 13:57:35 2021 
+## R version used for fitting:       4.1.2 
+## Date of fit:     Wed Nov 17 12:15:51 2021 
+## Date of summary: Wed Nov 17 12:15:51 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 133 model solutions performed in 0.031 s
+## Fitted using 133 model solutions performed in 0.032 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -1634,9 +1634,9 @@ summary(m.L1.SFO)
## Warning in cov2cor(ans$covar): diag(.) had 0 or NA entries; non-finite result is
 ## doubtful
## mkin version used for fitting:    1.1.0 
-## R version used for fitting:       4.1.1 
-## Date of fit:     Thu Sep 16 13:57:35 2021 
-## Date of summary: Thu Sep 16 13:57:35 2021 
+## R version used for fitting:       4.1.2 
+## Date of fit:     Wed Nov 17 12:15:51 2021 
+## Date of summary: Wed Nov 17 12:15:51 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -1739,16 +1739,16 @@ plot(m.L2.FOMC, show_residuals = TRUE,
 

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

 
## mkin version used for fitting:    1.1.0 
-## R version used for fitting:       4.1.1 
-## Date of fit:     Thu Sep 16 13:57:35 2021 
-## Date of summary: Thu Sep 16 13:57:35 2021 
+## R version used for fitting:       4.1.2 
+## Date of fit:     Wed Nov 17 12:15:52 2021 
+## Date of summary: Wed Nov 17 12:15:52 2021 
 ## 
 ## 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.048 s
+## Fitted using 239 model solutions performed in 0.049 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -1817,9 +1817,9 @@ plot(m.L2.DFOP, show_residuals = TRUE, show_errmin = TRUE,
 

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

 
## mkin version used for fitting:    1.1.0 
-## R version used for fitting:       4.1.1 
-## Date of fit:     Thu Sep 16 13:57:36 2021 
-## Date of summary: Thu Sep 16 13:57:36 2021 
+## R version used for fitting:       4.1.2 
+## Date of fit:     Wed Nov 17 12:15:52 2021 
+## Date of summary: Wed Nov 17 12:15:52 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -1828,7 +1828,7 @@ plot(m.L2.DFOP, show_residuals = TRUE, show_errmin = TRUE,
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 581 model solutions performed in 0.133 s
+## Fitted using 581 model solutions performed in 0.134 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -1917,9 +1917,9 @@ plot(mm.L3)

 
We can extract the summary and plot for e.g. the DFOP fit, using square brackets for indexing which will result in the use of the summary and plot functions working on mkinfit objects.

 
summary(mm.L3[["DFOP", 1]])

 
## mkin version used for fitting:    1.1.0 
-## R version used for fitting:       4.1.1 
-## Date of fit:     Thu Sep 16 13:57:36 2021 
-## Date of summary: Thu Sep 16 13:57:36 2021 
+## R version used for fitting:       4.1.2 
+## Date of fit:     Wed Nov 17 12:15:52 2021 
+## Date of summary: Wed Nov 17 12:15:52 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -1928,7 +1928,7 @@ plot(mm.L3)

 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 376 model solutions performed in 0.079 s
+## Fitted using 376 model solutions performed in 0.08 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -2025,9 +2025,9 @@ plot(mm.L4)

 
The χ2 error level of 3.3% as well as the plot suggest that the SFO model fits very well. The error level at which the χ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.1.0 
-## R version used for fitting:       4.1.1 
-## Date of fit:     Thu Sep 16 13:57:36 2021 
-## Date of summary: Thu Sep 16 13:57:36 2021 
+## R version used for fitting:       4.1.2 
+## Date of fit:     Wed Nov 17 12:15:53 2021 
+## Date of summary: Wed Nov 17 12:15:53 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
@@ -2089,9 +2089,9 @@ plot(mm.L4)

 ## parent  106  352
summary(mm.L4[["FOMC", 1]], data = FALSE)
## mkin version used for fitting:    1.1.0 
-## R version used for fitting:       4.1.1 
-## Date of fit:     Thu Sep 16 13:57:36 2021 
-## Date of summary: Thu Sep 16 13:57:36 2021 
+## R version used for fitting:       4.1.2 
+## Date of fit:     Wed Nov 17 12:15:53 2021 
+## Date of summary: Wed Nov 17 12:15:53 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
-- 
cgit v1.2.1