aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DESCRIPTION2
-rw-r--r--log/test.log16
-rw-r--r--tests/testthat/test_mixed.R2
3 files changed, 11 insertions, 9 deletions
diff --git a/DESCRIPTION b/DESCRIPTION
index 6aa012b5..3c1c4f7d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -36,4 +36,4 @@ VignetteBuilder: knitr
BugReports: https://github.com/jranke/mkin/issues/
URL: https://pkgdown.jrwb.de/mkin/
Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
diff --git a/log/test.log b/log/test.log
index e92a7409..0bd7338d 100644
--- a/log/test.log
+++ b/log/test.log
@@ -6,26 +6,26 @@
✔ | 3 | Export dataset for reading into CAKE
✔ | 6 | Use of precompiled symbols in mkinpredict [3.1s]
✔ | 12 | Confidence intervals and p-values
-✔ | 1 12 | Dimethenamid data from 2018 [13.0s]
+✔ | 1 12 | Dimethenamid data from 2018 [13.3s]
✔ | 14 | Error model fitting [2.6s]
✔ | 5 | Time step normalisation
✔ | 4 | Calculation of FOCUS chi2 error levels
✔ | 14 | Results for FOCUS D established in expertise for UBA (Ranke 2014)
✔ | 4 | Test fitting the decline of metabolites from their maximum
✔ | 1 | Fitting the logistic model
-✔ | 10 | Batch fitting and diagnosing hierarchical kinetic models [19.7s]
-✔ | 2 16 | Nonlinear mixed-effects models [144.7s]
+✔ | 10 | Batch fitting and diagnosing hierarchical kinetic models [19.1s]
+✔ | 2 16 | Nonlinear mixed-effects models [148.9s]
✔ | 3 | Test dataset classes mkinds and mkindsg
✔ | 10 | Special cases of mkinfit calls
✔ | 3 | mkinfit features
✔ | 8 | mkinmod model generation and printing
✔ | 3 | Model predictions with mkinpredict
-✔ | 12 | Multistart method for saem.mmkin models [23.3s]
+✔ | 12 | Multistart method for saem.mmkin models [23.1s]
✔ | 16 | Evaluations according to 2015 NAFTA guidance [1.5s]
-✔ | 9 | Nonlinear mixed-effects models with nlme [3.7s]
-✔ | 15 | Plotting [4.5s]
+✔ | 9 | Nonlinear mixed-effects models with nlme [3.8s]
+✔ | 15 | Plotting [4.6s]
✔ | 4 | Residuals extracted from mkinfit models
-✔ | 1 38 | saemix parent models [34.8s]
+✔ | 1 38 | saemix parent models [35.5s]
✔ | 2 | Complex test case from Schaefer et al. (2007) Piacenza paper
✔ | 11 | Processing of residue series
✔ | 10 | Fitting the SFORB model [1.7s]
@@ -37,7 +37,7 @@
✔ | 2 | water-sediment
══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 262.3 s
+Duration: 267.0 s
── Skipped tests (4) ───────────────────────────────────────────────────────────
• Fitting this ODE model with saemix takes about 5 minutes on my new system
diff --git a/tests/testthat/test_mixed.R b/tests/testthat/test_mixed.R
index d8ad4417..b9715096 100644
--- a/tests/testthat/test_mixed.R
+++ b/tests/testthat/test_mixed.R
@@ -89,6 +89,7 @@ test_that("saemix results are reproducible for biphasic fits", {
test_that("Reading spreadsheets, finding ill-defined parameters and covariate modelling", {
skip_on_cran()
+ skip_on_travis()
data_path <- system.file(
"testdata", "lambda-cyhalothrin_soil_efsa_2014.xlsx",
@@ -115,6 +116,7 @@ test_that("Reading spreadsheets, finding ill-defined parameters and covariate mo
test_that("SFO-SFO saemix specific analytical solution work", {
skip_on_cran()
+ skip_on_travis()
SFO_SFO <- mkinmod(DMTA = mkinsub("SFO", "M23"),
M23 = mkinsub("SFO"), quiet = TRUE)

Contact - Imprint