From 782bb645325efa8d1d1f971370478fd369b0a107 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 28 Oct 2022 11:16:54 +0200 Subject: Update test to renamed method --- log/test.log | 26 +++++++++++++------------- tests/testthat/summary_parent_FOCUS_2006.txt | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/log/test.log b/log/test.log index 6f6d0f23..dee62073 100644 --- a/log/test.log +++ b/log/test.log @@ -1,22 +1,22 @@ ℹ Testing mkin ✔ | F W S OK | Context ✔ | 5 | AIC calculation -✔ | 5 | Analytical solutions for coupled models [3.2s] +✔ | 5 | Analytical solutions for coupled models [3.4s] ✔ | 5 | Calculation of Akaike weights ✔ | 3 | Export dataset for reading into CAKE ✔ | 12 | Confidence intervals and p-values [1.0s] -✔ | 1 12 | Dimethenamid data from 2018 [31.8s] +✔ | 1 12 | Dimethenamid data from 2018 [32.5s] ──────────────────────────────────────────────────────────────────────────────── 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 ──────────────────────────────────────────────────────────────────────────────── -✔ | 14 | Error model fitting [4.9s] +✔ | 14 | Error model fitting [5.0s] ✔ | 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] +✔ | 4 | Test fitting the decline of metabolites from their maximum [0.4s] ✔ | 1 | Fitting the logistic model [0.2s] -✔ | 7 | Batch fitting and diagnosing hierarchical kinetic models [14.6s] +✔ | 7 | Batch fitting and diagnosing hierarchical kinetic models [14.5s] ✔ | 1 12 | Nonlinear mixed-effects models [0.3s] ──────────────────────────────────────────────────────────────────────────────── Skip (test_mixed.R:74:3): saemix results are reproducible for biphasic fits @@ -26,13 +26,13 @@ Reason: Fitting with saemix takes around 10 minutes when using deSolve ✔ | 10 | Special cases of mkinfit calls [0.4s] ✔ | 3 | mkinfit features [0.7s] ✔ | 8 | mkinmod model generation and printing [0.2s] -✔ | 3 | Model predictions with mkinpredict [0.4s] -✔ | 7 | Multistart method for saem.mmkin models [36.0s] +✔ | 3 | Model predictions with mkinpredict [0.3s] +✔ | 7 | Multistart method for saem.mmkin models [37.6s] ✔ | 16 | Evaluations according to 2015 NAFTA guidance [2.3s] -✔ | 9 | Nonlinear mixed-effects models with nlme [8.6s] -✔ | 16 | Plotting [10.0s] +✔ | 9 | Nonlinear mixed-effects models with nlme [8.7s] +✔ | 16 | Plotting [10.1s] ✔ | 4 | Residuals extracted from mkinfit models -✔ | 1 36 | saemix parent models [71.5s] +✔ | 1 36 | saemix parent models [72.8s] ──────────────────────────────────────────────────────────────────────────────── Skip (test_saemix_parent.R:152:3): We can also use mkin solution methods for saem Reason: This still takes almost 2.5 minutes although we do not solve ODEs @@ -43,11 +43,11 @@ Reason: This still takes almost 2.5 minutes although we do not solve ODEs ✔ | 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 | Calculation of maximum time weighted average concentrations (TWAs) [2.2s] +✔ | 9 | Hypothesis tests [8.3s] +✔ | 4 | Calculation of maximum time weighted average concentrations (TWAs) [2.1s] ══ Results ═════════════════════════════════════════════════════════════════════ -Duration: 206.0 s +Duration: 210.4 s ── Skipped tests ────────────────────────────────────────────────────────────── • Fitting this ODE model with saemix takes about 15 minutes on my system (1) diff --git a/tests/testthat/summary_parent_FOCUS_2006.txt b/tests/testthat/summary_parent_FOCUS_2006.txt index 60a36b67..418476c0 100644 --- a/tests/testthat/summary_parent_FOCUS_2006.txt +++ b/tests/testthat/summary_parent_FOCUS_2006.txt @@ -1,7 +1,7 @@ Error model: Constant variance Fitted in test time 0 s -Convergence: +Status: dataset model FOCUS_C FOCUS_D SFO OK OK -- cgit v1.2.1