diff --git a/.travis.yml b/.travis.yml index 5d46c76a2..edd6515d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -619,27 +619,27 @@ matrix: - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=special_fun - osx_image: xcode9.3 + osx_image: xcode11 - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=distribution_tests - osx_image: xcode9.3 + osx_image: xcode11 - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=misc - osx_image: xcode9.3 + osx_image: xcode11 - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=quadrature - osx_image: xcode9.3 + osx_image: xcode11 - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=float128_tests - osx_image: xcode9.3 + osx_image: xcode11 - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=../example//examples - osx_image: xcode9.3 + osx_image: xcode11 install: diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 06992734c..c824b3282 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -113,7 +113,7 @@ test-suite special_fun : [ run test_1F1_log.cpp ../../test/build//boost_unit_test_framework : : : release [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] TEST=4 release clang:-Wno-literal_range : test_1F1_log_long_double ] [ run test_1F1_log.cpp ../../test/build//boost_unit_test_framework : : : release [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] TEST=5 clang:-Wno-literal_range : test_1F1_log_real_concept ] # pFq: - [ run test_1F1.cpp ../../test/build//boost_unit_test_framework : : : [ requires cxx11_hdr_initializer_list cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] TEST=2 release clang:-Wno-literal_range : test_1F1_float ] + [ run test_pFq.cpp ../../test/build//boost_unit_test_framework : : : [ requires cxx11_hdr_initializer_list cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] TEST=2 release clang:-Wno-literal_range : test_pFq_float ] [ run test_pFq.cpp ../../test/build//boost_unit_test_framework : : : [ requires cxx11_hdr_initializer_list cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] TEST=3 release clang:-Wno-literal_range : test_pFq_double ] [ run test_pFq.cpp ../../test/build//boost_unit_test_framework : : : [ requires cxx11_hdr_initializer_list cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] TEST=4 release clang:-Wno-literal_range : test_pFq_long_double ] [ run test_pFq.cpp ../../test/build//boost_unit_test_framework : : : [ requires cxx11_hdr_initializer_list cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] TEST=5 release clang:-Wno-literal_range : test_pFq_real_concept ] diff --git a/test/hypergeometric_1F1_big_double_limited.ipp b/test/hypergeometric_1F1_big_double_limited.ipp index 9bca434d2..3aff79bbc 100644 --- a/test/hypergeometric_1F1_big_double_limited.ipp +++ b/test/hypergeometric_1F1_big_double_limited.ipp @@ -6,9 +6,9 @@ { SC_(9.6886760729830712080001831054687500000000e-06), SC_(-1.2525131835937500000000000000000000000000e+03), SC_(-1.0437607421875000000000000000000000000000e+03), SC_(1.0000174610171120995494972331285845784973e+00) }, { SC_(-9.1337614555042634378878574352711439132690e-13), SC_(-1.2525131835937500000000000000000000000000e+03), SC_(-1.0437607421875000000000000000000000000000e+03), SC_(9.9999999999835391995458077011747081732328e-01) }, { SC_(9.1337571186955734958701214054599404335022e-13), SC_(-1.2525131835937500000000000000000000000000e+03), SC_(-1.0437607421875000000000000000000000000000e+03), SC_(1.0000000000016460792638453549919301101979e+00) }, - { { std::ldexp((double)10485392221989376, -40), std::ldexp((double)-11440692920695040, -40), std::ldexp((double)15790527852544000, -44), SC_(1.18289892801537469540400591236035802241505227e+161) } }, - { { std::ldexp((double)10485980564770816, -40), std::ldexp((double)-10424015334037760, -40), std::ldexp((double)12850940076032000, -44), SC_(-5.63691240015269602721075116789607623755153984e-99) } }, - { { std::ldexp((double)10485102088130304, -40), std::ldexp((double)-12174307949802496, -40), std::ldexp((double)17027372515328000, -44), SC_(-619367491691927041975872.474550388407917992627) } }, + { { static_cast(std::ldexp((double)10485392221989376, -40)), static_cast(std::ldexp((double)-11440692920695040, -40)), static_cast(std::ldexp((double)15790527852544000, -44)), SC_(1.18289892801537469540400591236035802241505227e+161) } }, + { { static_cast(std::ldexp((double)10485980564770816, -40)), static_cast(std::ldexp((double)-10424015334037760, -40)), static_cast(std::ldexp((double)12850940076032000, -44)), SC_(-5.63691240015269602721075116789607623755153984e-99) } }, + { { static_cast(std::ldexp((double)10485102088130304, -40)), static_cast(std::ldexp((double)-12174307949802496, -40)), static_cast(std::ldexp((double)17027372515328000, -44)), SC_(-619367491691927041975872.474550388407917992627) } }, }}; //#undef SC_ diff --git a/test/test_pFq.hpp b/test/test_pFq.hpp index 2980e43e3..dafdbb11d 100644 --- a/test/test_pFq.hpp +++ b/test/test_pFq.hpp @@ -104,6 +104,8 @@ void check_pFq_result(const T& result, const T& norm, const T& expect, const std template void test_spots_1F0(T, const char*) { + using std::pow; + T tolerance = boost::math::tools::epsilon() * 1000; BOOST_CHECK_CLOSE(boost::math::hypergeometric_pFq({ T(-3) }, {}, T(2)), T(-1), tolerance);