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

Change cpp_dec_float string conversion to generate a better error message when conversion fails.

Browse Source 
Add generic inter-conversions and tests for them.
Fix bug in cpp_int convert_to.

[SVN r77630]
This commit is contained in:
John Maddock
2012-03-29 18:00:06 +00:00
parent 4397548816
commit 3913771ea0
6 changed files with 414 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/Jamfile.v2
View File

@@ -626,6 +626,17 @@ run test_rational_io.cpp gmp
[ check-target-builds ../config//has_gmp : : <build>no ]
: test_rational_io_mpz ;
run test_generic_conv.cpp
: # command line
: # input files
: # requirements
[ check-target-builds ../config//has_gmp : <define>TEST_GMP <source>gmp : ]
[ check-target-builds ../config//has_tommath : <define>TEST_TOMMATH <source>$(TOMMATH) : ]
[ check-target-builds ../config//has_mpfr : <define>TEST_MPFR <source>mpfr : ]
release
;
run ../example/gmp_snips.cpp gmp
: # command line
: # input files

148
test/test_generic_conv.cpp Normal file
View File

@@ -0,0 +1,148 @@
///////////////////////////////////////////////////////////////
// Copyright 2012 John Maddock. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_
//
#ifdef _MSC_VER
# define _SCL_SECURE_NO_WARNINGS
#endif
#include <boost/detail/lightweight_test.hpp>
#include <boost/array.hpp>
#include "test.hpp"
#include <boost/multiprecision/cpp_dec_float.hpp>
#include <boost/multiprecision/cpp_int.hpp>
#include <boost/multiprecision/random.hpp>
#ifdef TEST_GMP
#include <boost/multiprecision/gmp.hpp>
#endif
#ifdef TEST_TOMMATH
#include <boost/multiprecision/tommath.hpp>
#endif
#ifdef TEST_MPFR
#include <boost/multiprecision/mpfr.hpp>
#endif
int main()
{
using namespace boost::multiprecision;
using namespace boost::random;
independent_bits_engine<mt11213b, 1024, cpp_int> gen;
for(unsigned i = 0; i < 100; ++i)
{
cpp_int c = gen();
//
// Integer to integer conversions first:
//
#ifdef TEST_GMP
mpz_int z(c);
cpp_int t(z);
BOOST_CHECK_EQUAL(t, c);
z = -c;
t = -z;
BOOST_CHECK_EQUAL(t, c);
#endif
#ifdef TEST_TOMMATH
tom_int tom(c);
cpp_int t2(tom);
BOOST_CHECK_EQUAL(t2, c);
tom = -c;
t2 = -tom;
BOOST_CHECK_EQUAL(t2, c);
#endif
//
// Now integer to float:
//
typedef mp_number<cpp_dec_float<500> > dec_float_500;
dec_float_500 df(c);
dec_float_500 df2(c.str());
BOOST_CHECK_EQUAL(df, df2);
df = -c;
df2 = -df2;
BOOST_CHECK_EQUAL(df, df2);
#ifdef TEST_GMP
typedef mp_number<gmp_float<500> > mpf_type;
mpf_type mpf(c);
mpf_type mpf2(c.str());
BOOST_CHECK_EQUAL(mpf, mpf2);
mpf = -c;
mpf2 = -mpf2;
BOOST_CHECK_EQUAL(mpf, mpf2);
#endif
#ifdef TEST_MPFR
typedef mp_number<mpfr_float_backend<500> > mpfr_type;
mpfr_type mpfr(c);
mpfr_type mpfr2(c.str());
BOOST_CHECK_EQUAL(mpfr, mpfr2);
mpfr = -c;
mpfr2 = -mpfr2;
BOOST_CHECK_EQUAL(mpfr, mpfr2);
#endif
//
// Now float to float:
//
df = c;
df /= dec_float_500(gen());
dec_float_500 tol("1e-500");
#ifdef TEST_GMP
mpf = df;
mpf2 = df.str();
BOOST_CHECK_EQUAL(mpf, mpf2);
df = mpf;
df2 = mpf.str();
BOOST_CHECK(fabs((df - df2) / df) < tol);
#endif
#ifdef TEST_MPFR
mpfr = df;
mpfr2 = df.str();
BOOST_CHECK_EQUAL(mpfr, mpfr2);
df = mpfr;
df2 = mpfr.str();
BOOST_CHECK(fabs((df - df2) / df) < tol);
#endif
//
// Rational to rational conversions:
//
cpp_rational cppr(c, gen());
#ifdef TEST_GMP
mpq_rational mpq(cppr);
cpp_rational cppr2(mpq);
BOOST_CHECK_EQUAL(cppr, cppr2);
#endif
#ifdef TEST_TOMMATH
tom_rational tr(cppr);
cpp_rational cppr3(tr);
BOOST_CHECK_EQUAL(cppr, cppr3);
#endif
//
// Integer to rational conversions:
//
#ifdef TEST_GMP
mpq = c;
mpq_rational mpq2 = c.str();
BOOST_CHECK_EQUAL(mpq, mpq2);
#endif
#ifdef TEST_TOMMATH
tr = c;
tom_rational tr2 = c.str();
BOOST_CHECK_EQUAL(tr, tr2);
#endif
//
// Rational to float:
//
df = cppr;
df2 = numerator(cppr);
df2 /= dec_float_500(denominator(cppr));
BOOST_CHECK(fabs(df - df2) / df2 < tol);
}
return boost::report_errors();
}