diff --git a/test/float128/test_beta.cpp b/test/float128/test_beta.cpp index b287bafc7..6cfddd566 100644 --- a/test/float128/test_beta.cpp +++ b/test/float128/test_beta.cpp @@ -26,21 +26,21 @@ void expected_results() ".*", // platform ".*", // test type(s) "Beta Function: Small.*", // test data group - "boost::math::beta", 8, 5); // test function + "beta", 8, 5); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform ".*", // test type(s) "Beta Function: Medium.*", // test data group - "boost::math::beta", 1000, 750); // test function + "beta", 1000, 750); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform ".*", // test type(s) "Beta Function: Divergent.*", // test data group - "boost::math::beta", 1000, 700); // test function + "beta", 1000, 700); // test function // // Finish off by printing out the compiler/stdlib/platform names, // we do this to make it easier to mark up expected error rates. diff --git a/test/float128/test_erf.cpp b/test/float128/test_erf.cpp index abcbe51c6..90efd139e 100644 --- a/test/float128/test_erf.cpp +++ b/test/float128/test_erf.cpp @@ -22,14 +22,14 @@ void expected_results() ".*", // platform ".*", // test type(s) "Erf Function:.*", // test data group - "boost::math::erfc?", 2500, 1000); // test function + "erfc?", 2500, 1000); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform ".*", // test type(s) "Inverse Erf.*", // test data group - "boost::math::erfc?_inv", 60, 20); // test function + "erfc?_inv", 60, 20); // test function // // Finish off by printing out the compiler/stdlib/platform names, // we do this to make it easier to mark up expected error rates. diff --git a/test/float128/test_gamma.cpp b/test/float128/test_gamma.cpp index 12cd0424a..ddaae2adf 100644 --- a/test/float128/test_gamma.cpp +++ b/test/float128/test_gamma.cpp @@ -21,28 +21,28 @@ void expected_results() ".*", // platform ".*", // test type(s) "near.*", // test data group - "boost::math::tgamma", 200, 100); // test function + "tgamma", 200, 100); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform ".*", // test type(s) "near.*", // test data group - "boost::math::lgamma", 10000000, 10000000); // test function + "lgamma", 10000000, 10000000); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform ".*", // test type(s) "tgamma1pm1.*", // test data group - "boost::math::tgamma1pm1", 1000, 150); // test function + "tgamma1pm1", 1000, 150); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform ".*", // test type(s) ".*", // test data group - "boost::math::tgamma", 40, 20); // test function + "tgamma", 40, 20); // test function // // Finish off by printing out the compiler/stdlib/platform names, // we do this to make it easier to mark up expected error rates. diff --git a/test/float128/test_hermite.cpp b/test/float128/test_hermite.cpp index 1a55fe9f7..f933c6d27 100644 --- a/test/float128/test_hermite.cpp +++ b/test/float128/test_hermite.cpp @@ -21,7 +21,7 @@ void expected_results() ".*", // platform ".*", // test type(s) ".*", // test data group - "boost::math::hermite", 10, 5); // test function + "hermite", 10, 5); // test function // // Finish off by printing out the compiler/stdlib/platform names, // we do this to make it easier to mark up expected error rates. diff --git a/test/test_beta.cpp b/test/test_beta.cpp index cbfd9fc9b..0dcf5fffc 100644 --- a/test/test_beta.cpp +++ b/test/test_beta.cpp @@ -46,7 +46,7 @@ void expected_results() "Mac OS.*", // platform "(long\\s+)?double", // test type(s) "Beta Function: Medium.*", // test data group - "boost::math::beta", 200, 35); // test function + "beta", 200, 35); // test function #endif add_expected_result( @@ -55,42 +55,42 @@ void expected_results() ".*", // platform "(long\\s+)?double", // test type(s) "Beta Function: Small.*", // test data group - "boost::math::beta", 8, 5); // test function + "beta", 8, 5); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "(long\\s+)?double", // test type(s) "Beta Function: Medium.*", // test data group - "boost::math::beta", 160, 35); // test function + "beta", 160, 35); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "(long\\s+)?double", // test type(s) "Beta Function: Divergent.*", // test data group - "boost::math::beta", 30, 6); // test function + "beta", 30, 6); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "Beta Function: Small.*", // test data group - "boost::math::beta", 15, 15); // test function + "beta", 15, 15); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "Beta Function: Medium.*", // test data group - "boost::math::beta", 150, 40); // test function + "beta", 150, 40); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "Beta Function: Divergent.*", // test data group - "boost::math::beta", 25, 8); // test function + "beta", 25, 8); // test function // // Finish off by printing out the compiler/stdlib/platform names, diff --git a/test/test_erf.cpp b/test/test_erf.cpp index ee3409e3d..8fed443a6 100644 --- a/test/test_erf.cpp +++ b/test/test_erf.cpp @@ -64,14 +64,14 @@ void expected_results() "Mac OS", // platform largest_type, // test type(s) "Erf Function:.*Large.*", // test data group - "boost::math::erfc", 4300, 1300); // test function + "erfc", 4300, 1300); // test function add_expected_result( ".*", // compiler ".*", // stdlib "Mac OS", // platform largest_type, // test type(s) "Erf Function:.*", // test data group - "boost::math::erfc", 40, 10); // test function + "erfc", 40, 10); // test function add_expected_result( ".*", // compiler @@ -79,14 +79,14 @@ void expected_results() ".*", // platform "real_concept", // test type(s) "Erf Function:.*", // test data group - "boost::math::erfc?", 20, 6); // test function + "erfc?", 20, 6); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "Inverse Erfc.*", // test data group - "boost::math::erfc_inv", 80, 10); // test function + "erfc_inv", 80, 10); // test function // @@ -98,21 +98,21 @@ void expected_results() ".*", // platform ".*", // test type(s) "Erf Function:.*", // test data group - "boost::math::erfc?", 2, 2); // test function + "erfc?", 2, 2); // test function add_expected_result( ".*aCC.*", // compiler ".*", // stdlib ".*", // platform ".*", // test type(s) "Inverse Erfc.*", // test data group - "boost::math::erfc_inv", 80, 10); // test function + "erfc_inv", 80, 10); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform ".*", // test type(s) "Inverse Erf.*", // test data group - "boost::math::erfc?_inv", 18, 4); // test function + "erfc?_inv", 18, 4); // test function // // Finish off by printing out the compiler/stdlib/platform names, diff --git a/test/test_gamma.cpp b/test/test_gamma.cpp index b094cd928..9776a9b74 100644 --- a/test/test_gamma.cpp +++ b/test/test_gamma.cpp @@ -59,7 +59,7 @@ void expected_results() "Mac OS", // platform largest_type, // test type(s) "factorials", // test data group - "boost::math::tgamma", 100, 15); // test function + "tgamma", 100, 15); // test function // // G++ On Win32: // @@ -69,21 +69,21 @@ void expected_results() "Win32.*", // platform largest_type, // test type(s) "factorials", // test data group - "boost::math::tgamma", 100, 15); // test function + "tgamma", 100, 15); // test function add_expected_result( "GNU.*", // compiler ".*", // stdlib "Win32.*", // platform "real_concept", // test type(s) "factorials", // test data group - "boost::math::tgamma", 600, 200); // test function + "tgamma", 600, 200); // test function add_expected_result( "GNU.*", // compiler ".*", // stdlib "Win32.*", // platform "real_concept", // test type(s) "near.*", // test data group - "boost::math::tgamma", 200, 100); // test function + "tgamma", 200, 100); // test function // // G++ on Linux, result vary a bit by processor type, // on Itanium results are *much* better than listed here, @@ -96,56 +96,56 @@ void expected_results() "linux", // platform largest_type, // test type(s) "factorials", // test data group - "boost::math::tgamma", 600, 200); // test function + "tgamma", 600, 200); // test function add_expected_result( ".*", // compiler ".*", // stdlib "linux", // platform largest_type, // test type(s) "factorials", // test data group - "boost::math::lgamma", 30, 10); // test function + "lgamma", 30, 10); // test function add_expected_result( ".*", // compiler ".*", // stdlib "linux", // platform largest_type, // test type(s) "near (1|2|-10)", // test data group - "boost::math::tgamma", 10, 5); // test function + "tgamma", 10, 5); // test function add_expected_result( ".*", // compiler ".*", // stdlib "linux", // platform largest_type, // test type(s) "near (1|2|-10)", // test data group - "boost::math::lgamma", 50, 50); // test function + "lgamma", 50, 50); // test function add_expected_result( ".*", // compiler ".*", // stdlib "linux", // platform largest_type, // test type(s) "tgamma1pm1.*", // test data group - "boost::math::tgamma1pm1", 50, 15); // test function + "tgamma1pm1", 50, 15); // test function add_expected_result( ".*", // compiler ".*", // stdlib "linux", // platform "real_concept", // test type(s) "factorials", // test data group - "boost::math::tgamma", 600, 100); // test function + "tgamma", 600, 100); // test function add_expected_result( ".*", // compiler ".*", // stdlib "linux", // platform "real_concept", // test type(s) "near (0|-55)", // test data group - "boost::math::(t|l)gamma", 300, 150); // test function + "(t|l)gamma", 300, 150); // test function add_expected_result( ".*", // compiler ".*", // stdlib "linux", // platform "real_concept", // test type(s) "tgamma1pm1.*", // test data group - "boost::math::tgamma1pm1", 40, 10); // test function + "tgamma1pm1", 40, 10); // test function // // HP-UX results: // @@ -155,35 +155,35 @@ void expected_results() "HP-UX", // platform largest_type, // test type(s) "factorials", // test data group - "boost::math::tgamma", 5, 4); // test function + "tgamma", 5, 4); // test function add_expected_result( ".*", // compiler ".*", // stdlib "HP-UX", // platform largest_type, // test type(s) "near (0|-55)", // test data group - "boost::math::tgamma", 10, 5); // test function + "tgamma", 10, 5); // test function add_expected_result( ".*", // compiler ".*", // stdlib "HP-UX", // platform largest_type, // test type(s) "near (1|2|-10)", // test data group - "boost::math::lgamma", 250, 200); // test function + "lgamma", 250, 200); // test function add_expected_result( ".*", // compiler ".*", // stdlib "HP-UX", // platform "real_concept", // test type(s) "factorials", // test data group - "boost::math::lgamma", 50, 20); // test function + "lgamma", 50, 20); // test function add_expected_result( ".*", // compiler ".*", // stdlib "HP-UX", // platform "real_concept", // test type(s) "tgamma1pm1.*", // test data group - "boost::math::tgamma1pm1", 200, 80); // test function + "tgamma1pm1", 200, 80); // test function // // Tru64: // @@ -193,7 +193,7 @@ void expected_results() ".*", // platform "real_concept", // test type(s) "factorials", // test data group - "boost::math::lgamma", 50, 20); // test function + "lgamma", 50, 20); // test function // // Sun OS: // @@ -203,14 +203,14 @@ void expected_results() "Sun.*", // platform largest_type, // test type(s) "factorials", // test data group - "boost::math::tgamma", 300, 50); // test function + "tgamma", 300, 50); // test function add_expected_result( ".*", // compiler ".*", // stdlib "Sun.*", // platform "real_concept", // test type(s) "factorials", // test data group - "boost::math::tgamma", 300, 50); // test function + "tgamma", 300, 50); // test function // // Catch all cases come last: @@ -221,42 +221,42 @@ void expected_results() ".*", // platform largest_type, // test type(s) "factorials", // test data group - "boost::math::tgamma", 4, 1); // test function + "tgamma", 4, 1); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform largest_type, // test type(s) "factorials", // test data group - "boost::math::lgamma", 9, 1); // test function + "lgamma", 9, 1); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform largest_type, // test type(s) "near (0|-55)", // test data group - "boost::math::(t|l)gamma", 200, 100); // test function + "(t|l)gamma", 200, 100); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform largest_type, // test type(s) "near (1|2|-10)", // test data group - "boost::math::tgamma", 10, 5); // test function + "tgamma", 10, 5); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform largest_type, // test type(s) "near (1|2|-10)", // test data group - "boost::math::lgamma", 14, 7); // test function + "lgamma", 14, 7); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform largest_type, // test type(s) "tgamma1pm1.*", // test data group - "boost::math::tgamma1pm1", 30, 9); // test function + "tgamma1pm1", 30, 9); // test function add_expected_result( ".*", // compiler @@ -264,35 +264,35 @@ void expected_results() ".*", // platform "real_concept", // test type(s) "factorials", // test data group - "boost::math::tgamma", 600, 100); // test function + "tgamma", 600, 100); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "factorials", // test data group - "boost::math::lgamma", 200, 20); // test function + "lgamma", 200, 20); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "near.*", // test data group - "boost::math::tgamma", 300, 100); // test function + "tgamma", 300, 100); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "near.*", // test data group - "boost::math::lgamma", 40000000, 10000000); // test function + "lgamma", 40000000, 10000000); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "tgamma1pm1.*", // test data group - "boost::math::tgamma1pm1", 20, 5); // test function + "tgamma1pm1", 20, 5); // test function // // Finish off by printing out the compiler/stdlib/platform names, diff --git a/test/test_hermite.cpp b/test/test_hermite.cpp index 41ae54540..87875fa84 100644 --- a/test/test_hermite.cpp +++ b/test/test_hermite.cpp @@ -61,14 +61,14 @@ void expected_results() ".*", // platform largest_type, // test type(s) ".*", // test data group - "boost::math::hermite", 10, 5); // test function + "hermite", 10, 5); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) ".*", // test data group - "boost::math::hermite", 10, 5); // test function + "hermite", 10, 5); // test function // // Finish off by printing out the compiler/stdlib/platform names, // we do this to make it easier to mark up expected error rates. diff --git a/test/test_ibeta_inv_ab.hpp b/test/test_ibeta_inv_ab.hpp index bfd44d096..a13a32943 100644 --- a/test/test_ibeta_inv_ab.hpp +++ b/test/test_ibeta_inv_ab.hpp @@ -199,10 +199,7 @@ void test_beta(T, const char* name) #endif #if !defined(TEST_REAL_CONCEPT) || defined(FULL_TEST) || (TEST_DATA == 4) -#ifndef FULL_TEST if(boost::is_floating_point::value){ -#endif -#endif // // This accuracy test is normally only enabled for "real" // floating point types and not for class real_concept. @@ -212,7 +209,6 @@ void test_beta(T, const char* name) # include "ibeta_inva_data.ipp" test_inverses2(ibeta_inva_data, name, "Inverse incomplete beta"); -#ifndef FULL_TEST } #endif #endif diff --git a/test/test_igamma.cpp b/test/test_igamma.cpp index 5bfeb7e9d..732d736a6 100644 --- a/test/test_igamma.cpp +++ b/test/test_igamma.cpp @@ -271,21 +271,21 @@ void expected_results() "[^|]*", // platform largest_type, // test type(s) "[^|]*large[^|]*", // test data group - "boost::math::gamma_q", 500, 50); // test function + "gamma_q", 500, 50); // test function add_expected_result( "[^|]*", // compiler "[^|]*", // stdlib "Cygwin", // platform largest_type, // test type(s) "[^|]*large[^|]*", // test data group - "boost::math::gamma_p", 700, 50); // test function + "gamma_p", 700, 50); // test function add_expected_result( "[^|]*", // compiler "[^|]*", // stdlib "[^|]*", // platform largest_type, // test type(s) "[^|]*large[^|]*", // test data group - "boost::math::gamma_p", 350, 50); // test function + "gamma_p", 350, 50); // test function add_expected_result( "[^|]*", // compiler "[^|]*", // stdlib diff --git a/test/test_igamma_inv.cpp b/test/test_igamma_inv.cpp index d98194d66..e9673e51f 100644 --- a/test/test_igamma_inv.cpp +++ b/test/test_igamma_inv.cpp @@ -129,14 +129,14 @@ void expected_results() "[^|]*", // platform "float|double", // test type(s) "[^|]*small[^|]*", // test data group - "boost::math::gamma_p_inv", 500, 60); // test function + "gamma_p_inv", 500, 60); // test function add_expected_result( "[^|]*", // compiler "[^|]*", // stdlib "[^|]*", // platform "float|double", // test type(s) "[^|]*", // test data group - "boost::math::gamma_q_inv", 350, 60); // test function + "gamma_q_inv", 350, 60); // test function add_expected_result( "[^|]*", // compiler "[^|]*", // stdlib diff --git a/test/test_legendre.cpp b/test/test_legendre.cpp index f365428d6..8dbb185d4 100644 --- a/test/test_legendre.cpp +++ b/test/test_legendre.cpp @@ -73,28 +73,28 @@ void expected_results() ".*", // platform largest_type, // test type(s) "Legendre Polynomials.*Large.*", // test data group - "boost::math::legendre_p", 1000, 200); // test function + "legendre_p", 1000, 200); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform largest_type, // test type(s) "Legendre Polynomials.*Large.*", // test data group - "boost::math::legendre_q", 7000, 1000); // test function + "legendre_q", 7000, 1000); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "Legendre Polynomials.*Large.*", // test data group - "boost::math::legendre_p", 1000, 200); // test function + "legendre_p", 1000, 200); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "Legendre Polynomials.*Large.*", // test data group - "boost::math::legendre_q", 7000, 1000); // test function + "legendre_q", 7000, 1000); // test function } // // Catch all cases come last: @@ -105,28 +105,28 @@ void expected_results() ".*", // platform largest_type, // test type(s) "Legendre Polynomials.*Large.*", // test data group - "boost::math::legendre_p", 500, 200); // test function + "legendre_p", 500, 200); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform largest_type, // test type(s) "Legendre Polynomials.*Large.*", // test data group - "boost::math::legendre_q", 5400, 500); // test function + "legendre_q", 5400, 500); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform largest_type, // test type(s) "Legendre Polynomials.*", // test data group - "boost::math::legendre_p", 300, 80); // test function + "legendre_p", 300, 80); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform largest_type, // test type(s) "Legendre Polynomials.*", // test data group - "boost::math::legendre_q", 100, 50); // test function + "legendre_q", 100, 50); // test function add_expected_result( ".*", // compiler ".*", // stdlib @@ -141,28 +141,28 @@ void expected_results() ".*", // platform "real_concept", // test type(s) "Legendre Polynomials.*Large.*", // test data group - "boost::math::legendre_p", 500, 200); // test function + "legendre_p", 500, 200); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "Legendre Polynomials.*Large.*", // test data group - "boost::math::legendre_q", 5400, 500); // test function + "legendre_q", 5400, 500); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "Legendre Polynomials.*", // test data group - "boost::math::legendre_p", 300, 80); // test function + "legendre_p", 300, 80); // test function add_expected_result( ".*", // compiler ".*", // stdlib ".*", // platform "real_concept", // test type(s) "Legendre Polynomials.*", // test data group - "boost::math::legendre_q", 100, 50); // test function + "legendre_q", 100, 50); // test function add_expected_result( ".*", // compiler ".*", // stdlib diff --git a/test/test_nc_beta.cpp b/test/test_nc_beta.cpp index 281bf8047..962391b96 100644 --- a/test/test_nc_beta.cpp +++ b/test/test_nc_beta.cpp @@ -44,32 +44,6 @@ using std::endl; #include using std::numeric_limits; -#define BOOST_CHECK_CLOSE_EX(a, b, prec, i) \ - {\ - unsigned int failures = boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed;\ - BOOST_CHECK_CLOSE(a, b, prec); \ - if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\ - {\ - std::cerr << "Failure was at row " << i << std::endl;\ - std::cerr << std::setprecision(35); \ - std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\ - std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\ - }\ - } - -#define BOOST_CHECK_EX(a, i) \ - {\ - unsigned int failures = boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed;\ - BOOST_CHECK(a); \ - if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\ - {\ - std::cerr << "Failure was at row " << i << std::endl;\ - std::cerr << std::setprecision(35); \ - std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\ - std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\ - }\ - } - void expected_results() { // diff --git a/test/test_nc_beta.hpp b/test/test_nc_beta.hpp index 1395ad65d..53c8ea4e5 100644 --- a/test/test_nc_beta.hpp +++ b/test/test_nc_beta.hpp @@ -17,6 +17,32 @@ #include "handle_test_result.hpp" #include "table_type.hpp" +#define BOOST_CHECK_CLOSE_EX(a, b, prec, i) \ + {\ + unsigned int failures = boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed;\ + BOOST_CHECK_CLOSE(a, b, prec); \ + if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\ + {\ + std::cerr << "Failure was at row " << i << std::endl;\ + std::cerr << std::setprecision(35); \ + std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\ + std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\ + }\ + } + +#define BOOST_CHECK_EX(a, i) \ + {\ + unsigned int failures = boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed;\ + BOOST_CHECK(a); \ + if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\ + {\ + std::cerr << "Failure was at row " << i << std::endl;\ + std::cerr << std::setprecision(35); \ + std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\ + std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\ + }\ + } + template T nc_beta_cdf(T a, T b, T nc, T x) { diff --git a/test/test_nc_chi_squared.cpp b/test/test_nc_chi_squared.cpp index 194a7b509..554b03529 100644 --- a/test/test_nc_chi_squared.cpp +++ b/test/test_nc_chi_squared.cpp @@ -43,32 +43,6 @@ using std::endl; #include using std::numeric_limits; -#define BOOST_CHECK_CLOSE_EX(a, b, prec, i) \ - {\ - unsigned int failures = boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed;\ - BOOST_CHECK_CLOSE(a, b, prec); \ - if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\ - {\ - std::cerr << "Failure was at row " << i << std::endl;\ - std::cerr << std::setprecision(35); \ - std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\ - std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\ - }\ - } - -#define BOOST_CHECK_EX(a, i) \ - {\ - unsigned int failures = boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed;\ - BOOST_CHECK(a); \ - if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\ - {\ - std::cerr << "Failure was at row " << i << std::endl;\ - std::cerr << std::setprecision(35); \ - std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\ - std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\ - }\ - } - void expected_results() { // diff --git a/test/test_nc_chi_squared.hpp b/test/test_nc_chi_squared.hpp index 4e77c7b59..faf43f6e3 100644 --- a/test/test_nc_chi_squared.hpp +++ b/test/test_nc_chi_squared.hpp @@ -16,6 +16,32 @@ #include "handle_test_result.hpp" #include "table_type.hpp" +#define BOOST_CHECK_CLOSE_EX(a, b, prec, i) \ + {\ + unsigned int failures = boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed;\ + BOOST_CHECK_CLOSE(a, b, prec); \ + if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\ + {\ + std::cerr << "Failure was at row " << i << std::endl;\ + std::cerr << std::setprecision(35); \ + std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\ + std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\ + }\ + } + +#define BOOST_CHECK_EX(a, i) \ + {\ + unsigned int failures = boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed;\ + BOOST_CHECK(a); \ + if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\ + {\ + std::cerr << "Failure was at row " << i << std::endl;\ + std::cerr << std::setprecision(35); \ + std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\ + std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\ + }\ + } + template RealType naive_pdf(RealType v, RealType lam, RealType x) { diff --git a/test/test_owens_t.cpp b/test/test_owens_t.cpp index 393a614bd..2c234d292 100644 --- a/test/test_owens_t.cpp +++ b/test/test_owens_t.cpp @@ -41,6 +41,7 @@ using boost::math::owens_t; #include "libs/math/test/handle_test_result.hpp" #include "libs/math/test/table_type.hpp" #include "libs/math/test/functor.hpp" +#include "test_owens_t.hpp" // // Defining TEST_CPP_DEC_FLOAT enables testing of multiprecision support. @@ -105,7 +106,7 @@ void expected_results() ".*", // platform largest_type, // test type(s) ".*", // test data group - "boost::math::owens_t", 500, 100); // test function + "owens_t", 500, 100); // test function } else { @@ -115,7 +116,7 @@ void expected_results() ".*", // platform largest_type, // test type(s) ".*", // test data group - "boost::math::owens_t", 60, 5); // test function + "owens_t", 60, 5); // test function } // // Finish off by printing out the compiler/stdlib/platform names, diff --git a/test/test_tgamma_ratio.cpp b/test/test_tgamma_ratio.cpp index a8ebad84b..5c87ebd76 100644 --- a/test/test_tgamma_ratio.cpp +++ b/test/test_tgamma_ratio.cpp @@ -59,7 +59,7 @@ void expected_results() "HP-UX|Mac OS|linux|.*(bsd|BSD).*", // platform "float", // test type(s) "[^|]*", // test data group - "boost::math::tgamma_ratio[^|]*", 35, 8); // test function + "tgamma_ratio[^|]*", 35, 8); // test function // // Linux AMD x86em64 has slightly higher rates: // @@ -69,14 +69,14 @@ void expected_results() "linux.*", // platform largest_type, // test type(s) "[^|]*", // test data group - "boost::math::tgamma_ratio[^|]*", 300, 100); // test function + "tgamma_ratio[^|]*", 300, 100); // test function add_expected_result( "[^|]*", // compiler "[^|]*", // stdlib "linux.*", // platform "real_concept", // test type(s) "[^|]*", // test data group - "boost::math::tgamma_ratio[^|]*", 300, 100); // test function + "tgamma_ratio[^|]*", 300, 100); // test function add_expected_result( "GNU.*", // compiler @@ -84,7 +84,7 @@ void expected_results() "Win32.*", // platform largest_type, // test type(s) "[^|]*", // test data group - "boost::math::tgamma_ratio[^|]*", 300, 100); // test function + "tgamma_ratio[^|]*", 300, 100); // test function // // Catch all cases come last: // @@ -94,28 +94,28 @@ void expected_results() "[^|]*", // platform largest_type, // test type(s) "[^|]*", // test data group - "boost::math::tgamma_delta_ratio[^|]*", 30, 20); // test function + "tgamma_delta_ratio[^|]*", 30, 20); // test function add_expected_result( "[^|]*", // compiler "[^|]*", // stdlib "[^|]*", // platform largest_type, // test type(s) "[^|]*", // test data group - "boost::math::tgamma_ratio[^|]*", 100, 50); // test function + "tgamma_ratio[^|]*", 100, 50); // test function add_expected_result( "[^|]*", // compiler "[^|]*", // stdlib "[^|]*", // platform "real_concept", // test type(s) "[^|]*", // test data group - "boost::math::tgamma_delta_ratio[^|]*", 40, 15); // test function + "tgamma_delta_ratio[^|]*", 40, 15); // test function add_expected_result( "[^|]*", // compiler "[^|]*", // stdlib "[^|]*", // platform "real_concept", // test type(s) "[^|]*", // test data group - "boost::math::tgamma_ratio[^|]*", 250, 150); // test function + "[^|]*", 250, 150); // test function // // Finish off by printing out the compiler/stdlib/platform names,