Improvements to CAKE_export()

1 files changed, 15 insertions, 31 deletions

diff --git a/test.log b/test.log
index cd168e7f..4c273c19 100644
--- a/test.log
+++ b/test.log
@@ -3,65 +3,49 @@ Loading required package: parallel
 ℹ 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
-✔ |         2 | Export dataset for reading into CAKE
+✔ |         3 | Export dataset for reading into CAKE
 ✔ |        12 | Confidence intervals and p-values [1.0s]
-✔ |     1  12 | Dimethenamid data from 2018 [31.2s]
+✔ |     1  12 | Dimethenamid data from 2018 [32.7s]
 ────────────────────────────────────────────────────────────────────────────────
 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.7s]
+✔ |        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  12 | Nonlinear mixed-effects models [0.2s]
+✔ |     1  12 | Nonlinear mixed-effects models [0.3s]
 ────────────────────────────────────────────────────────────────────────────────
 Skip (test_mixed.R:68:3): saemix results are reproducible for biphasic fits
 Reason: Fitting with saemix takes around 10 minutes when using deSolve
 ────────────────────────────────────────────────────────────────────────────────
 ✔ |         3 | Test dataset classes mkinds and mkindsg
-✔ |        10 | Special cases of mkinfit calls [0.4s]
+✔ |        10 | Special cases of mkinfit calls [0.5s]
 ✔ |         3 | mkinfit features [0.7s]
 ✔ |         8 | mkinmod model generation and printing [0.3s]
 ✔ |         3 | Model predictions with mkinpredict [0.4s]
-✔ |        16 | Evaluations according to 2015 NAFTA guidance [1.5s]
-✔ |         9 | Nonlinear mixed-effects models with nlme [8.2s]
-✔ |   5    16 | Plotting [10.5s]
-────────────────────────────────────────────────────────────────────────────────
-Warning (test_plot.R:48:3): Plotting mkinfit, mmkin and mixed model objects is reproducible
-Adding new file snapshot: 'tests/testhat/_snaps/mixed-model-fit-for-mmkin-object.svg'
-
-Warning (test_plot.R:51:3): Plotting mkinfit, mmkin and mixed model objects is reproducible
-Adding new file snapshot: 'tests/testhat/_snaps/mixed-model-fit-for-saem-object-with-saemix-transformations.svg'
-
-Warning (test_plot.R:56:3): Plotting mkinfit, mmkin and mixed model objects is reproducible
-Adding new file snapshot: 'tests/testhat/_snaps/mixed-model-fit-for-nlme-object.svg'
-
-Warning (test_plot.R:64:3): Plotting mkinfit, mmkin and mixed model objects is reproducible
-Adding new file snapshot: 'tests/testhat/_snaps/mixed-model-fit-for-saem-object-with-mkin-transformations.svg'
-
-Warning (test_plot.R:68:3): Plotting mkinfit, mmkin and mixed model objects is reproducible
-Adding new file snapshot: 'tests/testhat/_snaps/plot-errmod-with-focus-d-obs-eigen.svg'
-────────────────────────────────────────────────────────────────────────────────
+✔ |        16 | Evaluations according to 2015 NAFTA guidance [1.6s]
+✔ |         9 | Nonlinear mixed-effects models with nlme [8.6s]
+✔ |        16 | Plotting [10.4s]
 ✔ |         4 | Residuals extracted from mkinfit models
-✔ |        23 | saemix parent models [28.9s]
-✔ |         2 | Complex test case from Schaefer et al. (2007) Piacenza paper [1.5s]
-✔ |         7 | Fitting the SFORB model [3.8s]
+✔ |        23 | saemix parent models [28.0s]
+✔ |         2 | Complex test case from Schaefer et al. (2007) Piacenza paper [1.4s]
+✔ |         7 | Fitting the SFORB model [3.7s]
 ✔ |         1 | Summaries of old mkinfit objects
 ✔ |         4 | Summary [0.1s]
 ✔ |         4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.2s]
-✔ |         9 | Hypothesis tests [8.2s]
+✔ |         9 | Hypothesis tests [8.1s]
 ✔ |         4 | Calculation of maximum time weighted average concentrations (TWAs) [2.2s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 111.6 s
+Duration: 112.8 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)
 
-[ FAIL 0 | WARN 5 | SKIP 2 | PASS 221 ]
+[ FAIL 0 | WARN 0 | SKIP 2 | PASS 222 ]