Rerun tests, use current vdiffr on travis

1 files changed, 9 insertions, 33 deletions

diff --git a/test.log b/test.log
index a8b42364..1f477869 100644
--- a/test.log
+++ b/test.log
@@ -3,11 +3,11 @@ Loading required package: parallel
 ℹ Testing mkin
 ✔ |  OK F W S | Context
 ✔ |   5       | AIC calculation
-✔ |   5       | Analytical solutions for coupled models [3.2 s]
+✔ |   5       | Analytical solutions for coupled models [3.1 s]
 ✔ |   5       | Calculation of Akaike weights
 ✔ |   2       | Export dataset for reading into CAKE
 ✔ |  12       | Confidence intervals and p-values [1.3 s]
-✔ |  14       | Error model fitting [4.3 s]
+✔ |  14       | Error model fitting [4.2 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.7 s]
@@ -19,43 +19,19 @@ Loading required package: parallel
 ✔ |   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.7 s]
-✖ |   7 1     | Nonlinear mixed-effects models [1.9 s]
-────────────────────────────────────────────────────────────────────────────────
-Error (test_nlme.R:116:3): nlme_function works correctly in other cases
-Error: unused argument ("sysname")
-Backtrace:
- 1. mkin::mmkin("SFO", ds_me_sfo_5, quiet = TRUE) test_nlme.R:116:2
- 2. parallel::mclapply(...) /home/jranke/git/mkin/R/mmkin.R:118:4
-────────────────────────────────────────────────────────────────────────────────
-✖ |  10 4     | Plotting [1.7 s]
-────────────────────────────────────────────────────────────────────────────────
-Failure (test_plot.R:20:3): Plotting mkinfit, mmkin and mixed model objects is reproducible
-Figures don't match: mkinfit-plot-for-focus-c-with-residuals-like-in-gmkin.svg
-
-
-Failure (test_plot.R:21:3): Plotting mkinfit, mmkin and mixed model objects is reproducible
-Figures don't match: plot-res-for-focus-c.svg
-
-
-Failure (test_plot.R:22:3): Plotting mkinfit, mmkin and mixed model objects is reproducible
-Figures don't match: mkinfit-plot-for-focus-c-with-sep-true.svg
-
-
-Failure (test_plot.R:30:3): Plotting mkinfit, mmkin and mixed model objects is reproducible
-Figures don't match: plot-res-for-focus-d.svg
-
-────────────────────────────────────────────────────────────────────────────────
+✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.4 s]
+✔ |   9       | Nonlinear mixed-effects models [7.9 s]
+✔ |  14       | Plotting [1.1 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.6 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.2 s]
-✔ |   9       | Hypothesis tests [8.1 s]
+✔ |   9       | Hypothesis tests [8.0 s]
 ✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.4 s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 35.2 s
+Duration: 40.3 s
 
-[ FAIL 5 | WARN 0 | SKIP 0 | PASS 168 ]
+[ FAIL 0 | WARN 0 | SKIP 0 | PASS 174 ]