From 4fa48c8ef79d75c008fe5cbd0f57b3d96db0b888 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 15 May 2015 11:03:43 +0200 Subject: Make FOMC test for FOCUS A robust towards non-convergence --- tests/testthat/test_parent_only.R | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/testthat/test_parent_only.R b/tests/testthat/test_parent_only.R index b022fe4e..c919cb9c 100644 --- a/tests/testthat/test_parent_only.R +++ b/tests/testthat/test_parent_only.R @@ -52,11 +52,10 @@ test_that("Fits for FOCUS A deviate less than 0.1% from median of values from FO expect_equivalent(dev.percent.A.SFO[[1]] < 0.1, rep(TRUE, 4)) # Fitting FOCUS A with FOMC is possible, but the correlation between - # alpha and beta obtained on Linux is 1.0000, and the test failed on Windows, - # as the Port algorithm did not converge (winbuilder, 2015-05-15) - if (.Platform$OS.type != "windows") { - fit.A.FOMC <- list(mkinfit("FOMC", FOCUS_2006_A, quiet = TRUE)) - + # alpha and beta, when obtained, is 1.0000, and the fit sometimes failed on + # Windows, as the Port algorithm did not converge (winbuilder, 2015-05-15) + fit.A.FOMC <- try(list(mkinfit("FOMC", FOCUS_2006_A, quiet = TRUE))) + if (!inherits(fit.A.FOMC, "try-error")) { median.A.FOMC <- as.numeric(lapply(subset(FOCUS_2006_FOMC_ref_A_to_F, dataset == "A", -- cgit v1.2.1