From 76bc0fead33a63168a5e8d77a6c4b82426815d70 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Sun, 16 Apr 2023 06:19:00 +0200 Subject: Skip the Eigenvalue based saem test It took too long, and this solution method is not recommended. We are saving 140 seconds here on my system, so more time is saved on travis. --- log/test.log | 20 ++++++++++++-------- tests/testthat/test_mixed.R | 11 ++++++----- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/log/test.log b/log/test.log index cec5e7ed..8166668a 100644 --- a/log/test.log +++ b/log/test.log @@ -4,7 +4,7 @@ ✔ | 5 | Analytical solutions for coupled models [1.5s] ✔ | 5 | Calculation of Akaike weights ✔ | 3 | Export dataset for reading into CAKE -✔ | 6 | Use of precompiled symbols in mkinpredict [3.2s] +✔ | 6 | Use of precompiled symbols in mkinpredict [3.1s] ✔ | 12 | Confidence intervals and p-values [0.4s] ✔ | 1 12 | Dimethenamid data from 2018 [12.5s] ──────────────────────────────────────────────────────────────────────────────── @@ -18,22 +18,25 @@ Reason: Fitting this ODE model with saemix takes about 15 minutes on my system ✔ | 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.1s] -✔ | 1 17 | Nonlinear mixed-effects models [294.0s] +✔ | 2 16 | Nonlinear mixed-effects models [148.6s] ──────────────────────────────────────────────────────────────────────────────── Skip ('test_mixed.R:78'): saemix results are reproducible for biphasic fits Reason: Fitting with saemix takes around 10 minutes when using deSolve + +Skip ('test_mixed.R:131'): SFO-SFO saemix specific analytical solution work +Reason: This is seldom used, so save some time ──────────────────────────────────────────────────────────────────────────────── ✔ | 3 | Test dataset classes mkinds and mkindsg ✔ | 10 | Special cases of mkinfit calls [0.3s] ✔ | 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 [23.2s] +✔ | 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.8s] -✔ | 15 | Plotting [4.8s] +✔ | 9 | Nonlinear mixed-effects models with nlme [3.9s] +✔ | 15 | Plotting [4.4s] ✔ | 4 | Residuals extracted from mkinfit models -✔ | 1 36 | saemix parent models [30.7s] +✔ | 1 36 | saemix parent models [31.1s] ──────────────────────────────────────────────────────────────────────────────── 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 @@ -48,11 +51,12 @@ Reason: This still takes almost 2.5 minutes although we do not solve ODEs ✔ | 4 | Calculation of maximum time weighted average concentrations (TWAs) [0.7s] ══ Results ═════════════════════════════════════════════════════════════════════ -Duration: 406.1 s +Duration: 260.5 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 is seldom used, so save some time (1) • This still takes almost 2.5 minutes although we do not solve ODEs (1) -[ FAIL 0 | WARN 0 | SKIP 3 | PASS 282 ] +[ FAIL 0 | WARN 0 | SKIP 4 | PASS 281 ] diff --git a/tests/testthat/test_mixed.R b/tests/testthat/test_mixed.R index c60d1421..8eb8e60c 100644 --- a/tests/testthat/test_mixed.R +++ b/tests/testthat/test_mixed.R @@ -123,14 +123,15 @@ test_that("SFO-SFO saemix specific analytical solution work", { expect_error(saem(mmkin_sfo_sfo, solution_type = "analytical"), "not supported") - saem_sfo_sfo_mkin_eigen<- saem(mmkin_sfo_sfo, solution_type = "eigen") - expect_equal( - endpoints(saem_sfo_sfo_saemix_analytical), - endpoints(saem_sfo_sfo_mkin_eigen)) - saem_sfo_sfo_mkin_desolve <- saem(mmkin_sfo_sfo, solution_type = "deSolve") expect_equal( endpoints(saem_sfo_sfo_saemix_analytical), endpoints(saem_sfo_sfo_mkin_desolve)) + skip("This is seldom used, so save some time") + + saem_sfo_sfo_mkin_eigen<- saem(mmkin_sfo_sfo, solution_type = "eigen") + expect_equal( + endpoints(saem_sfo_sfo_saemix_analytical), + endpoints(saem_sfo_sfo_mkin_eigen)) }) -- cgit v1.2.1