boost/multiprecision
2
0
Fork 0
mirror of https://github.com/boostorg/multiprecision.git synced 2026-02-21 03:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix operator>> for mp_number.

Browse Source 
Add template inter-conversions on cpp_float.
Adjust precision of test reporting.

[SVN r75520]
This commit is contained in:
John Maddock
2011-11-17 18:08:51 +00:00
parent b653174c77
commit cd31fbde7a
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/boost/multiprecision/cpp_float.hpp
View File

@@ -163,6 +163,18 @@ public:
fpclass (f.fpclass),
prec_elem(f.prec_elem) { }
template <unsigned D>
cpp_float(const cpp_float<D>& f) :
exp (f.exp),
neg (f.neg),
fpclass (static_cast<enum_fpclass>(static_cast<int>(f.fpclass))),
prec_elem(mp_elem_number)
{
// TODO: this doesn't round!
std::copy_n(f.data.begin(), std::min(f.prec_elem, prec_elem), data.begin());
precision(std::min(f.prec_elem, prec_elem));
}
template <class F>
cpp_float(const F val, typename enable_if<is_floating_point<F> >::type* = 0):
data(),
@@ -299,6 +311,16 @@ public:
prec_elem = v.prec_elem;
return *this;
}
template <unsigned D>
cpp_float& operator=(const cpp_float<D>& f)
{
exp = f.exp;
neg = f.neg;
fpclass = static_cast<enum_fpclass>(static_cast<int>(f.fpclass));
std::copy_n(f.data.begin(), std::min(f.prec_elem, prec_elem), data.begin());
precision(std::min(f.prec_elem, prec_elem));
return *this;
}
cpp_float& operator= (long long v)
{
if(v < 0)
@@ -481,6 +503,10 @@ private:
static boost::uint32_t div_loop_n(boost::uint32_t* const u, boost::uint32_t n, const boost::int32_t p);
bool rd_string(const char* const s);
template <unsigned D>
friend class cpp_float;
};
template <unsigned Digits10>

4
include/boost/multiprecision/mp_number.hpp
View File

@@ -1529,7 +1529,9 @@ inline typename boost::enable_if<detail::is_valid_comparison<Exp1, Exp2>, bool>:
template <class Backend>
inline std::ostream& operator << (std::ostream& os, const mp_number<Backend>& r)
{
return os << r.str(static_cast<unsigned>(os.precision(), os.flags() & os.scientific));
unsigned d = os.precision();
bool b = os.flags() & os.scientific;
return os << r.str(d, b);
}
namespace detail{