Improve tests, remove geometric_mean

1 files changed, 11 insertions, 10 deletions

diff --git a/test.log b/test.log
index 79ff8ba7..fd292165 100644
--- a/test.log
+++ b/test.log
@@ -1,11 +1,11 @@
 Loading mkin
 Testing mkin
 ✔ |  OK F W S | Context
-✔ |   1       | Export dataset for reading into CAKE
-✔ |   2       | Confidence intervals and p-values [5.6 s]
-✔ |  11       | Error model fitting [53.4 s]
+✔ |   2       | Export dataset for reading into CAKE
+✔ |   3       | Confidence intervals and p-values
+✔ |  10       | Error model fitting [51.6 s]
 ✔ |   5       | Calculation of FOCUS chi2 error levels [3.5 s]
-✔ |  13       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [3.7 s]
+✔ |  13       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [3.4 s]
 ✔ |   6       | Test fitting the decline of metabolites from their maximum [0.9 s]
 ✔ |   1       | Fitting the logistic model [0.9 s]
 ✔ |   1       | Test dataset class mkinds used in gmkin
@@ -14,17 +14,18 @@ Testing mkin
 ✔ |   3       | Model predictions with mkinpredict [0.3 s]
 ✔ |  16       | Evaluations according to 2015 NAFTA guidance [4.0 s]
 ✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.2 s]
-✔ |   1       | Summary
-✔ |   4       | Plotting [0.3 s]
-✔ |   2       | AIC calculation
-✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [5.2 s]
+✔ |   2       | Summary
+✔ |   5       | Plotting [0.3 s]
+✔ |   3       | AIC calculation
+✔ |   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.1 s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 95.5 s
+Duration: 84.4 s
 
-OK:       98
+OK:       106
 Failed:   0
 Warnings: 0
 Skipped:  0