aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DESCRIPTION2
-rw-r--r--NEWS.md2
-rw-r--r--tests/testthat/print_mmkin_parent.txt12
-rw-r--r--tests/testthat/test_confidence.R9
-rw-r--r--tests/testthat/test_mixed.R2
5 files changed, 9 insertions, 18 deletions
diff --git a/DESCRIPTION b/DESCRIPTION
index 70872c1d..dd57aefa 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: mkin
Type: Package
Title: Kinetic Evaluation of Chemical Degradation Data
Version: 1.0.1
-Date: 2021-02-04
+Date: 2021-02-06
Authors@R: c(
person("Johannes", "Ranke", role = c("aut", "cre", "cph"),
email = "jranke@uni-bremen.de",
diff --git a/NEWS.md b/NEWS.md
index dd1b2e75..a7f52b88 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,6 +6,8 @@
- 'mkinresplot': Re-add Katrin Lindenberger as coauthor who was accidentally removed long ago
+- Remove tests relying on non-convergence of the FOMC fit to the FOCUS A dataset as this is platform dependent (revealed by the new additional tests on CRAN, thanks!)
+
# mkin 1.0.0
## General
diff --git a/tests/testthat/print_mmkin_parent.txt b/tests/testthat/print_mmkin_parent.txt
index 620a657a..ae1fee7d 100644
--- a/tests/testthat/print_mmkin_parent.txt
+++ b/tests/testthat/print_mmkin_parent.txt
@@ -2,12 +2,10 @@
Status of individual fits:
dataset
-model FOCUS_A FOCUS_C FOCUS_D
- SFO OK OK OK
- FOMC C OK OK
- DFOP OK OK OK
- HS OK OK OK
+model FOCUS_C FOCUS_D
+ SFO OK OK
+ FOMC OK OK
+ DFOP OK OK
+ HS OK OK
OK: No warnings
-C: Optimisation did not converge:
-false convergence (8)
diff --git a/tests/testthat/test_confidence.R b/tests/testthat/test_confidence.R
index 54be675c..36e9738d 100644
--- a/tests/testthat/test_confidence.R
+++ b/tests/testthat/test_confidence.R
@@ -1,14 +1,5 @@
context("Confidence intervals and p-values")
-test_that("Some special cases of confidence interval calculation work", {
-
- tmp <- expect_warning(mkinfit("FOMC", FOCUS_2006_A, quiet = TRUE), "not converge")
-
- expect_equivalent(
- confint(tmp, transform = FALSE),
- matrix(rep(NA, 8), nrow = 4))
-})
-
test_that("The confint method 'quadratic' is consistent with the summary", {
expect_equivalent(
confint(fit_nw_1, parm = "parent_0", method = "quadratic"),
diff --git a/tests/testthat/test_mixed.R b/tests/testthat/test_mixed.R
index ca0072ef..6f28d0c3 100644
--- a/tests/testthat/test_mixed.R
+++ b/tests/testthat/test_mixed.R
@@ -1,7 +1,7 @@
context("Nonlinear mixed-effects models")
test_that("Print methods work", {
- expect_known_output(print(fits, digits = 2), "print_mmkin_parent.txt")
+ expect_known_output(print(fits[, 2:3], digits = 2), "print_mmkin_parent.txt")
expect_known_output(print(mmkin_biphasic_mixed, digits = 2), "print_mmkin_biphasic_mixed.txt")
expect_known_output(print(nlme_biphasic, digits = 1), "print_nlme_biphasic.txt")
})

Contact - Imprint