From 4e95a1fe67b5faa2c0df34786ae757ee297a760f Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 15 Feb 2021 17:53:45 +0100 Subject: Correct grant numbers in README, update docs --- README.md | 5 +++-- docs/articles/FOCUS_D.html | 6 +++--- docs/articles/FOCUS_L.html | 32 ++++++++++++++++---------------- docs/articles/web_only/benchmarks.html | 22 +++++++++++----------- docs/index.html | 5 +++-- docs/pkgdown.yml | 2 +- docs/reference/Rplot001.png | Bin 13995 -> 27554 bytes docs/reference/Rplot002.png | Bin 13648 -> 59342 bytes vignettes/web_only/mkin_benchmarks.rda | Bin 1081 -> 1074 bytes 9 files changed, 37 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index af8ea24b..6d71dfc1 100644 --- a/README.md +++ b/README.md @@ -193,15 +193,16 @@ at Eurofins Regulatory AG, and now as an independent consultant. Funding was received from the Umweltbundesamt in the course of the projects -- Grant Number 112407 (Testing and validation of modelling software as an alternative +- Project Number 27452 (Testing and validation of modelling software as an alternative to ModelMaker 4.0, 2014-2015) - Project Number 56703 (Optimization of gmkin for routine use in the Umweltbundesamt, 2015) +- Project Number 92570 (Update of Project Number 27452, 2017-2018) - Project Number 112407 (Testing the feasibility of using an error model according to Rocke and Lorenzato for more realistic parameter estimates in the kinetic evaluation of degradation data, 2018-2019) - Project Number 120667 (Development of objective criteria for the evaluation of the visual fit in the kinetic evaluation of degradation data, 2019-2020) -- Project 146839 (Checking the feasibility of using mixed-effects models for +- Project Number 146839 (Checking the feasibility of using mixed-effects models for the derivation of kinetic modelling parameters from degradation studies, 2020-2021) ## References diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index f3a56065..08acf58b 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -187,8 +187,8 @@ summary(fit) 
## mkin version used for fitting:    1.0.3 
 ## R version used for fitting:       4.0.3 
-## Date of fit:     Mon Feb 15 13:46:23 2021 
-## Date of summary: Mon Feb 15 13:46:23 2021 
+## Date of fit:     Mon Feb 15 17:50:27 2021 
+## Date of summary: Mon Feb 15 17:50:28 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
@@ -196,7 +196,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 401 model solutions performed in 0.162 s
+## Fitted using 401 model solutions performed in 0.161 s
 ## 
 ## Error model: Constant variance 
 ## 
diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html
index 53e4e1d3..ab9739bc 100644
--- a/docs/articles/FOCUS_L.html
+++ b/docs/articles/FOCUS_L.html
@@ -128,8 +128,8 @@
 summary(m.L1.SFO)
## mkin version used for fitting:    1.0.3 
 ## R version used for fitting:       4.0.3 
-## Date of fit:     Mon Feb 15 13:46:25 2021 
-## Date of summary: Mon Feb 15 13:46:25 2021 
+## Date of fit:     Mon Feb 15 17:50:30 2021 
+## Date of summary: Mon Feb 15 17:50:30 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
@@ -234,8 +234,8 @@
 ## doubtful
## mkin version used for fitting:    1.0.3 
 ## R version used for fitting:       4.0.3 
-## Date of fit:     Mon Feb 15 13:46:26 2021 
-## Date of summary: Mon Feb 15 13:46:26 2021 
+## Date of fit:     Mon Feb 15 17:50:31 2021 
+## Date of summary: Mon Feb 15 17:50:31 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -346,8 +346,8 @@
 summary(m.L2.FOMC, data = FALSE)
## mkin version used for fitting:    1.0.3 
 ## R version used for fitting:       4.0.3 
-## Date of fit:     Mon Feb 15 13:46:26 2021 
-## Date of summary: Mon Feb 15 13:46:26 2021 
+## Date of fit:     Mon Feb 15 17:50:31 2021 
+## Date of summary: Mon Feb 15 17:50:31 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -427,8 +427,8 @@
 summary(m.L2.DFOP, data = FALSE)
## mkin version used for fitting:    1.0.3 
 ## R version used for fitting:       4.0.3 
-## Date of fit:     Mon Feb 15 13:46:27 2021 
-## Date of summary: Mon Feb 15 13:46:27 2021 
+## Date of fit:     Mon Feb 15 17:50:32 2021 
+## Date of summary: Mon Feb 15 17:50:32 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -533,8 +533,8 @@
 summary(mm.L3[["DFOP", 1]])
## mkin version used for fitting:    1.0.3 
 ## R version used for fitting:       4.0.3 
-## Date of fit:     Mon Feb 15 13:46:27 2021 
-## Date of summary: Mon Feb 15 13:46:28 2021 
+## Date of fit:     Mon Feb 15 17:50:32 2021 
+## Date of summary: Mon Feb 15 17:50:32 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -646,15 +646,15 @@
 summary(mm.L4[["SFO", 1]], data = FALSE)
## mkin version used for fitting:    1.0.3 
 ## R version used for fitting:       4.0.3 
-## Date of fit:     Mon Feb 15 13:46:28 2021 
-## Date of summary: Mon Feb 15 13:46:28 2021 
+## Date of fit:     Mon Feb 15 17:50:33 2021 
+## Date of summary: Mon Feb 15 17:50:33 2021 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 142 model solutions performed in 0.031 s
+## Fitted using 142 model solutions performed in 0.03 s
 ## 
 ## Error model: Constant variance 
 ## 
@@ -711,15 +711,15 @@
 summary(mm.L4[["FOMC", 1]], data = FALSE)
## mkin version used for fitting:    1.0.3 
 ## R version used for fitting:       4.0.3 
-## Date of fit:     Mon Feb 15 13:46:28 2021 
-## Date of summary: Mon Feb 15 13:46:28 2021 
+## Date of fit:     Mon Feb 15 17:50:33 2021 
+## Date of summary: Mon Feb 15 17:50:33 2021 
 ## 
 ## 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.047 s
+## Fitted using 224 model solutions performed in 0.046 s
 ## 
 ## Error model: Constant variance 
 ## 
diff --git a/docs/articles/web_only/benchmarks.html b/docs/articles/web_only/benchmarks.html
index d7b81f20..9908c224 100644
--- a/docs/articles/web_only/benchmarks.html
+++ b/docs/articles/web_only/benchmarks.html
@@ -229,8 +229,8 @@
 
 
 1.0.3
-1.722
-3.419
+1.881
+3.504
 
 
 
@@ -297,9 +297,9 @@
 
 
 1.0.3
-1.402
-6.343
-2.802
+1.430
+6.344
+2.798
 
 
 
@@ -393,12 +393,12 @@
 
 
 1.0.3
-0.771
-1.251
-1.464
-3.074
-1.940
-2.831
+0.763
+1.244
+1.457
+3.054
+1.923
+2.839
 
 
 
diff --git a/docs/index.html b/docs/index.html
index 88f118ea..82aab7f3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -191,11 +191,12 @@
 
Many inspirations for improvements of mkin resulted from doing kinetic evaluations of degradation data for my clients while working at Harlan Laboratories and at Eurofins Regulatory AG, and now as an independent consultant.

 
Funding was received from the Umweltbundesamt in the course of the projects

 
    
-
  • Grant Number 112407 (Testing and validation of modelling software as an alternative to ModelMaker 4.0, 2014-2015)
    • 
+
  • Project Number 27452 (Testing and validation of modelling software as an alternative to ModelMaker 4.0, 2014-2015)
    • 
 
  • Project Number 56703 (Optimization of gmkin for routine use in the Umweltbundesamt, 2015)
    • 
+
  • Project Number 92570 (Update of Project Number 27452, 2017-2018)
    • 
 
  • Project Number 112407 (Testing the feasibility of using an error model according to Rocke and Lorenzato for more realistic parameter estimates in the kinetic evaluation of degradation data, 2018-2019)
    • 
 
  • Project Number 120667 (Development of objective criteria for the evaluation of the visual fit in the kinetic evaluation of degradation data, 2019-2020)
    • 
-
  • Project 146839 (Checking the feasibility of using mixed-effects models for the derivation of kinetic modelling parameters from degradation studies, 2020-2021)
    • 
+
  • Project Number 146839 (Checking the feasibility of using mixed-effects models for the derivation of kinetic modelling parameters from degradation studies, 2020-2021)
    • 
 

 
 

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
index 847dd4c5..5e10d15f 100644
--- a/docs/pkgdown.yml
+++ b/docs/pkgdown.yml
@@ -10,7 +10,7 @@ articles:
   web_only/NAFTA_examples: NAFTA_examples.html
   web_only/benchmarks: benchmarks.html
   web_only/compiled_models: compiled_models.html
-last_built: 2021-02-15T13:07Z
+last_built: 2021-02-15T16:49Z
 urls:
   reference: https://pkgdown.jrwb.de/mkin/reference
   article: https://pkgdown.jrwb.de/mkin/articles
diff --git a/docs/reference/Rplot001.png b/docs/reference/Rplot001.png
index 7f498242..762a3dd4 100644
Binary files a/docs/reference/Rplot001.png and b/docs/reference/Rplot001.png differ
diff --git a/docs/reference/Rplot002.png b/docs/reference/Rplot002.png
index 54c31a3f..d24e35b4 100644
Binary files a/docs/reference/Rplot002.png and b/docs/reference/Rplot002.png differ
diff --git a/vignettes/web_only/mkin_benchmarks.rda b/vignettes/web_only/mkin_benchmarks.rda
index d2b82805..4421cf5b 100644
Binary files a/vignettes/web_only/mkin_benchmarks.rda and b/vignettes/web_only/mkin_benchmarks.rda differ
-- 
cgit v1.2.1