Analytical solutions for all SFO variants

1 files changed, 16 insertions, 27 deletions

diff --git a/test.log b/test.log
index 74e869da..f2f9ff85 100644
--- a/test.log
+++ b/test.log
@@ -4,44 +4,33 @@ Testing mkin
 ✔ |   2       | Export dataset for reading into CAKE
 ✔ |  13       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [1.1 s]
 ✔ |   4       | Calculation of FOCUS chi2 error levels [0.4 s]
-✔ |   7       | Fitting the SFORB model [3.2 s]
-✔ |   1       | Analytical solutions for coupled models [0.2 s]
+✔ |   7       | Fitting the SFORB model [3.4 s]
+✔ |   4       | Analytical solutions for coupled models [1.7 s]
 ✔ |   5       | Calculation of Akaike weights
-✔ |  10       | Confidence intervals and p-values [0.9 s]
-✔ |  14       | Error model fitting [3.7 s]
-✔ |   6       | Test fitting the decline of metabolites from their maximum [0.2 s]
+✔ |  10       | Confidence intervals and p-values [1.0 s]
+✔ |  14       | Error model fitting [4.0 s]
+✔ |   4       | Test fitting the decline of metabolites from their maximum [0.2 s]
 ✔ |   1       | Fitting the logistic model [0.2 s]
 ✔ |   1       | Test dataset class mkinds used in gmkin
 ✔ |  12       | Special cases of mkinfit calls [0.6 s]
 ✔ |   8       | mkinmod model generation and printing [0.2 s]
-✔ |   3       | Model predictions with mkinpredict [0.3 s]
-✔ |  14     2 | Evaluations according to 2015 NAFTA guidance [0.9 s]
-────────────────────────────────────────────────────────────────────────────────
-test_nafta.R:25: skip: Test data from Appendix B are correctly evaluated
-Reason: getRversion() > 4  is TRUE
-
-test_nafta.R:50: skip: Test data from Appendix D are correctly evaluated
-Reason: getRversion() > 4  is TRUE
-────────────────────────────────────────────────────────────────────────────────
-✔ |   9       | Nonlinear mixed-effects models [7.0 s]
-✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.2 s]
+✔ |   3       | Model predictions with mkinpredict [0.4 s]
+✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.4 s]
+✔ |   9       | Nonlinear mixed-effects models [7.6 s]
+✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.4 s]
 ✔ |   3       | Summary
-✔ |   0     1 | Plotting [0.9 s]
-────────────────────────────────────────────────────────────────────────────────
-test_plots_summary_twa.R:98: skip: Plotting mkinfit and mmkin objects is reproducible
-Reason: getRversion() > 4  is TRUE
-────────────────────────────────────────────────────────────────────────────────
+✔ |  14       | Plotting [1.4 s]
 ✔ |   4       | AIC calculation
 ✔ |   4       | Residuals extracted from mkinfit models
-✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [1.3 s]
+✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [1.4 s]
 ✔ |   1       | Summaries of old mkinfit objects
-✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.2 s]
-✔ |   9       | Hypothesis tests [7.2 s]
+✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.3 s]
+✔ |   9       | Hypothesis tests [6.5 s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 32.9 s
+Duration: 36.4 s
 
-OK:       141
+OK:       158
 Failed:   0
 Warnings: 0
-Skipped:  3
+Skipped:  0