Tests pass locally

1 files changed, 19 insertions, 21 deletions

diff --git a/log/test.log b/log/test.log
index 1e5dc943..3de5a60a 100644
--- a/log/test.log
+++ b/log/test.log
@@ -1,22 +1,22 @@
 ℹ Testing mkin
 ✔ | F W S  OK | Context
 ✔ |         5 | AIC calculation
-✔ |         5 | Analytical solutions for coupled models [3.3s]
+✔ |         5 | Analytical solutions for coupled models [3.4s]
 ✔ |         5 | Calculation of Akaike weights
 ✔ |         3 | Export dataset for reading into CAKE
-✔ |        12 | Confidence intervals and p-values [1.1s]
-✔ |     1  12 | Dimethenamid data from 2018 [31.7s]
+✔ |        12 | Confidence intervals and p-values [1.0s]
+✔ |     1  12 | Dimethenamid data from 2018 [33.0s]
 ────────────────────────────────────────────────────────────────────────────────
 Skip (test_dmta.R:98:3): Different backends get consistent results for SFO-SFO3+, dimethenamid data
 Reason: Fitting this ODE model with saemix takes about 15 minutes on my system
 ────────────────────────────────────────────────────────────────────────────────
-✔ |        14 | Error model fitting [4.9s]
+✔ |        14 | Error model fitting [5.1s]
 ✔ |         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.4s]
 ✔ |         1 | Fitting the logistic model [0.2s]
-✔ |         7 | Batch fitting and diagnosing hierarchical kinetic models [14.0s]
+✔ |         7 | Batch fitting and diagnosing hierarchical kinetic models [14.9s]
 ✔ |     1  12 | Nonlinear mixed-effects models [0.3s]
 ────────────────────────────────────────────────────────────────────────────────
 Skip (test_mixed.R:74:3): saemix results are reproducible for biphasic fits
@@ -27,33 +27,31 @@ Reason: Fitting with saemix takes around 10 minutes when using deSolve
 ✔ |         3 | mkinfit features [0.7s]
 ✔ |         8 | mkinmod model generation and printing [0.2s]
 ✔ |         3 | Model predictions with mkinpredict [0.3s]
-✔ |   2     3 | Multistart method for saem.mmkin models [17.7s]
+✔ |         3 | Multistart method for saem.mmkin models [19.1s]
+✔ |        16 | Evaluations according to 2015 NAFTA guidance [2.0s]
+✔ |         9 | Nonlinear mixed-effects models with nlme [8.5s]
+✔ |        16 | Plotting [10.6s]
+✔ |         4 | Residuals extracted from mkinfit models
+✔ |     1  35 | saemix parent models [71.6s]
 ────────────────────────────────────────────────────────────────────────────────
-Warning (test_multistart.R:15:3): multistart works for saem.mmkin models
-Adding new file snapshot: 'tests/testhat/_snaps/llhist-for-biphasic-saemix-fit.svg'
-
-Warning (test_multistart.R:16:3): multistart works for saem.mmkin models
-Adding new file snapshot: 'tests/testhat/_snaps/parhist-for-biphasic-saemix-fit.svg'
+Skip (test_saemix_parent.R:143:3): We can also use mkin solution methods for saem
+Reason: This still takes almost 2.5 minutes although we do not solve ODEs
 ────────────────────────────────────────────────────────────────────────────────
-✔ |        16 | Evaluations according to 2015 NAFTA guidance [1.8s]
-✔ |         9 | Nonlinear mixed-effects models with nlme [8.4s]
-✔ |        16 | Plotting [10.1s]
-✔ |         4 | Residuals extracted from mkinfit models
-✔ |        36 | saemix parent models [309.8s]
 ✔ |         2 | Complex test case from Schaefer et al. (2007) Piacenza paper [1.4s]
 ✔ |        11 | Processing of residue series
-✔ |         7 | Fitting the SFORB model [3.6s]
+✔ |         7 | Fitting the SFORB model [3.8s]
 ✔ |         1 | Summaries of old mkinfit objects
 ✔ |         5 | Summary [0.2s]
-✔ |         4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.1s]
-✔ |         9 | Hypothesis tests [7.8s]
+✔ |         4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.2s]
+✔ |         9 | Hypothesis tests [8.2s]
 ✔ |         4 | Calculation of maximum time weighted average concentrations (TWAs) [2.2s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 424.4 s
+Duration: 191.7 s
 
 ── Skipped tests  ──────────────────────────────────────────────────────────────
 • Fitting this ODE model with saemix takes about 15 minutes on my system (1)
 • Fitting with saemix takes around 10 minutes when using deSolve (1)
+• This still takes almost 2.5 minutes although we do not solve ODEs (1)
 
-[ FAIL 0 | WARN 2 | SKIP 2 | PASS 257 ]
+[ FAIL 0 | WARN 0 | SKIP 3 | PASS 256 ]