diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2019-06-05 15:45:31 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2019-06-05 15:45:31 +0200 |
| commit | 4b323789265213bd65165873e7efe5e45a579275 (patch) | |
| tree | 305d43ef7618f3a2bd73356f510e3a15e717993e /tests | |
| parent | b6027bbd157734e1c7f8c3ba6373451f5c85fc38 (diff) | |
Adapt tests to new algorithms and output
One of the tests exceeded the number of iterations when using the
d_3 error model algorithm, so only use "direct" in this case.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testthat/FOCUS_2006_D.csf | 2 | ||||
| -rw-r--r-- | tests/testthat/summary_DFOP_FOCUS_C.txt | 5 | ||||
| -rw-r--r-- | tests/testthat/test_error_models.R | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/testthat/FOCUS_2006_D.csf b/tests/testthat/FOCUS_2006_D.csf index 43215ec4..668b1151 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: 2019-06-04 +Date: 2019-06-05 Optimiser: IRLS [Data] diff --git a/tests/testthat/summary_DFOP_FOCUS_C.txt b/tests/testthat/summary_DFOP_FOCUS_C.txt index fb8051c5..5c6f4257 100644 --- a/tests/testthat/summary_DFOP_FOCUS_C.txt +++ b/tests/testthat/summary_DFOP_FOCUS_C.txt @@ -12,8 +12,9 @@ Model predictions using solution type analytical Fitted using test 0 model solutions performed in test time 0 s -Error model: -Constant variance +Error model: Constant variance + +Error model algorithm: d_3 Starting values for parameters to be optimised: value type diff --git a/tests/testthat/test_error_models.R b/tests/testthat/test_error_models.R index 404f02ab..fa1f7131 100644 --- a/tests/testthat/test_error_models.R +++ b/tests/testthat/test_error_models.R @@ -153,7 +153,7 @@ test_that("Reweighting method 'tc' produces reasonable variance estimates", { # For a single fit, we get a relative error of less than 10% in the error # model components f_met_2_tc_e4 <- mkinfit(m_synth_DFOP_lin, d_met_2_15[[1]], quiet = TRUE, - error_model = "tc") + error_model = "tc", error_model_algorithm = "direct") parm_errors_met_2_tc_e4 <- (f_met_2_tc_e4$errparms - c(0.5, 0.07)) / c(0.5, 0.07) expect_true(all(abs(parm_errors_met_2_tc_e4) < 0.1)) |