Merge branch 'master' into saemix

Run make testcheck to regenerate logs with merge conflicts

1 files changed, 10 insertions, 10 deletions

diff --git a/test.log b/test.log
index 7e1fe957..53e45945 100644
--- a/test.log
+++ b/test.log
@@ -6,15 +6,15 @@ Testing mkin
 ✔ |   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]
+✔ |   7       | Fitting the SFORB model [3.6 s]
+✔ |   5       | Analytical solutions for coupled models [3.3 s]
 ✔ |   5       | Calculation of Akaike weights
-✔ |  12       | Confidence intervals and p-values [1.0 s]
-✔ |  14       | Error model fitting [4.4 s]
+✔ |  12       | Confidence intervals and p-values [1.1 s]
+✔ |  14       | Error model fitting [4.6 s]
 ✔ |   5       | Time step normalisation
 ✔ |   4       | Test fitting the decline of metabolites from their maximum [0.3 s]
 ✔ |   1       | Fitting the logistic model [0.2 s]
-✔ |  34     1 | Nonlinear mixed-effects models [25.9 s]
+✔ |  34     1 | Nonlinear mixed-effects models [26.1 s]
 ────────────────────────────────────────────────────────────────────────────────
 Skip (test_mixed.R:150:3): saem results are reproducible for biphasic fits
 Reason: Fitting with saemix takes around 10 minutes when using deSolve
@@ -24,19 +24,19 @@ Reason: Fitting with saemix takes around 10 minutes when using deSolve
 ✔ |  10       | Special cases of mkinfit calls [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.6 s]
-✔ |   9       | Nonlinear mixed-effects models [8.1 s]
-✔ |  16       | Plotting [1.9 s]
+✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.7 s]
+✔ |   9       | Nonlinear mixed-effects models [8.5 s]
+✔ |  16       | Plotting [2.0 s]
 ✔ |   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]
 ✔ |   1       | Summaries of old mkinfit objects
-✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.2 s]
+✔ |   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]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 67.9 s
+Duration: 68.9 s
 
 ── Skipped tests  ──────────────────────────────────────────────────────────────
 ● Fitting with saemix takes around 10 minutes when using deSolve (1)