From 2bb59c88d49b193f278916ad9cc4de83c0de9604 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 2 Mar 2022 18:03:54 +0100 Subject: Make tests more platform independent, update docs --- vignettes/FOCUS_D.html | 6 +++--- vignettes/FOCUS_L.html | 36 ++++++++++++++++----------------- vignettes/mkin.html | 6 +++--- vignettes/references.bib | 5 +++-- vignettes/twa.html | 2 +- vignettes/web_only/mkin_benchmarks.rda | Bin 1133 -> 1187 bytes 6 files changed, 28 insertions(+), 27 deletions(-) (limited to 'vignettes') diff --git a/vignettes/FOCUS_D.html b/vignettes/FOCUS_D.html index 0bec44c5..1b9d2e23 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 2022-02-08)

+

Last change 31 January 2019 (rebuilt 2022-03-02)

@@ -436,8 +436,8 @@ print(FOCUS_2006_D) 
summary(fit)
## mkin version used for fitting:    1.1.0 
 ## R version used for fitting:       4.1.2 
-## Date of fit:     Tue Feb  8 17:20:25 2022 
-## Date of summary: Tue Feb  8 17:20:26 2022 
+## Date of fit:     Wed Mar  2 16:28:06 2022 
+## Date of summary: Wed Mar  2 16:28:07 2022 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
diff --git a/vignettes/FOCUS_L.html b/vignettes/FOCUS_L.html
index 4a66985e..2934bc99 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 2022-02-08)

+
Last change 17 November 2016 (rebuilt 2022-03-02)

 
 
 
@@ -1534,8 +1534,8 @@ FOCUS_2006_L1_mkin <- mkin_wide_to_long(FOCUS_2006_L1)
summary(m.L1.SFO) 
## mkin version used for fitting:    1.1.0 
 ## R version used for fitting:       4.1.2 
-## Date of fit:     Tue Feb  8 17:20:28 2022 
-## Date of summary: Tue Feb  8 17:20:28 2022 
+## Date of fit:     Wed Mar  2 16:28:09 2022 
+## Date of summary: Wed Mar  2 16:28:09 2022 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
@@ -1635,15 +1635,15 @@ summary(m.L1.SFO)
## doubtful 
## mkin version used for fitting:    1.1.0 
 ## R version used for fitting:       4.1.2 
-## Date of fit:     Tue Feb  8 17:20:28 2022 
-## Date of summary: Tue Feb  8 17:20:28 2022 
+## Date of fit:     Wed Mar  2 16:28:09 2022 
+## Date of summary: Wed Mar  2 16:28:09 2022 
 ## 
 ## 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.081 s
+## Fitted using 369 model solutions performed in 0.082 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -1740,8 +1740,8 @@ 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.2 
-## Date of fit:     Tue Feb  8 17:20:28 2022 
-## Date of summary: Tue Feb  8 17:20:28 2022 
+## Date of fit:     Wed Mar  2 16:28:10 2022 
+## Date of summary: Wed Mar  2 16:28:10 2022 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -1818,8 +1818,8 @@ 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.2 
-## Date of fit:     Tue Feb  8 17:20:29 2022 
-## Date of summary: Tue Feb  8 17:20:29 2022 
+## Date of fit:     Wed Mar  2 16:28:10 2022 
+## Date of summary: Wed Mar  2 16:28:10 2022 
 ## 
 ## 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.136 s
+## Fitted using 581 model solutions performed in 0.137 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -1918,8 +1918,8 @@ plot(mm.L3)

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

 
## mkin version used for fitting:    1.1.0 
 ## R version used for fitting:       4.1.2 
-## Date of fit:     Tue Feb  8 17:20:29 2022 
-## Date of summary: Tue Feb  8 17:20:29 2022 
+## Date of fit:     Wed Mar  2 16:28:10 2022 
+## Date of summary: Wed Mar  2 16:28:10 2022 
 ## 
 ## 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.078 s
+## Fitted using 376 model solutions performed in 0.08 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -2026,8 +2026,8 @@ plot(mm.L4)

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

 
## mkin version used for fitting:    1.1.0 
 ## R version used for fitting:       4.1.2 
-## Date of fit:     Tue Feb  8 17:20:29 2022 
-## Date of summary: Tue Feb  8 17:20:30 2022 
+## Date of fit:     Wed Mar  2 16:28:11 2022 
+## Date of summary: Wed Mar  2 16:28:11 2022 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
@@ -2090,8 +2090,8 @@ plot(mm.L4)

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

 
## mkin version used for fitting:    1.1.0 
 ## R version used for fitting:       4.1.2 
