From 8de6e0c9df935266eccebbc9ff8ff2eef2e819d1 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 17 Dec 2020 08:45:07 +0100 Subject: Remove two skipped (on Travis) tests to reduce noise --- tests/testthat/DFOP_FOCUS_C_messages.txt | 200 ------------------------------- tests/testthat/test_mkinfit_errors.R | 16 --- tests/testthat/test_plot.R | 2 +- 3 files changed, 1 insertion(+), 217 deletions(-) delete mode 100644 tests/testthat/DFOP_FOCUS_C_messages.txt diff --git a/tests/testthat/DFOP_FOCUS_C_messages.txt b/tests/testthat/DFOP_FOCUS_C_messages.txt deleted file mode 100644 index 88e9ad5c..00000000 --- a/tests/testthat/DFOP_FOCUS_C_messages.txt +++ /dev/null @@ -1,200 +0,0 @@ -parent_0 log_k1 log_k2 g_qlogis - 85.10000 -2.30259 -4.60517 0.00000 -Sum of squared residuals at call 1: 7391.39 - 85.10000 -2.30259 -4.60517 0.00000 - 85.10000 -2.30259 -4.60517 0.00000 -Sum of squared residuals at call 3: 7391.39 - 85.10000 -2.30259 -4.60517 0.00000 -Sum of squared residuals at call 4: 7391.39 - 8.51000e+01 -2.30259e+00 -4.60517e+00 1.49012e-08 - 85.056739 -1.671603 -4.182209 0.648917 -Sum of squared residuals at call 6: 2451.52 - 84.991262 -0.716611 -3.542058 1.631054 -Sum of squared residuals at call 7: 13.7829 - 84.991267 -0.716611 -3.542058 1.631054 -Sum of squared residuals at call 8: 13.7829 - 84.991262 -0.716614 -3.542058 1.631054 -Sum of squared residuals at call 9: 13.7826 - 84.991262 -0.716611 -3.542062 1.631054 - 84.991262 -0.716611 -3.542058 1.631050 - 84.71288 -2.59069 -3.32179 3.26796 - 84.965536 -0.926698 -3.537257 1.766536 - 84.992033 -0.743768 -3.556304 1.612681 -Sum of squared residuals at call 14: 11.2376 - 84.992032 -0.743768 -3.556304 1.612681 - 84.992033 -0.743768 -3.556304 1.612681 - 84.992033 -0.743768 -3.556304 1.612681 - 84.992033 -0.743768 -3.556304 1.612681 - 84.992597 -0.750733 -3.585098 1.592663 -Sum of squared residuals at call 19: 10.0865 - 84.992595 -0.750733 -3.585098 1.592663 -Sum of squared residuals at call 20: 10.0865 - 84.992597 -0.750733 -3.585098 1.592663 -Sum of squared residuals at call 21: 10.0865 - 84.992597 -0.750733 -3.585097 1.592663 - 84.992597 -0.750733 -3.585098 1.592664 - 84.992421 -0.703782 -3.638466 1.584800 -Sum of squared residuals at call 24: 9.53394 - 84.992423 -0.703782 -3.638466 1.584800 -Sum of squared residuals at call 25: 9.53394 - 84.992421 -0.703782 -3.638466 1.584800 -Sum of squared residuals at call 26: 9.53394 - 84.992421 -0.703782 -3.638465 1.584800 - 84.992421 -0.703782 -3.638466 1.584800 - 84.994457 -0.747193 -3.694957 1.590668 -Sum of squared residuals at call 29: 7.68535 - 84.994455 -0.747193 -3.694957 1.590668 -Sum of squared residuals at call 30: 7.68535 - 84.994457 -0.747193 -3.694957 1.590668 -Sum of squared residuals at call 31: 7.68535 - 84.994457 -0.747193 -3.694956 1.590668 - 84.994457 -0.747193 -3.694957 1.590668 -Sum of squared residuals at call 33: 7.68534 - 84.99561 -0.74145 -3.74977 1.63623 -Sum of squared residuals at call 34: 6.54485 - 84.99561 -0.74145 -3.74977 1.63623 -Sum of squared residuals at call 35: 6.54485 - 84.99561 -0.74145 -3.74977 1.63623 - 84.99561 -0.74145 -3.74977 1.63623 - 84.99561 -0.74145 -3.74977 1.63623 - 84.999195 -0.781375 -3.871798 1.699156 -Sum of squared residuals at call 39: 5.4816 - 84.999193 -0.781375 -3.871798 1.699156 -Sum of squared residuals at call 40: 5.4816 - 84.999195 -0.781375 -3.871798 1.699156 -Sum of squared residuals at call 41: 5.48159 - 84.999195 -0.781375 -3.871798 1.699156 - 84.999195 -0.781375 -3.871798 1.699157 - 85.000245 -0.729263 -3.998464 1.657965 - 84.999165 -0.745628 -3.914855 1.691551 -Sum of squared residuals at call 45: 4.96084 - 84.999167 -0.745628 -3.914855 1.691551 -Sum of squared residuals at call 46: 4.96084 - 84.999165 -0.745628 -3.914855 1.691551 -Sum of squared residuals at call 47: 4.96084 - 84.999165 -0.745628 -3.914854 1.691551 - 84.999165 -0.745628 -3.914855 1.691551 - 85.000818 -0.765542 -3.951557 1.729540 -Sum of squared residuals at call 50: 4.5314 - 85.000816 -0.765542 -3.951557 1.729540 - 85.000818 -0.765542 -3.951557 1.729540 - 85.000818 -0.765542 -3.951557 1.729540 - 85.000818 -0.765542 -3.951557 1.729540 - 85.002931 -0.771499 -4.054666 1.683855 - 85.001154 -0.773816 -3.960228 1.725768 - 85.000960 -0.769949 -3.954277 1.728373 -Sum of squared residuals at call 57: 4.51486 - 85.000959 -0.769949 -3.954277 1.728373 -Sum of squared residuals at call 58: 4.51486 - 85.000960 -0.769949 -3.954277 1.728373 -Sum of squared residuals at call 59: 4.51486 - 85.000960 -0.769949 -3.954277 1.728373 - 85.000960 -0.769949 -3.954277 1.728373 -Sum of squared residuals at call 61: 4.51485 - 85.001004 -0.767037 -3.958449 1.729895 -Sum of squared residuals at call 62: 4.49757 - 85.001005 -0.767037 -3.958449 1.729895 -Sum of squared residuals at call 63: 4.49757 - 85.001004 -0.767037 -3.958449 1.729895 - 85.001004 -0.767037 -3.958448 1.729895 - 85.001004 -0.767037 -3.958449 1.729895 - 85.001424 -0.769932 -3.968566 1.731267 -Sum of squared residuals at call 67: 4.46771 - 85.001423 -0.769932 -3.968566 1.731267 -Sum of squared residuals at call 68: 4.46771 - 85.001424 -0.769932 -3.968566 1.731267 -Sum of squared residuals at call 69: 4.46771 - 85.001424 -0.769932 -3.968565 1.731267 - 85.001424 -0.769932 -3.968566 1.731267 - 85.002318 -0.774584 -3.980034 1.748508 -Sum of squared residuals at call 72: 4.42694 - 85.002319 -0.774584 -3.980034 1.748508 -Sum of squared residuals at call 73: 4.42694 - 85.002318 -0.774584 -3.980034 1.748508 - 85.002318 -0.774584 -3.980034 1.748508 - 85.002318 -0.774584 -3.980034 1.748508 -Sum of squared residuals at call 76: 4.42694 - 85.002323 -0.762339 -3.996975 1.744734 - 85.00232 -0.77126 -3.98463 1.74748 -Sum of squared residuals at call 78: 4.41527 - 85.00232 -0.77126 -3.98463 1.74748 -Sum of squared residuals at call 79: 4.41527 - 85.00232 -0.77126 -3.98463 1.74748 - 85.00232 -0.77126 -3.98463 1.74748 -Sum of squared residuals at call 81: 4.41527 - 85.00232 -0.77126 -3.98463 1.74748 - 85.00232 -0.77126 -3.98463 1.74748 - 85.002462 -0.773523 -3.989759 1.748837 -Sum of squared residuals at call 84: 4.39987 - 85.002461 -0.773523 -3.989759 1.748837 - 85.002462 -0.773523 -3.989759 1.748837 -Sum of squared residuals at call 86: 4.39987 - 85.002462 -0.773523 -3.989759 1.748837 - 85.002462 -0.773523 -3.989759 1.748837 - 85.00261 -0.77140 -4.00108 1.74936 -Sum of squared residuals at call 89: 4.38752 - 85.00261 -0.77140 -4.00108 1.74936 - 85.00261 -0.77140 -4.00108 1.74936 -Sum of squared residuals at call 91: 4.38752 - 85.00261 -0.77140 -4.00108 1.74936 - 85.00261 -0.77140 -4.00108 1.74936 - 85.002849 -0.775911 -4.019460 1.762547 -Sum of squared residuals at call 94: 4.36452 - 85.002848 -0.775911 -4.019460 1.762547 - 85.002849 -0.775911 -4.019460 1.762547 - 85.002849 -0.775911 -4.019460 1.762547 - 85.002849 -0.775911 -4.019460 1.762547 -Sum of squared residuals at call 98: 4.36452 - 85.002513 -0.777516 -4.025854 1.765855 -Sum of squared residuals at call 99: 4.36272 - 85.002512 -0.777516 -4.025854 1.765855 -Sum of squared residuals at call 100: 4.36272 - 85.002513 -0.777516 -4.025854 1.765855 -Sum of squared residuals at call 101: 4.36272 - 85.002513 -0.777516 -4.025854 1.765855 - 85.002513 -0.777516 -4.025854 1.765855 -Sum of squared residuals at call 103: 4.36272 - 85.002996 -0.777486 -4.025817 1.765889 -Sum of squared residuals at call 104: 4.36271 - 85.002997 -0.777486 -4.025817 1.765889 - 85.002995 -0.777486 -4.025817 1.765889 -Sum of squared residuals at call 106: 4.36271 - 85.002996 -0.777486 -4.025817 1.765889 - 85.002996 -0.777486 -4.025817 1.765889 - 85.002996 -0.777486 -4.025817 1.765889 - 85.002517 -0.777495 -4.025820 1.765890 -Sum of squared residuals at call 110: 4.36271 - 85.002519 -0.777495 -4.025820 1.765890 -Sum of squared residuals at call 111: 4.36271 - 85.002516 -0.777495 -4.025820 1.765890 - 85.002517 -0.777494 -4.025820 1.765890 - 85.002517 -0.777495 -4.025820 1.765890 -Sum of squared residuals at call 114: 4.36271 - 85.002517 -0.777495 -4.025818 1.765890 - 85.002517 -0.777495 -4.025823 1.765890 - 85.002517 -0.777495 -4.025820 1.765891 - 85.002517 -0.777495 -4.025820 1.765890 - 85.002736 -0.777491 -4.025819 1.765887 -Sum of squared residuals at call 119: 4.36271 - 85.002737 -0.777491 -4.025819 1.765887 - 85.002734 -0.777491 -4.025819 1.765887 -Sum of squared residuals at call 121: 4.36271 - 85.002736 -0.777491 -4.025819 1.765887 - 85.002736 -0.777492 -4.025819 1.765887 - 85.002736 -0.777491 -4.025818 1.765887 - 85.002736 -0.777491 -4.025820 1.765887 - 85.002736 -0.777491 -4.025819 1.765887 -Sum of squared residuals at call 126: 4.36271 - 85.002736 -0.777491 -4.025819 1.765886 - 85.002736 -0.777491 -4.025819 1.765887 -Sum of squared residuals at call 128: 4.36271 - 85.002759 -0.777491 -4.025819 1.765887 - 85.002713 -0.777491 -4.025819 1.765887 - 85.002736 -0.777491 -4.025819 1.765887 - 85.002736 -0.777492 -4.025819 1.765887 - 85.002736 -0.777491 -4.025815 1.765887 - 85.002736 -0.777491 -4.025822 1.765887 - 85.002736 -0.777491 -4.025819 1.765889 - 85.002736 -0.777491 -4.025819 1.765885 - 85.002736 -0.777491 -4.025819 1.765887 - 85.002736 -0.777491 -4.025819 1.765887 0.696237 diff --git a/tests/testthat/test_mkinfit_errors.R b/tests/testthat/test_mkinfit_errors.R index 85ee574e..4c8177bd 100644 --- a/tests/testthat/test_mkinfit_errors.R +++ b/tests/testthat/test_mkinfit_errors.R @@ -35,19 +35,3 @@ test_that("mkinfit warns if a specified initial parameter value is not in the mo expect_warning(mkinfit("SFO", FOCUS_2006_A, parms.ini = c(k_xy = 0.1), quiet = TRUE), "not used in the model") }) - -test_that("We get reproducible output if quiet = FALSE", { - # We cannot expect parameter and sum of squares traces to be the same across platforms - skip_on_cran() - skip_on_travis() - expect_known_output(mkinfit("DFOP", FOCUS_2006_C, reweight.method = "tc", trace_parms = TRUE), - file = "DFOP_FOCUS_C_messages.txt") -}) - -test_that("We get warnings in case of overparameterisation", { - skip_on_cran() # On winbuilder the following fit does not give a warning - skip_on_travis() # Neither on travis - expect_warning(f <- mkinfit("FOMC", FOCUS_2006_A, quiet = TRUE), "not converge") - # We do get Hessians and the related output after the switch to using numDeriv::hessian() - #s2 <- expect_warning(summary(mkinfit("DFOP", FOCUS_2006_A, quiet = TRUE)), "singular system") -}) diff --git a/tests/testthat/test_plot.R b/tests/testthat/test_plot.R index 22f4307f..75d401a3 100644 --- a/tests/testthat/test_plot.R +++ b/tests/testthat/test_plot.R @@ -1,6 +1,6 @@ context("Plotting") -test_that("Plotting mkinfit and mmkin objects is reproducible", { +test_that("Plotting mkinfit, mmkin and mixed model objects is reproducible", { skip_on_cran() plot_default_FOCUS_C_SFO <- function() plot(fits[["SFO", "FOCUS_C"]]) plot_res_FOCUS_C_SFO <- function() plot(fits[["SFO", "FOCUS_C"]], show_residuals = TRUE) -- cgit v1.2.1