Default to analytical for coupled models if available

This revealed that transforming rates is necessary for fitting
the analytical solution of the SFO-SFO model to the FOCUS D dataset.

Benchmarks show that fitting coupled models with deSolve got a bit
slower through the latest changes

1 files changed, 10 insertions, 10 deletions

diff --git a/test.log b/test.log
index 7788f109..2a116058 100644
--- a/test.log
+++ b/test.log
@@ -2,33 +2,33 @@ Loading mkin
 Testing mkin
 ✔ |  OK F W S | Context
 ✔ |   2       | Export dataset for reading into CAKE
-✔ |  13       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [3.3 s]
-✔ |   4       | Calculation of FOCUS chi2 error levels [2.0 s]
-✔ |   7       | Fitting the SFORB model [9.1 s]
-✔ |   1       | Analytical solutions for coupled models [1.1 s]
+✔ |  13       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [2.5 s]
+✔ |   4       | Calculation of FOCUS chi2 error levels [0.4 s]
+✔ |   7       | Fitting the SFORB model [9.0 s]
+✔ |   1       | Analytical solutions for coupled models [0.2 s]
 ✔ |   5       | Calculation of Akaike weights
 ✔ |  10       | Confidence intervals and p-values [1.0 s]
-✔ |  14       | Error model fitting [3.7 s]
+✔ |  14       | Error model fitting [3.8 s]
 ✔ |   6       | 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.4 s]
-✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.4 s]
+✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.3 s]
 ✔ |   9       | Nonlinear mixed-effects models [12.1 s]
 ✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.4 s]
 ✔ |   3       | Summary
-✔ |  14       | Plotting [3.5 s]
+✔ |  14       | Plotting [3.6 s]
 ✔ |   4       | AIC calculation
 ✔ |   4       | Residuals extracted from mkinfit models
 ✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [4.2 s]
 ✔ |   1       | Summaries of old mkinfit objects
-✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [6.4 s]
-✔ |   9       | Hypothesis tests [17.8 s]
+✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [6.3 s]
+✔ |   9       | Hypothesis tests [17.7 s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 69.9 s
+Duration: 66.3 s
 
 OK:       157
 Failed:   0