Merge branch 'master' into saemix

1 files changed, 29 insertions, 20 deletions

diff --git a/test.log b/test.log
index 5f50c623..f2a60729 100644
--- a/test.log
+++ b/test.log
@@ -1,17 +1,16 @@
-Loading mkin
+ℹ Loading mkin
 Loading required package: parallel
-Testing mkin
+ℹ Testing mkin
 ✔ |  OK F W S | Context
 ✔ |   5       | AIC calculation
-✔ |   2       | Export dataset for reading into CAKE
-✔ |  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       | Analytical solutions for coupled models [3.3 s]
 ✔ |   5       | Calculation of Akaike weights
-✔ |  12       | Confidence intervals and p-values [1.1 s]
-✔ |  14       | Error model fitting [4.5 s]
+✔ |   2       | Export dataset for reading into CAKE
+✔ |  12       | Confidence intervals and p-values [1.3 s]
+✔ |  14       | Error model fitting [4.7 s]
 ✔ |   5       | Time step normalisation
+✔ |   4       | Calculation of FOCUS chi2 error levels [0.5 s]
+✔ |  14       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [0.8 s]
 ✔ |   4       | Test fitting the decline of metabolites from their maximum [0.3 s]
 ✔ |   1       | Fitting the logistic model [0.2 s]
 ✔ |  35     1 | Nonlinear mixed-effects models [27.1 s]
@@ -20,25 +19,35 @@ Skip (test_mixed.R:161:3): saem results are reproducible for biphasic fits
 Reason: Fitting with saemix takes around 10 minutes when using deSolve
 ────────────────────────────────────────────────────────────────────────────────
 ✔ |   2       | Test dataset classes mkinds and mkindsg
+✔ |  10       | Special cases of mkinfit calls [0.4 s]
 ✔ |   1       | mkinfit features [0.3 s]
-✔ |  10       | Special cases of mkinfit calls [0.3 s]
-✔ |   8       | mkinmod model generation and printing [0.2 s]
-✔ |   3       | Model predictions with mkinpredict [0.2 s]
-✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.8 s]
+✔ |   8       | mkinmod model generation and printing [0.3 s]
+✔ |   3       | Model predictions with mkinpredict [0.3 s]
+✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.7 s]
 ✔ |   9       | Nonlinear mixed-effects models with nlme [8.1 s]
-✔ |  16       | Plotting [2.0 s]
+✖ |  14 2     | Plotting [1.9 s]
+────────────────────────────────────────────────────────────────────────────────
+Failure (test_plot.R:40:5): Plotting mkinfit, mmkin and mixed model objects is reproducible
+Figures don't match: mixed-model-fit-for-saem-object-with-saemix-transformations.svg
+
+
+Failure (test_plot.R:55:5): Plotting mkinfit, mmkin and mixed model objects is reproducible
+Figures don't match: mixed-model-fit-for-saem-object-with-mkin-transformations.svg
+
+────────────────────────────────────────────────────────────────────────────────
 ✔ |   4       | Residuals extracted from mkinfit models
 ✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [1.5 s]
-✔ |   4       | Summary [0.1 s]
+✔ |   7       | Fitting the SFORB model [3.9 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 [8.3 s]
-✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.5 s]
+✔ |   4       | Summary [0.1 s]
+✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.2 s]
+✔ |   9       | Hypothesis tests [8.2 s]
+✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.4 s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 69.4 s
+Duration: 70.0 s
 
 ── Skipped tests  ──────────────────────────────────────────────────────────────
 ● Fitting with saemix takes around 10 minutes when using deSolve (1)
 
-[ FAIL 0 | WARN 0 | SKIP 1 | PASS 206 ]
+[ FAIL 2 | WARN 0 | SKIP 1 | PASS 204 ]