diff options
| -rw-r--r-- | check.log | 2 | ||||
| -rw-r--r-- | docs/pkgdown.yml | 2 | ||||
| -rw-r--r-- | test.log | 10 | ||||
| -rw-r--r-- | tests/testthat/test_dmta.R | 6 |
4 files changed, 10 insertions, 10 deletions
@@ -8,7 +8,7 @@ * this is package ‘mkin’ version ‘1.1.0’ * package encoding: UTF-8 * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers -Maintainer: ‘Johannes Ranke <jranke@uni-bremen.de>’ +Maintainer: ‘Johannes Ranke <johannes.ranke@jrwb.de>’ * checking package namespace information ... OK * checking package dependencies ... OK * checking if this is a source package ... OK diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index f1010950..a22f7103 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -11,7 +11,7 @@ articles: benchmarks: web_only/benchmarks.html compiled_models: web_only/compiled_models.html dimethenamid_2018: web_only/dimethenamid_2018.html -last_built: 2022-03-07T13:50Z +last_built: 2022-03-07T20:48Z urls: reference: https://pkgdown.jrwb.de/mkin/reference article: https://pkgdown.jrwb.de/mkin/articles @@ -7,7 +7,7 @@ Loading required package: parallel ✔ | 5 | Calculation of Akaike weights ✔ | 2 | Export dataset for reading into CAKE ✔ | 12 | Confidence intervals and p-values [1.0s] -✔ | 1 12 | Dimethenamid data from 2018 [31.2s] +✔ | 1 12 | Dimethenamid data from 2018 [31.0s] ──────────────────────────────────────────────────────────────────────────────── Skip (test_dmta.R:98:3): Different backends get consistent results for SFO-SFO3+, dimethenamid data Reason: Fitting this ODE model with saemix takes about 15 minutes on my system @@ -34,15 +34,15 @@ Reason: Fitting with saemix takes around 10 minutes when using deSolve ✔ | 4 | Residuals extracted from mkinfit models ✔ | 23 | saemix parent models [26.7s] ✔ | 2 | Complex test case from Schaefer et al. (2007) Piacenza paper [1.4s] -✔ | 7 | Fitting the SFORB model [3.6s] +✔ | 7 | Fitting the SFORB model [3.7s] ✔ | 1 | Summaries of old mkinfit objects ✔ | 4 | Summary [0.1s] -✔ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.2s] +✔ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.1s] ✔ | 9 | Hypothesis tests [8.1s] -✔ | 4 | Calculation of maximum time weighted average concentrations (TWAs) [2.2s] +✔ | 4 | Calculation of maximum time weighted average concentrations (TWAs) [2.3s] ══ Results ═════════════════════════════════════════════════════════════════════ -Duration: 99.2 s +Duration: 99.1 s ── Skipped tests ────────────────────────────────────────────────────────────── • Fitting this ODE model with saemix takes about 15 minutes on my system (1) diff --git a/tests/testthat/test_dmta.R b/tests/testthat/test_dmta.R index 7f0a3a67..30c5d7c4 100644 --- a/tests/testthat/test_dmta.R +++ b/tests/testthat/test_dmta.R @@ -12,8 +12,8 @@ dmta_ds[["Elliot"]] <- rbind(dmta_ds[["Elliot 1"]], dmta_ds[["Elliot 2"]]) dmta_ds[["Elliot 1"]] <- dmta_ds[["Elliot 2"]] <- NULL # mkin -dmta_dfop <- mmkin("DFOP", dmta_ds, quiet = TRUE) -dmta_dfop_tc <- mmkin("DFOP", dmta_ds, error_model = "tc", quiet = TRUE) +dmta_dfop <- mmkin("DFOP", dmta_ds, quiet = TRUE, cores = n_cores) +dmta_dfop_tc <- mmkin("DFOP", dmta_ds, error_model = "tc", quiet = TRUE, cores = n_cores) test_that("Different backends get consistent results for DFOP tc, dimethenamid data", { @@ -85,7 +85,7 @@ sfo_sfo3p <- mkinmod( ) dmta_sfo_sfo3p_tc <- mmkin(list("SFO-SFO3+" = sfo_sfo3p), - dmta_ds, error_model = "tc", quiet = TRUE) + dmta_ds, error_model = "tc", quiet = TRUE, cores = n_cores) test_that("Different backends get consistent results for SFO-SFO3+, dimethenamid data", { |