Make saem using mkinpredict work again

I threw out mclapply as it did not play well with the linear algebra
routines used in the saemix code. Most of the change is actually
indentation in the code creating the model function. But there
is an important fix in mkinpredict which I had broken.

1 files changed, 7 insertions, 7 deletions

diff --git a/test.log b/test.log
index 6105128f..13fa7e70 100644
--- a/test.log
+++ b/test.log
@@ -6,32 +6,32 @@ Testing mkin
 ✔ |   2       | Export dataset for reading into CAKE
 ✔ |  14       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [1.0 s]
 ✔ |   4       | Calculation of FOCUS chi2 error levels [0.5 s]
-✔ |   7       | Fitting the SFORB model [3.5 s]
-✔ |   5       | Analytical solutions for coupled models [3.2 s]
+✔ |   7       | Fitting the SFORB model [3.7 s]
+✔ |   5       | Analytical solutions for coupled models [3.3 s]
 ✔ |   5       | Calculation of Akaike weights
 ✔ |  14       | Confidence intervals and p-values [1.2 s]
 ✔ |  14       | Error model fitting [4.7 s]
 ✔ |   3       | Time step normalisation
 ✔ |   4       | Test fitting the decline of metabolites from their maximum [0.3 s]
 ✔ |   1       | Fitting the logistic model [0.2 s]
-✔ |  31       | Nonlinear mixed effects models [27.5 s]
+✔ |  31       | Nonlinear mixed effects models [27.4 s]
 ✔ |   2       | Test dataset classes mkinds and mkindsg
 ✔ |   1       | mkinfit features [0.3 s]
 ✔ |  12       | Special cases of mkinfit calls [0.8 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.6 s]
-✔ |   9       | Nonlinear mixed-effects models [7.8 s]
+✔ |   9       | Nonlinear mixed-effects models [7.9 s]
 ✔ |  16       | Plotting [1.9 s]
 ✔ |   4       | Residuals extracted from mkinfit models
 ✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [1.5 s]
 ✔ |   4       | Summary [0.1 s]
 ✔ |   1       | Summaries of old mkinfit objects
 ✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.3 s]
-✔ |   9       | Hypothesis tests [7.3 s]
-✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.4 s]
+✔ |   9       | Hypothesis tests [7.5 s]
+✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.3 s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 69.3 s
+Duration: 69.5 s
 
 [ FAIL 0 | WARN 0 | SKIP 0 | PASS 204 ]