From 99947961be1cf0a7eed80426bc3d8cc6daa6d106 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 31 Oct 2019 11:47:23 +0100 Subject: Reorganize tests to reduce time on winbuilder --- tests/testthat/test_tests.R | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'tests/testthat/test_tests.R') diff --git a/tests/testthat/test_tests.R b/tests/testthat/test_tests.R index d8b97815..6edb4dfa 100644 --- a/tests/testthat/test_tests.R +++ b/tests/testthat/test_tests.R @@ -2,7 +2,7 @@ context("Hypothesis tests") test_that("The likelihood ratio test works", { - expect_error(lrtest(fit_tc_1, f_tc_2), "not been fitted to the same data") + expect_error(lrtest(f_1_mkin_trans, f_2_mkin), "not been fitted to the same data") res <- lrtest(fit_nw_1, fit_tc_1) expect_equal(res[["2", "Pr(>Chisq)"]], 1, tolerance = 1e-5) @@ -10,13 +10,27 @@ test_that("The likelihood ratio test works", { }) test_that("We can conveniently fix parameters using 'fixed_parms'", { + f_k2_fixed <- mkinfit("DFOP", FOCUS_2006_C, fixed_parms = c(k2 = 0.05), quiet = TRUE) expect_equivalent(f_k2_fixed$bparms.ode["k2"], 0.05) + }) test_that("Updating fitted models works", { - f_dfop_const <- mkinfit("DFOP", FOCUS_2006_C, quiet = TRUE) - f_dfop_tc <- update(f_dfop_const, error_model = "tc") + + skip_on_cran() + f_dfop_tc <- update(f_2_mkin, error_model = "tc") + + dfop_sfo_sfo <- mkinmod( + parent = mkinsub("DFOP", to = "A1"), + A1 = mkinsub("SFO", to = "A2"), + A2 = mkinsub("SFO"), + use_of_ff = "max" + ) + + f_soil_1_tc <- mkinfit(dfop_sfo_sfo, + experimental_data_for_UBA_2019[[1]]$data, + error_model = "tc", quiet = TRUE) f_soil_1_nw <- update(f_soil_1_tc, error_model = "const") f_soil_1_nw_A2 <- update(f_soil_1_nw, fixed_parms = c(k_A2 = 0)) @@ -25,3 +39,8 @@ test_that("Updating fitted models works", { test_nw_A2 <- lrtest(f_soil_1_nw, f_soil_1_nw_A2) expect_equivalent(test_nw_A2[["2", "Pr(>Chisq)"]], 1, tolerance = 1e-4) }) + +test_that("We can do a likelihood ratio test using an update specification", { + test_2_mkin_k2 <- lrtest(f_2_mkin, fixed_parms = c(k2 = 0)) + expect_equivalent(test_2_mkin_k2[["2", "Pr(>Chisq)"]], 1.139e-6, tolerance = 1e-8) +}) -- cgit v1.2.1