Improve tests

- Improve control of the number of cores
- Reduce the precision of the correlation matrix in the test summary
  output, as the exact results are platform dependent

3 files changed, 23 insertions, 12 deletions

diff --git a/tests/testthat/summary_DFOP_FOCUS_C.txt b/tests/testthat/summary_DFOP_FOCUS_C.txt
index c4800f35..fb8051c5 100644
--- a/tests/testthat/summary_DFOP_FOCUS_C.txt
+++ b/tests/testthat/summary_DFOP_FOCUS_C.txt
@@ -43,12 +43,12 @@ 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  1.000e+00  4.393e-01  8.805e-02 -3.176e-02  5.407e-07
-log_k1    4.393e-01  1.000e+00  4.821e-01 -6.716e-01  4.399e-07
-log_k2    8.805e-02  4.821e-01  1.000e+00 -7.532e-01 -1.143e-07
-g_ilr    -3.176e-02 -6.716e-01 -7.532e-01  1.000e+00 -2.196e-08
-sigma     5.407e-07  4.399e-07 -1.143e-07 -2.196e-08  1.000e+00
+         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
 
 Backtransformed parameters:
 Confidence intervals for internally transformed parameters are asymmetric.
diff --git a/tests/testthat/test_error_models.R b/tests/testthat/test_error_models.R
index 5a7aa4e8..1ec48605 100644
--- a/tests/testthat/test_error_models.R
+++ b/tests/testthat/test_error_models.R
@@ -72,9 +72,6 @@ test_that("Error model 'tc' works", {
 
 test_that("Reweighting method 'tc' produces reasonable variance estimates", {
 
-  # I need to make the tc method more robust against that
-  # skip_on_cran()
-
   # Check if we can approximately obtain the parameters and the error model
   # components that were used in the data generation
 
@@ -94,15 +91,25 @@ test_that("Reweighting method 'tc' produces reasonable variance estimates", {
     sdfunc = function(x) sigma_twocomp(x, 0.5, 0.07),
     n = 1, reps = 100, digits = 5, LOD = -Inf, seed = 123456)
 
+  # Per default (on my box) use all cores minus one
+  n_cores <- parallel::detectCores() - 1
+
+  # We are only allowed one core on travis
+  if (Sys.getenv("TRAVIS") != "") n_cores = 1
+
+  # Also on Windows we would need to make a cluster first,
+  # and I do not know how this would work on winbuilder or CRAN, so
+  if (Sys.info()["sysname"] == "Windows") n_cores = 1
+
   # Unweighted fits
   f_2_10 <- mmkin("DFOP", d_2_10, error_model = "const", quiet = TRUE,
-    cores = if (Sys.getenv("TRAVIS") != "") 1 else 15)
+    cores = n_cores)
   parms_2_10 <- apply(sapply(f_2_10, function(x) x$bparms.optim), 1, mean)
   parm_errors_2_10 <- (parms_2_10 - parms_DFOP_optim) / parms_DFOP_optim
   expect_true(all(abs(parm_errors_2_10) < 0.12))
 
   f_2_10_tc <- mmkin("DFOP", d_2_10, error_model = "tc", quiet = TRUE,
-    cores = if (Sys.getenv("TRAVIS") != "") 1 else 15)
+    cores = n_cores)
   parms_2_10_tc <- apply(sapply(f_2_10_tc, function(x) x$bparms.optim), 1, mean)
   parm_errors_2_10_tc <- (parms_2_10_tc - parms_DFOP_optim) / parms_DFOP_optim
   expect_true(all(abs(parm_errors_2_10_tc) < 0.05))
@@ -153,7 +160,7 @@ test_that("Reweighting method 'tc' produces reasonable variance estimates", {
   # Doing more takes a lot of computing power
   skip_on_travis()
   f_met_2_15_tc_e4 <- mmkin(list(m_synth_DFOP_lin), d_met_2_15, quiet = TRUE,
-                            error_model = "tc", cores = 15)
+                            error_model = "tc", cores = n_cores)
 
   parms_met_2_15_tc_e4 <- apply(sapply(f_met_2_15_tc_e4, function(x) x$bparms.optim), 1, mean)
   parm_errors_met_2_15_tc_e4 <- (parms_met_2_15_tc_e4[names(parms_DFOP_lin_optim)] -
diff --git a/tests/testthat/test_plots_summary_twa.R b/tests/testthat/test_plots_summary_twa.R
index cf5715fa..43036f1a 100644
--- a/tests/testthat/test_plots_summary_twa.R
+++ b/tests/testthat/test_plots_summary_twa.R
@@ -58,6 +58,10 @@ test_that("The summary is reproducible", {
   test_summary$date.summary <- "Dummy date for testing"
   test_summary$calls <- "test 0"
   test_summary$time <- c(elapsed = "test time 0")
+  # 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)
   expect_known_output(print(test_summary), "summary_DFOP_FOCUS_C.txt")
 })