From 4572a31a440c967dfc66222c0214fccd087ac338 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 10 Aug 2022 13:36:00 +0200 Subject: Increase test coverage, require saemix version 3.1 --- tests/testthat/convergence_fits_synth_const.txt | 0 tests/testthat/convergence_hfits_synth.txt | 0 tests/testthat/illparms_hfits_synth.txt | 8 ++++++++ tests/testthat/print_fits_synth_const.txt | 11 +++++++++++ tests/testthat/print_hfits_synth.txt | 9 +++++++++ tests/testthat/test_mhmkin.R | 11 ++++++----- 6 files changed, 34 insertions(+), 5 deletions(-) delete mode 100644 tests/testthat/convergence_fits_synth_const.txt delete mode 100644 tests/testthat/convergence_hfits_synth.txt create mode 100644 tests/testthat/print_fits_synth_const.txt create mode 100644 tests/testthat/print_hfits_synth.txt (limited to 'tests') diff --git a/tests/testthat/convergence_fits_synth_const.txt b/tests/testthat/convergence_fits_synth_const.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/testthat/convergence_hfits_synth.txt b/tests/testthat/convergence_hfits_synth.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/testthat/illparms_hfits_synth.txt b/tests/testthat/illparms_hfits_synth.txt index e69de29b..affd1318 100644 --- a/tests/testthat/illparms_hfits_synth.txt +++ b/tests/testthat/illparms_hfits_synth.txt @@ -0,0 +1,8 @@ + error +degradation const + SFO + FOMC sd(log_alpha), sd(log_beta) + error +degradation tc + SFO sd(parent_0) + FOMC sd(parent_0), sd(log_alpha), sd(log_beta) diff --git a/tests/testthat/print_fits_synth_const.txt b/tests/testthat/print_fits_synth_const.txt new file mode 100644 index 00000000..2ea1f133 --- /dev/null +++ b/tests/testthat/print_fits_synth_const.txt @@ -0,0 +1,11 @@ + object +Status of individual fits: + + dataset +model 1 2 3 4 5 6 + SFO OK OK OK OK OK OK + FOMC C C OK OK OK OK + +C: Optimisation did not converge: +false convergence (8) +OK: No warnings diff --git a/tests/testthat/print_hfits_synth.txt b/tests/testthat/print_hfits_synth.txt new file mode 100644 index 00000000..9af1cbcd --- /dev/null +++ b/tests/testthat/print_hfits_synth.txt @@ -0,0 +1,9 @@ + object +Status of individual fits: + + error +degradation const tc + SFO OK OK + FOMC OK OK + +OK: Fit terminated successfully diff --git a/tests/testthat/test_mhmkin.R b/tests/testthat/test_mhmkin.R index 5243f971..e059948a 100644 --- a/tests/testthat/test_mhmkin.R +++ b/tests/testthat/test_mhmkin.R @@ -10,20 +10,21 @@ test_that("Multiple hierarchical kinetic models can be fitted and diagnosed", { update(fits_synth_const, error_model = "tc")) expect_known_output( - convergence(fits_synth_const), - "convergence_fits_synth_const.txt") + print(fits_synth_const), + "print_fits_synth_const.txt") hfits <- mhmkin(list(fits_synth_const, fits_synth_tc)) expect_known_output( - convergence(hfits), - "convergence_hfits_synth.txt") + print(hfits), + "print_hfits_synth.txt") expect_known_output( - illparms(hfits), + print(illparms(hfits)), "illparms_hfits_synth.txt") expect_equal(which.min(AIC(hfits)), 3) + expect_equal(which.min(BIC(hfits)), 3) hfit_sfo_tc <- update(hfits[["SFO", "tc"]], covariance.model = diag(c(0, 1))) -- cgit v1.2.1