Fix tests and rerun

1 files changed, 10 insertions, 28 deletions

diff --git a/test.log b/test.log
index 70011abb..49a1a704 100644
--- a/test.log
+++ b/test.log
@@ -3,14 +3,15 @@ Loading required package: parallel
 Testing mkin
 ✔ |  OK F W S | Context
 ✔ |   5       | AIC calculation
-✔ |   2       | Export dataset for reading into CAKE
+✔ |   2       | Export dataset for reading into CAKE [0.2 s]
 ✔ |  14       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [1.0 s]
 ✔ |   4       | Calculation of FOCUS chi2 error levels [0.5 s]
 ✔ |   7       | Fitting the SFORB model [3.5 s]
 ✔ |   5       | Analytical solutions for coupled models [3.2 s]
 ✔ |   5       | Calculation of Akaike weights
 ✔ |  14       | Confidence intervals and p-values [1.2 s]
-✔ |  14       | Error model fitting [4.5 s]
+✔ |  14       | Error model fitting [4.6 s]
+✔ |   1       | Time step normalisation
 ✔ |   4       | Test fitting the decline of metabolites from their maximum [0.3 s]
 ✔ |   1       | Fitting the logistic model [0.2 s]
 ✔ |   1       | Test dataset class mkinds used in gmkin
@@ -18,38 +19,19 @@ Testing mkin
 ✔ |  12       | Special cases of mkinfit calls [0.7 s]
 ✔ |   8       | mkinmod model generation and printing [0.2 s]
 ✔ |   3       | Model predictions with mkinpredict [0.4 s]
-✔ |  14     2 | Evaluations according to 2015 NAFTA guidance [1.3 s]
-────────────────────────────────────────────────────────────────────────────────
-Skip (test_nafta.R:25:5): Test data from Appendix B are correctly evaluated
-Reason: getRversion() < "4.1.0"  is TRUE
-
-Skip (test_nafta.R:53:5): Test data from Appendix D are correctly evaluated
-Reason: getRversion() < "4.1.0"  is TRUE
-────────────────────────────────────────────────────────────────────────────────
-✔ |   9       | Nonlinear mixed-effects models [7.9 s]
-✔ |   0     1 | Plotting [0.7 s]
-────────────────────────────────────────────────────────────────────────────────
-Skip (test_plot.R:28:3): Plotting mkinfit and mmkin objects is reproducible
-Reason: getRversion() < "4.1.0"  is TRUE
-────────────────────────────────────────────────────────────────────────────────
+✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.6 s]
+✔ |   9       | Nonlinear mixed-effects models [7.7 s]
+✔ |  18       | Plotting [2.1 s]
 ✔ |   4       | Residuals extracted from mkinfit models
-✔ |  13     1 | Nonlinear mixed effects models fitted with SAEM from saemix [19.0 s]
-────────────────────────────────────────────────────────────────────────────────
-Skip (test_saem.R:103:1): Simple models with metabolite can be fitted with saemix
-Reason: empty test
-────────────────────────────────────────────────────────────────────────────────
+✔ |  17       | Nonlinear mixed effects models fitted with SAEM from saemix [19.1 s]
 ✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [1.5 s]
 ✔ |   4       | Summary [0.1 s]
 ✔ |   1       | Summaries of old mkinfit objects
 ✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.3 s]
-✔ |   9       | Hypothesis tests [7.3 s]
+✔ |   9       | Hypothesis tests [7.4 s]
 ✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.4 s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 59.7 s
-
-── Skipped tests  ──────────────────────────────────────────────────────────────
-● empty test (1)
-● getRversion() < "4.1.0"  is TRUE (3)
+Duration: 62.0 s
 
-[ FAIL 0 | WARN 0 | SKIP 4 | PASS 164 ]
+[ FAIL 0 | WARN 0 | SKIP 0 | PASS 189 ]