boostorg/multiprecision
1
0
Fork 0
mirror of https://github.com/boostorg/multiprecision.git synced 2026-07-21 13:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add some better error checks to interval construction.

Browse Source 
[SVN r86779]
This commit is contained in:
John Maddock
2013-11-21 13:04:20 +00:00
parent 25e5455b92
commit 239fd62dbe
1 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/multiprecision/mpfi.hpp
+35 -2
View File
@@ -179,6 +179,8 @@ struct mpfi_float_imp
} }
mpfi_float_imp& operator = (const char* s) mpfi_float_imp& operator = (const char* s)
{ {
using default_ops::eval_fpclassify;
if(m_data[0].left._mpfr_d == 0) if(m_data[0].left._mpfr_d == 0)
mpfi_init2(m_data, multiprecision::detail::digits10_2_2(digits10 ? digits10 : get_default_precision())); mpfi_init2(m_data, multiprecision::detail::digits10_2_2(digits10 ? digits10 : get_default_precision()));
@@ -203,7 +205,22 @@ struct mpfi_float_imp
part.erase(); part.erase();
b = part.c_str(); b = part.c_str();
mpfi_interv_fr(m_data, a.data(), b.data()); if(eval_fpclassify(a) == FP_NAN)
{
mpfi_set_fr(this->data(), a.data());
}
else if(eval_fpclassify(b) == FP_NAN)
{
mpfi_set_fr(this->data(), b.data());
}
else
{
if(a.compare(b) > 0)
{
BOOST_THROW_EXCEPTION(std::runtime_error("Attempt to create interval with invalid range (start is greater than end)."));
}
mpfi_interv_fr(m_data, a.data(), b.data());
}
} }
else if(mpfi_set_str(m_data, s, 10) != 0) else if(mpfi_set_str(m_data, s, 10) != 0)
{ {
@@ -745,7 +762,23 @@ inline void eval_convert_to(long double* result, const mpfi_float_backend<digits
template <unsigned D1, unsigned D2, mpfr_allocation_type AllocationType> template <unsigned D1, unsigned D2, mpfr_allocation_type AllocationType>
inline void assign_components(mpfi_float_backend<D1>& result, const mpfr_float_backend<D2, AllocationType>& a, const mpfr_float_backend<D2, AllocationType>& b) inline void assign_components(mpfi_float_backend<D1>& result, const mpfr_float_backend<D2, AllocationType>& a, const mpfr_float_backend<D2, AllocationType>& b)
{ {
mpfi_interv_fr(result.data(), a.data(), b.data()); using default_ops::eval_fpclassify;
if(eval_fpclassify(a) == FP_NAN)
{
mpfi_set_fr(result.data(), a.data());
}
else if(eval_fpclassify(b) == FP_NAN)
{
mpfi_set_fr(result.data(), b.data());
}
else
{
if(a.compare(b) > 0)
{
BOOST_THROW_EXCEPTION(std::runtime_error("Attempt to create interval with invalid range (start is greater than end)."));
}
mpfi_interv_fr(result.data(), a.data(), b.data());
}
} }
template <unsigned Digits10, class V> template <unsigned Digits10, class V>