Possibility to manually specify no_random_effects in mhmkin

2 files changed, 28 insertions, 28 deletions

diff --git a/log/check.log b/log/check.log
index 31fc31eb..42365918 100644
--- a/log/check.log
+++ b/log/check.log
@@ -5,7 +5,7 @@
 * using options ‘--no-tests --as-cran’
 * checking for file ‘mkin/DESCRIPTION’ ... OK
 * checking extension type ... Package
-* this is package ‘mkin’ version ‘1.2.1’
+* this is package ‘mkin’ version ‘1.2.2’
 * package encoding: UTF-8
 * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
 Maintainer: ‘Johannes Ranke <johannes.ranke@jrwb.de>’
@@ -18,7 +18,7 @@ Maintainer: ‘Johannes Ranke <johannes.ranke@jrwb.de>’
 * checking for portable file names ... OK
 * checking for sufficient/correct file permissions ... OK
 * checking serialization versions ... OK
-* checking whether package ‘mkin’ can be installed ... OK
+* checking whether package ‘mkin’ can be installed ... [11s/11s] OK
 * checking installed package size ... OK
 * checking package directory ... OK
 * checking for future file timestamps ... OK
@@ -41,7 +41,7 @@ Maintainer: ‘Johannes Ranke <johannes.ranke@jrwb.de>’
 * checking S3 generic/method consistency ... OK
 * checking replacement functions ... OK
 * checking foreign function calls ... OK
-* checking R code for possible problems ... [17s/17s] OK
+* checking R code for possible problems ... [19s/19s] OK
 * checking Rd files ... OK
 * checking Rd metadata ... OK
 * checking Rd line widths ... OK
@@ -57,7 +57,7 @@ Maintainer: ‘Johannes Ranke <johannes.ranke@jrwb.de>’
 * checking data for ASCII and uncompressed saves ... OK
 * checking installed files from ‘inst/doc’ ... OK
 * checking files in ‘vignettes’ ... OK
-* checking examples ... [20s/20s] OK
+* checking examples ... [24s/24s] OK
 * checking for unstated dependencies in ‘tests’ ... OK
 * checking tests ... SKIPPED
 * checking for unstated dependencies in vignettes ... OK
diff --git a/log/test.log b/log/test.log
index e17ecc1f..84fa49b9 100644
--- a/log/test.log
+++ b/log/test.log
@@ -1,58 +1,58 @@
 ℹ Testing mkin
 ✔ | F W S  OK | Context
 ✔ |         5 | AIC calculation
-✔ |         5 | Analytical solutions for coupled models [3.3s]
+✔ |         5 | Analytical solutions for coupled models [4.2s]
 ✔ |         5 | Calculation of Akaike weights
 ✔ |         3 | Export dataset for reading into CAKE
-✔ |        12 | Confidence intervals and p-values [1.1s]
-✔ |     1  12 | Dimethenamid data from 2018 [32.2s]
+✔ |        12 | Confidence intervals and p-values [1.2s]
+✔ |     1  12 | Dimethenamid data from 2018 [42.0s]
 ────────────────────────────────────────────────────────────────────────────────
 Skip ('test_dmta.R:98'): Different backends get consistent results for SFO-SFO3+, dimethenamid data
 Reason: Fitting this ODE model with saemix takes about 15 minutes on my system
 ────────────────────────────────────────────────────────────────────────────────
-✔ |        14 | Error model fitting [4.9s]
+✔ |        14 | Error model fitting [6.5s]
 ✔ |         5 | Time step normalisation
