Update required saemix version, update tests

1 files changed, 30 insertions, 30 deletions

diff --git a/test.log b/test.log
index f68ec45a..4d5012a0 100644
--- a/test.log
+++ b/test.log
@@ -1,42 +1,42 @@
 ℹ Loading mkin
 Loading required package: parallel
 ℹ Testing mkin
-✔ |  OK F W S | Context
-✔ |   5       | AIC calculation
-✔ |   5       | Analytical solutions for coupled models [3.4 s]
-✔ |   5       | Calculation of Akaike weights
-✔ |   2       | Export dataset for reading into CAKE
-✔ |  12       | Confidence intervals and p-values [1.0 s]
-✔ |  14       | Error model fitting [4.6 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 [26.3 s]
+✔ | F W S  OK | Context
+✔ |         5 | AIC calculation
+✔ |         5 | Analytical solutions for coupled models [3.5s]
+✔ |         5 | Calculation of Akaike weights
+✔ |         2 | Export dataset for reading into CAKE
+✔ |        12 | Confidence intervals and p-values [1.0s]
+✔ |        14 | Error model fitting [5.0s]
+✔ |         5 | Time step normalisation
+✔ |         4 | Calculation of FOCUS chi2 error levels [0.6s]
+✔ |        14 | Results for FOCUS D established in expertise for UBA (Ranke 2014) [0.8s]
+✔ |         4 | Test fitting the decline of metabolites from their maximum [0.3s]
+✔ |         1 | Fitting the logistic model [0.2s]
+✔ |     1  35 | Nonlinear mixed-effects models [26.8s]
 ────────────────────────────────────────────────────────────────────────────────
 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]
-✔ |   8       | mkinmod model generation and printing [0.2 s]
-✔ |   3       | Model predictions with mkinpredict [0.3 s]
-✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.4 s]
-✔ |   9       | Nonlinear mixed-effects models with nlme [7.9 s]
-✔ |  16       | Plotting [1.3 s]
-✔ |   4       | Residuals extracted from mkinfit models
-✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [1.5 s]
-✔ |   7       | Fitting the SFORB model [3.7 s]
-✔ |   1       | Summaries of old mkinfit objects
-✔ |   4       | Summary [0.1 s]
-✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.3 s]
-✔ |   9       | Hypothesis tests [8.4 s]
-✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.3 s]
+✔ |         2 | Test dataset classes mkinds and mkindsg
+✔ |        10 | Special cases of mkinfit calls [0.4s]
+✔ |         1 | mkinfit features [0.4s]
+✔ |         8 | mkinmod model generation and printing [0.2s]
+✔ |         3 | Model predictions with mkinpredict [0.3s]
+✔ |        16 | Evaluations according to 2015 NAFTA guidance [1.5s]
+✔ |         9 | Nonlinear mixed-effects models with nlme [8.2s]
+✔ |        16 | Plotting [1.3s]
+✔ |         4 | Residuals extracted from mkinfit models
+✔ |         2 | Complex test case from Schaefer et al. (2007) Piacenza paper [1.5s]
+✔ |         7 | Fitting the SFORB model [3.8s]
+✔ |         1 | Summaries of old mkinfit objects
+✔ |         4 | Summary [0.1s]
+✔ |         4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.3s]
+✔ |         9 | Hypothesis tests [8.6s]
+✔ |         4 | Calculation of maximum time weighted average concentrations (TWAs) [2.2s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 67.6 s
+Duration: 69.5 s
 
 ── Skipped tests  ──────────────────────────────────────────────────────────────
 • Fitting with saemix takes around 10 minutes when using deSolve (1)