boost/math
2
0
Fork 0
mirror of https://github.com/boostorg/math.git synced 2026-02-21 15:12:28 +00:00
Code Issues Projects Releases Wiki Activity

Cardinal B-splines: Remove 'hides location declaration warnings'. Fix overload error on MSVC.

Browse Source
This commit is contained in:
NAThompson
2019-07-16 07:56:13 -04:00
parent cfd5a353f6
commit a173f8ff0b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/cardinal_b_spline_test.cpp
View File

@@ -23,22 +23,22 @@ using boost::math::forward_cardinal_b_spline;
template<class Real>
void test_box()
{
Real t = cardinal_b_spline<0>(1.1);
Real t = cardinal_b_spline<0>(Real(1.1));
Real expected = 0;
CHECK_ULP_CLOSE(expected, t, 0);
t = cardinal_b_spline<0>(-1.1);
t = cardinal_b_spline<0>(Real(-1.1));
expected = 0;
CHECK_ULP_CLOSE(expected, t, 0);
Real h = Real(1)/Real(256);
for (Real t = -Real(1)/Real(2)+h; t < Real(1)/Real(2); t += h)
for (t = -Real(1)/Real(2)+h; t < Real(1)/Real(2); t += h)
{
expected = 1;
CHECK_ULP_CLOSE(expected, cardinal_b_spline<0>(t), 0);
}
for (Real t = h; t < 1; t += h)
for (t = h; t < 1; t += h)
{
expected = 1;
CHECK_ULP_CLOSE(expected, forward_cardinal_b_spline<0>(t), 0);
@@ -48,16 +48,16 @@ void test_box()
template<class Real>
void test_hat()
{
Real t = cardinal_b_spline<1>(2.1);
Real t = cardinal_b_spline<1>(Real(2.1));
Real expected = 0;
CHECK_ULP_CLOSE(expected, t, 0);
t = cardinal_b_spline<1>(-2.1);
t = cardinal_b_spline<1>(Real(-2.1));
expected = 0;
CHECK_ULP_CLOSE(expected, t, 0);
Real h = Real(1)/Real(256);
for (Real t = -1; t <= 1; t += h)
for (t = -1; t <= 1; t += h)
{
expected = 1-abs(t);
if(!CHECK_ULP_CLOSE(expected, cardinal_b_spline<1>(t), 0) )
@@ -66,7 +66,7 @@ void test_hat()
}
}
for (Real t = 0; t < 2; t += h)
for (t = 0; t < 2; t += h)
{
expected = 1 - abs(t-1);
CHECK_ULP_CLOSE(expected, forward_cardinal_b_spline<1>(t), 0);

2
test/math_unit_test.hpp
View File

@@ -73,9 +73,9 @@ bool check_ulp_close(PreciseReal expected1, Real computed, size_t ulps, std::str
if (!std::is_integral<PreciseReal>::value) {
BOOST_ASSERT_MSG(sizeof(PreciseReal) >= sizeof(Real),
"The expected number must be computed in higher (or equal) precision than the number being tested.");
BOOST_ASSERT_MSG(!isnan(expected1), "Expected value cannot be a nan.");
}
BOOST_ASSERT_MSG(!isnan(expected1), "Expected value cannot be a nan.");
if (isnan(computed))
{
std::ios_base::fmtflags f( std::cerr.flags() );