Merge branch 'master' into mxkin

Merge DESCRIPTION manually to combine dependencies and rerun check to
update check.log

1 files changed, 11 insertions, 11 deletions

diff --git a/test.log b/test.log
index c51d06b8..84b13a10 100644
--- a/test.log
+++ b/test.log
@@ -1,36 +1,36 @@
 Loading mkin
 Testing mkin
 ✔ |  OK F W S | Context
-✔ |   5       | Calculation of Akaike weights
 ✔ |   2       | Export dataset for reading into CAKE
-✔ |  10       | Confidence intervals and p-values [9.7 s]
-✔ |  14       | Error model fitting [36.9 s]
+✔ |  13       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [3.5 s]
 ✔ |   4       | Calculation of FOCUS chi2 error levels [2.2 s]
-✔ |  13       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [3.3 s]
+✔ |   4       | Fitting the SFORB model [1.7 s]
+✔ |   5       | Calculation of Akaike weights
+✔ |  10       | Confidence intervals and p-values [9.6 s]
+✔ |  14       | Error model fitting [38.4 s]
 ✔ |   6       | Test fitting the decline of metabolites from their maximum [0.7 s]
 ✔ |   1       | Fitting the logistic model [0.9 s]
 ✔ |   1       | Test dataset class mkinds used in gmkin
-✔ |  12       | Special cases of mkinfit calls [2.4 s]
+✔ |  12       | Special cases of mkinfit calls [2.2 s]
 ✔ |   9       | mkinmod model generation and printing [0.2 s]
 ✔ |   3       | Model predictions with mkinpredict [0.3 s]
-✔ |  16       | Evaluations according to 2015 NAFTA guidance [4.1 s]
-✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.3 s]
+✔ |  16       | Evaluations according to 2015 NAFTA guidance [4.2 s]
+✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.2 s]
 ✔ |   3       | Summary
 ✔ |  11       | Plotting [0.6 s]
 ✔ |   4       | AIC calculation
 ✔ |   2       | Residuals extracted from mkinfit models
 ✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [5.3 s]
-✔ |   4       | Fitting the SFORB model [1.7 s]
 ✔ |   1       | Summaries of old mkinfit objects
-✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [7.2 s]
-✔ |   7     1 | Hypothesis tests [32.3 s]
+✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [7.1 s]
+✔ |   7     1 | Hypothesis tests [32.5 s]
 ────────────────────────────────────────────────────────────────────────────────
 test_tests.R:60: skip: We can do a likelihood ratio test using an update specification
 Reason: This errors out if called by testthat while it works in a normal R session
 ────────────────────────────────────────────────────────────────────────────────
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 110.2 s
+Duration: 112.1 s
 
 OK:       138
 Failed:   0