From 5526bf5ba6b003c6dae842f7f03f33c1648c9551 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 20 Apr 2020 08:25:27 +0200 Subject: Increase test tolerance for residuals This was done to address the test failure on r-devel-linux-x86_64-debian-gcc on CRAN --- NEWS.md | 2 ++ test.log | 8 ++++---- tests/testthat/FOCUS_2006_D.csf | 2 +- tests/testthat/test_residuals.R | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/NEWS.md b/NEWS.md index e1bfea58..919f413b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# mkin 0.9.49.11 (unreleased) + # mkin 0.9.49.10 (2020-04-18) - 'nlme.mmkin': An nlme method for mmkin row objects and an associated S3 class with print, plot, anova and endpoint methods diff --git a/test.log b/test.log index 0a14c115..684f6729 100644 --- a/test.log +++ b/test.log @@ -7,13 +7,13 @@ Testing mkin ✔ | 4 | Fitting the SFORB model [1.7 s] ✔ | 5 | Calculation of Akaike weights ✔ | 10 | Confidence intervals and p-values [9.4 s] -✔ | 14 | Error model fitting [37.6 s] +✔ | 14 | Error model fitting [38.0 s] ✔ | 6 | Test fitting the decline of metabolites from their maximum [0.8 s] ✔ | 1 | Fitting the logistic model [0.9 s] ✔ | 1 | Test dataset class mkinds used in gmkin ✔ | 12 | Special cases of mkinfit calls [2.3 s] ✔ | 9 | mkinmod model generation and printing [0.2 s] -✔ | 3 | Model predictions with mkinpredict [0.4 s] +✔ | 3 | Model predictions with mkinpredict [0.3 s] ✔ | 16 | Evaluations according to 2015 NAFTA guidance [4.1 s] ✔ | 9 | Nonlinear mixed-effects models [11.9 s] ✔ | 4 | Calculation of maximum time weighted average concentrations (TWAs) [2.2 s] @@ -23,8 +23,8 @@ Testing mkin ✔ | 4 | Residuals extracted from mkinfit models ✔ | 2 | Complex test case from Schaefer et al. (2007) Piacenza paper [5.3 s] ✔ | 1 | Summaries of old mkinfit objects -✔ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [7.2 s] -✔ | 9 | Hypothesis tests [37.0 s] +✔ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [7.1 s] +✔ | 9 | Hypothesis tests [36.8 s] ══ Results ═════════════════════════════════════════════════════════════════════ Duration: 131.8 s diff --git a/tests/testthat/FOCUS_2006_D.csf b/tests/testthat/FOCUS_2006_D.csf index 818c055a..81a4ed74 100644 --- a/tests/testthat/FOCUS_2006_D.csf +++ b/tests/testthat/FOCUS_2006_D.csf @@ -5,7 +5,7 @@ Description: MeasurementUnits: % AR TimeUnits: days Comments: Created using mkin::CAKE_export -Date: 2020-04-18 +Date: 2020-04-20 Optimiser: IRLS [Data] diff --git a/tests/testthat/test_residuals.R b/tests/testthat/test_residuals.R index f70ad224..d9974d86 100644 --- a/tests/testthat/test_residuals.R +++ b/tests/testthat/test_residuals.R @@ -11,10 +11,10 @@ test_that("Residuals are correctly returned", { expect_equivalent( residuals(fit_obs_1, standardized = TRUE)[1:3], c(-0.21771169, -0.33576060, 2.02836138), - tolerance = 1e-6) + tolerance = 1e-5) expect_equivalent( residuals(fit_tc_1, standardized = TRUE)[1:3], c(-0.2474499, -0.3794267, 2.2749216), - tolerance = 1e-6) + tolerance = 1e-5) }) -- cgit v1.2.1