-✔ |         4 | Calculation of FOCUS chi2 error levels [0.6s]
-✔ |        14 | Results for FOCUS D established in expertise for UBA (Ranke 2014) [0.8s]
-✔ |         4 | Test fitting the decline of metabolites from their maximum [0.3s]
-✔ |         1 | Fitting the logistic model [0.2s]
-✔ |         8 | Batch fitting and diagnosing hierarchical kinetic models [14.5s]
-✔ |     1  11 | Nonlinear mixed-effects models [13.1s]
+✔ |         4 | Calculation of FOCUS chi2 error levels [0.7s]
+✔ |        14 | Results for FOCUS D established in expertise for UBA (Ranke 2014) [1.1s]
+✔ |         4 | Test fitting the decline of metabolites from their maximum [0.5s]
+✔ |         1 | Fitting the logistic model [0.3s]
+✔ |        10 | Batch fitting and diagnosing hierarchical kinetic models [54.1s]
+✔ |     1  11 | Nonlinear mixed-effects models [14.3s]
 ────────────────────────────────────────────────────────────────────────────────
 Skip ('test_mixed.R:78'): saemix results are reproducible for biphasic fits
 Reason: Fitting with saemix takes around 10 minutes when using deSolve
 ────────────────────────────────────────────────────────────────────────────────
 ✔ |         3 | Test dataset classes mkinds and mkindsg
-✔ |        10 | Special cases of mkinfit calls [0.4s]
-✔ |         3 | mkinfit features [0.7s]
-✔ |         8 | mkinmod model generation and printing [0.2s]
+✔ |        10 | Special cases of mkinfit calls [0.8s]
+✔ |         3 | mkinfit features [0.9s]
+✔ |         8 | mkinmod model generation and printing [0.3s]
 ✔ |         3 | Model predictions with mkinpredict [0.3s]
-✔ |        12 | Multistart method for saem.mmkin models [50.1s]
-✔ |        16 | Evaluations according to 2015 NAFTA guidance [2.2s]
-✔ |         9 | Nonlinear mixed-effects models with nlme [8.7s]
-✔ |        15 | Plotting [10.2s]
+✔ |        12 | Multistart method for saem.mmkin models [80.1s]
+✔ |        16 | Evaluations according to 2015 NAFTA guidance [2.8s]
+✔ |         9 | Nonlinear mixed-effects models with nlme [11.4s]
+✔ |        15 | Plotting [12.1s]
 ✔ |         4 | Residuals extracted from mkinfit models
-✔ |     1  36 | saemix parent models [103.8s]
+✔ |     1  36 | saemix parent models [85.9s]
 ────────────────────────────────────────────────────────────────────────────────
 Skip ('test_saemix_parent.R:143'): We can also use mkin solution methods for saem
 Reason: This still takes almost 2.5 minutes although we do not solve ODEs
 ────────────────────────────────────────────────────────────────────────────────
-✔ |         2 | Complex test case from Schaefer et al. (2007) Piacenza paper [1.4s]
+✔ |         2 | Complex test case from Schaefer et al. (2007) Piacenza paper [1.9s]
 ✔ |        11 | Processing of residue series
-✔ |        10 | Fitting the SFORB model [3.8s]
+✔ |        10 | Fitting the SFORB model [4.6s]
 ✔ |         1 | Summaries of old mkinfit objects
 ✔ |         5 | Summary [0.2s]
-✔ |         4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.2s]
-✔ |         9 | Hypothesis tests [8.1s]
+✔ |         4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.9s]
+✔ |         9 | Hypothesis tests [11.0s]
 ✔ |         4 | Calculation of maximum time weighted average concentrations (TWAs) [2.2s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 266.0 s
+Duration: 342.6 s
 
 ── Skipped tests  ──────────────────────────────────────────────────────────────
 • Fitting this ODE model with saemix takes about 15 minutes on my system (1)
 • Fitting with saemix takes around 10 minutes when using deSolve (1)
 • This still takes almost 2.5 minutes although we do not solve ODEs (1)
 
-[ FAIL 0 | WARN 0 | SKIP 3 | PASS 268 ]
+[ FAIL 0 | WARN 0 | SKIP 3 | PASS 270 ]
 Error while shutting down parallel: unable to terminate some child processes