Fix a bug with moved DLLs and current deSolve

In mkinmod, dll_info was not included in the returned model object
in the case that the DLL was moved to a user defined directory.
This is now fixed.

3 files changed, 18 insertions, 24 deletions

diff --git a/R/mkinmod.R b/R/mkinmod.R
index 215dbed6..29542b71 100644
--- a/R/mkinmod.R
+++ b/R/mkinmod.R
@@ -464,13 +464,12 @@ mkinmod <- function(..., use_of_ff = "max", name = NULL,
       silent = TRUE)
 
     if (!inherits(model$cf, "try-error")) {
-      if (is.null(dll_dir)) {
-        if (!quiet) message("Temporary DLL for differentials generated and loaded")
-        model$dll_info <- inline::getDynLib(model$cf)
-      } else {
+      if (!is.null(dll_dir)) {
         model$dll_info <- inline::moveDLL(model$cf, name, dll_dir,
           unload = unload, overwrite = overwrite, verbose = !quiet)
       }
+      if (!quiet) message("Temporary DLL for differentials generated and loaded")
+      model$dll_info <- inline::getDynLib(model$cf)
     }
   }
   # }}}
diff --git a/log/check.log b/log/check.log
index cb313bc0..b7f6068c 100644
--- a/log/check.log
+++ b/log/check.log
@@ -21,8 +21,7 @@ Maintainer: ‘Johannes Ranke <johannes.ranke@jrwb.de>’
 * checking whether package ‘mkin’ can be installed ... OK
 * checking installed package size ... OK
 * checking package directory ... OK
-* checking for future file timestamps ... NOTE
-unable to verify current time
+* checking for future file timestamps ... OK
 * checking ‘build’ directory ... OK
 * checking DESCRIPTION meta-information ... OK
 * checking top-level files ... OK
@@ -59,7 +58,7 @@ unable to verify current time
 * checking sizes of PDF files under ‘inst/doc’ ... OK
 * checking installed files from ‘inst/doc’ ... OK
 * checking files in ‘vignettes’ ... OK
-* checking examples ... [10s/11s] OK
+* checking examples ... [10s/10s] OK
 * checking for unstated dependencies in ‘tests’ ... OK
 * checking tests ... SKIPPED
 * checking for unstated dependencies in vignettes ... OK
@@ -71,9 +70,5 @@ unable to verify current time
 * checking for detritus in the temp directory ... OK
 * DONE
 
-Status: 1 NOTE
-See
-  ‘/home/jranke/git/mkin/mkin.Rcheck/00check.log’
-for details.
-
+Status: OK
 
diff --git a/log/test.log b/log/test.log
index 54aa3c73..c89cf02e 100644
--- a/log/test.log
+++ b/log/test.log
@@ -4,8 +4,8 @@
 ✔ |         5 | Analytical solutions for coupled models [1.6s]
 ✔ |         5 | Calculation of Akaike weights
 ✔ |         3 | Export dataset for reading into CAKE
-✔ |        12 | Confidence intervals and p-values [0.3s]
-✔ |     1  12 | Dimethenamid data from 2018 [12.5s]
+✔ |        12 | Confidence intervals and p-values [0.4s]
+✔ |     1  12 | Dimethenamid data from 2018 [12.2s]
 ────────────────────────────────────────────────────────────────────────────────
 Skip ('test_dmta.R:99'): Different backends get consistent results for SFO-SFO3+, dimethenamid data
 Reason: Fitting this ODE model with saemix takes about 15 minutes on my system
@@ -13,11 +13,11 @@ Reason: Fitting this ODE model with saemix takes about 15 minutes on my system
 ✔ |        14 | Error model fitting [2.4s]
 ✔ |         5 | Time step normalisation
 ✔ |         4 | Calculation of FOCUS chi2 error levels [0.3s]
-✔ |        14 | Results for FOCUS D established in expertise for UBA (Ranke 2014) [0.5s]
+✔ |        14 | Results for FOCUS D established in expertise for UBA (Ranke 2014) [0.4s]
 ✔ |         4 | Test fitting the decline of metabolites from their maximum [0.2s]
 ✔ |         1 | Fitting the logistic model [0.1s]
 ✔ |        10 | Batch fitting and diagnosing hierarchical kinetic models [19.5s]
-✔ |     1  11 | Nonlinear mixed-effects models [5.7s]
+✔ |     1  11 | Nonlinear mixed-effects models [5.8s]
 ────────────────────────────────────────────────────────────────────────────────
 Skip ('test_mixed.R:78'): saemix results are reproducible for biphasic fits
 Reason: Fitting with saemix takes around 10 minutes when using deSolve
@@ -27,27 +27,27 @@ Reason: Fitting with saemix takes around 10 minutes when using deSolve
 ✔ |         3 | mkinfit features [0.5s]
 ✔ |         8 | mkinmod model generation and printing
 ✔ |         3 | Model predictions with mkinpredict [0.1s]
-✔ |        12 | Multistart method for saem.mmkin models [21.2s]
-✔ |        16 | Evaluations according to 2015 NAFTA guidance [1.5s]
-✔ |         9 | Nonlinear mixed-effects models with nlme [3.7s]
-✔ |        15 | Plotting [4.4s]
+✔ |        12 | Multistart method for saem.mmkin models [22.0s]
+✔ |        16 | Evaluations according to 2015 NAFTA guidance [1.6s]
+✔ |         9 | Nonlinear mixed-effects models with nlme [3.9s]
+✔ |        15 | Plotting [5.1s]
 ✔ |         4 | Residuals extracted from mkinfit models
-✔ |     1  36 | saemix parent models [30.8s]
+✔ |     1  36 | saemix parent models [31.4s]
 ────────────────────────────────────────────────────────────────────────────────
 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 [0.5s]
 ✔ |        11 | Processing of residue series
-✔ |        10 | Fitting the SFORB model [1.6s]
+✔ |        10 | Fitting the SFORB model [1.7s]
 ✔ |         1 | Summaries of old mkinfit objects
 ✔ |         5 | Summary
 ✔ |         4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [0.8s]
-✔ |         9 | Hypothesis tests [2.9s]
+✔ |         9 | Hypothesis tests [3.0s]
 ✔ |         4 | Calculation of maximum time weighted average concentrations (TWAs) [0.7s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 112.6 s
+Duration: 115.0 s
 
 ── Skipped tests  ──────────────────────────────────────────────────────────────
 • Fitting this ODE model with saemix takes about 15 minutes on my system (1)