From 86e6d8368109d1a9c631af45227659178ce934ee Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 21 Oct 2019 21:52:33 +0200 Subject: Fix platform dependence of the correlation matrix Especially on winbuilder (i386 and amd64) --- tests/testthat/summary_DFOP_FOCUS_C.txt | 7 +------ tests/testthat/summary_DFOP_FOCUS_D_eigen.txt | 13 +------------ tests/testthat/test_plots_summary_twa.R | 5 +++-- 3 files changed, 5 insertions(+), 20 deletions(-) (limited to 'tests') diff --git a/tests/testthat/summary_DFOP_FOCUS_C.txt b/tests/testthat/summary_DFOP_FOCUS_C.txt index 90ce82e2..14e00f62 100644 --- a/tests/testthat/summary_DFOP_FOCUS_C.txt +++ b/tests/testthat/summary_DFOP_FOCUS_C.txt @@ -42,12 +42,7 @@ g_ilr 1.2490 0.05811 1.0870 1.4100 sigma 0.6962 0.16410 0.2406 1.1520 Parameter correlation: - parent_0 log_k1 log_k2 g_ilr sigma -parent_0 1e+00 4e-01 9e-02 -3e-02 5e-07 -log_k1 4e-01 1e+00 5e-01 -7e-01 4e-07 -log_k2 9e-02 5e-01 1e+00 -8e-01 -1e-07 -g_ilr -3e-02 -7e-01 -8e-01 1e+00 -2e-08 -sigma 5e-07 4e-07 -1e-07 -2e-08 1e+00 +NULL Backtransformed parameters: Confidence intervals for internally transformed parameters are asymmetric. diff --git a/tests/testthat/summary_DFOP_FOCUS_D_eigen.txt b/tests/testthat/summary_DFOP_FOCUS_D_eigen.txt index b570a15e..1626c5da 100644 --- a/tests/testthat/summary_DFOP_FOCUS_D_eigen.txt +++ b/tests/testthat/summary_DFOP_FOCUS_D_eigen.txt @@ -42,18 +42,7 @@ log_k_m1_sink -5.248 0.13320 -5.518 -4.977 sigma 3.126 0.35850 2.396 3.855 Parameter correlation: - parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink -parent_0 1e+00 6e-01 -6e-02 -2e-01 -log_k_parent_sink 6e-01 1e+00 -9e-02 -6e-01 -log_k_parent_m1 -6e-02 -9e-02 1e+00 5e-01 -log_k_m1_sink -2e-01 -6e-01 5e-01 1e+00 -sigma 1e-09 6e-10 3e-08 1e-09 - sigma -parent_0 1e-09 -log_k_parent_sink 6e-10 -log_k_parent_m1 3e-08 -log_k_m1_sink 1e-09 -sigma 1e+00 +NULL Backtransformed parameters: Confidence intervals for internally transformed parameters are asymmetric. diff --git a/tests/testthat/test_plots_summary_twa.R b/tests/testthat/test_plots_summary_twa.R index 306a585c..9c802b00 100644 --- a/tests/testthat/test_plots_summary_twa.R +++ b/tests/testthat/test_plots_summary_twa.R @@ -56,7 +56,7 @@ test_that("Summaries are reproducible", { # The correlation matrix is quite platform dependent # It differs between i386 and amd64 on Windows # and between Travis and my own Linux system - test_summary$Corr <- signif(test_summary$Corr, 1) + test_summary$Corr <- NULL expect_known_output(print(test_summary), "summary_DFOP_FOCUS_C.txt") test_summary_2 <- summary(f_sfo_sfo_eigen) @@ -69,7 +69,8 @@ test_that("Summaries are reproducible", { # The correlation matrix is quite platform dependent # It differs between i386 and amd64 on Windows # and between Travis and my own Linux system - test_summary_2$Corr <- signif(test_summary_2$Corr, 1) + # Even more so when using the Eigen method + test_summary_2$Corr <- NULL expect_known_output(print(test_summary_2), "summary_DFOP_FOCUS_D_eigen.txt") test_summary_3 <- summary(f_sfo_sfo_desolve) -- cgit v1.2.1