diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2019-04-10 10:17:35 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2019-04-10 10:17:35 +0200 |
| commit | 194659fcaccdd1ee37851725b8c72e99daa3a8cf (patch) | |
| tree | edbbebe8956000b9eb725ca425b91e051571ec02 /tests/testthat/test_FOCUS_D_UBA_expertise.R | |
| parent | 5814be02f286ce96d6cff8d698aea6844e4025f1 (diff) | |
Adapt tests, vignettes and examples
- Write the NEWS
- Static documentation rebuilt by pkgdown
- Adapt mkinerrmin
- Fix (hopefully all) remaining problems in mkinfit
Diffstat (limited to 'tests/testthat/test_FOCUS_D_UBA_expertise.R')
| -rw-r--r-- | tests/testthat/test_FOCUS_D_UBA_expertise.R | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/testthat/test_FOCUS_D_UBA_expertise.R b/tests/testthat/test_FOCUS_D_UBA_expertise.R index 42c4fcfb..3a49078c 100644 --- a/tests/testthat/test_FOCUS_D_UBA_expertise.R +++ b/tests/testthat/test_FOCUS_D_UBA_expertise.R @@ -27,20 +27,18 @@ SFO_SFO.ff <- mkinmod(parent = list(type = "SFO", to = "m1"), test_that("Fits without formation fractions are correct for FOCUS D", { - fit.default <- mkinfit(SFO_SFO, FOCUS_2006_D, quiet = TRUE) + fit.default <- expect_warning(mkinfit(SFO_SFO, FOCUS_2006_D, quiet = TRUE), "value of zero") expect_equal(round(as.numeric(endpoints(fit.default)$distimes["parent", ]), 2), c(7.02, 23.33)) expect_equal(round(as.numeric(endpoints(fit.default)$distimes["m1", ]), 1), c(131.8, 437.7)) - expect_equal(signif(summary(fit.default)$bpar[, "t value"], 5), - c(parent_0 = 61.720, k_parent_sink = 12.777, k_parent_m1 = 24.248, k_m1_sink = 7.3486)) }) test_that("Fits with formation fractions are correct for FOCUS D", { skip_on_cran() - fit.ff <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, quiet = TRUE) + fit.ff <- expect_warning(mkinfit(SFO_SFO.ff, FOCUS_2006_D, quiet = TRUE), "value of zero") expect_equivalent(round(fit.ff$bparms.optim, c(2, 4, 4, 4)), c(99.60, 0.0987, 0.0053, 0.5145)) @@ -88,6 +86,7 @@ test_that("The t-value for fits using internal transformations corresponds with synthetic_data_for_UBA_2014[[12]]$data, quiet = TRUE) + skip("Hessian matrices and df calculations differ from those in FME") # Note that the k1 and k2 are exchanged in the untransformed fit evaluated with FME for this test expect_equal(signif(summary(fit_DFOP_par_c_2)$bpar[1:7, "t value"], 5), c(parent_0 = 80.054, k_M1_sink = 12.291, k_M2_sink = 10.588, |