-## Date of fit:     Tue Feb  8 17:20:30 2022 
-## Date of summary: Tue Feb  8 17:20:30 2022 
+## Date of fit:     Wed Mar  2 16:28:11 2022 
+## Date of summary: Wed Mar  2 16:28:11 2022 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
diff --git a/vignettes/mkin.html b/vignettes/mkin.html
index 8a1a7641..1f35e9bd 100644
--- a/vignettes/mkin.html
+++ b/vignettes/mkin.html
@@ -1591,7 +1591,7 @@ div.tocify {
 
 
Introduction to mkin

 
Johannes Ranke

-
Last change 15 February 2021 (rebuilt 2022-02-08)

+
Last change 15 February 2021 (rebuilt 2022-03-02)

 
 
 
@@ -1698,10 +1698,10 @@ plot_sep(f_SFO_SFO_SFO, lpos = c("topright", "bottomright",
 
Ranke, J. 2021. ‘mkin‘: Kinetic Evaluation of Chemical Degradation Data. https://CRAN.R-project.org/package=mkin.

 
 

-
Ranke, J., and R. Lehmann. 2012. “Parameter Reliability in Kinetic Evaluation of Environmental Metabolism Data - Assessment and the Influence of Model Specification.” In SETAC World 20-24 May. Berlin.

+
Ranke, J., and R. Lehmann. 2012. “Parameter Reliability in Kinetic Evaluation of Environmental Metabolism Data - Assessment and the Influence of Model Specification.” In SETAC World 20-24 May. Berlin. https://jrwb.de/posters/Poster_SETAC_2012_Kinetic_parameter_uncertainty_model_parameterization_Lehmann_Ranke.pdf.

 

 

-
———. 2015. “To T-Test or Not to T-Test, That Is the Question.” In XV Symposium on Pesticide Chemistry 2-4 September 2015. Piacenza. http://chem.uft.uni-bremen.de/ranke/posters/piacenza_2015.pdf.

+
———. 2015. “To T-Test or Not to T-Test, That Is the Question.” In XV Symposium on Pesticide Chemistry 2-4 September 2015. Piacenza. https://jrwb.de/posters/piacenza_2015.pdf.

 

 

 
Ranke, Johannes, and Stefan Meinecke. 2019. “Error Models for the Kinetic Evaluation of Chemical Degradation Data.” Environments 6 (12). https://doi.org/10.3390/environments6120124.

diff --git a/vignettes/references.bib b/vignettes/references.bib
index 2ee2ef2b..69845b1b 100644
--- a/vignettes/references.bib
+++ b/vignettes/references.bib
@@ -81,7 +81,8 @@
   author       = {J. Ranke and R. Lehmann},
   booktitle    = {SETAC World 20-24 May},
   year          = {2012},
-  address       = {Berlin}
+  address       = {Berlin},
+  url           = {https://jrwb.de/posters/Poster_SETAC_2012_Kinetic_parameter_uncertainty_model_parameterization_Lehmann_Ranke.pdf}
 }
 @Inproceedings{   ranke2015,
   title         = {To t-test or not to t-test, that is the question},
@@ -89,7 +90,7 @@
   booktitle     = {XV Symposium on Pesticide Chemistry 2-4 September 2015},
   year          = {2015},
   address       = {Piacenza},
-  url           = {http://chem.uft.uni-bremen.de/ranke/posters/piacenza_2015.pdf}
+  url           = {https://jrwb.de/posters/piacenza_2015.pdf}
 }
 @Techreport{ranke2014,
   title = {{Prüfung und Validierung von Modellierungssoftware als Alternative zu
diff --git a/vignettes/twa.html b/vignettes/twa.html
index dc8f685f..fd0fe2d6 100644
--- a/vignettes/twa.html
+++ b/vignettes/twa.html
@@ -253,7 +253,7 @@ code > span.er { color: #a61717; background-color: #e3d2d2; }
 
 
Calculation of time weighted average concentrations with mkin

 
Johannes Ranke

-
Last change 18 September 2019 (rebuilt 2022-02-08)

+
Last change 18 September 2019 (rebuilt 2022-03-02)

 
 
 
diff --git a/vignettes/web_only/mkin_benchmarks.rda b/vignettes/web_only/mkin_benchmarks.rda
index fe4ab843..99b216d9 100644
Binary files a/vignettes/web_only/mkin_benchmarks.rda and b/vignettes/web_only/mkin_benchmarks.rda differ
-- 
cgit v1.2.1