|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r85231 - in trunk: boost/multiprecision boost/multiprecision/cpp_int libs/multiprecision/test
From: john_at_[hidden]
Date: 2013-08-07 04:15:51
Author: johnmaddock
Date: 2013-08-07 04:15:51 EDT (Wed, 07 Aug 2013)
New Revision: 85231
URL: http://svn.boost.org/trac/boost/changeset/85231
Log:
Fix binary archive serialization.
Add rational serialization.
Added:
trunk/libs/multiprecision/test/test_cpp_rat_serial.cpp (contents, props changed)
Text files modified:
trunk/boost/multiprecision/cpp_int/serialize.hpp | 4
trunk/boost/multiprecision/rational_adaptor.hpp | 24 +++++++
trunk/libs/multiprecision/test/Jamfile.v2 | 1
trunk/libs/multiprecision/test/test_cpp_rat_serial.cpp | 136 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 163 insertions(+), 2 deletions(-)
Modified: trunk/boost/multiprecision/cpp_int/serialize.hpp
==============================================================================
--- trunk/boost/multiprecision/cpp_int/serialize.hpp Tue Aug 6 23:03:23 2013 (r85230)
+++ trunk/boost/multiprecision/cpp_int/serialize.hpp 2013-08-07 04:15:51 EDT (Wed, 07 Aug 2013) (r85231)
@@ -140,7 +140,7 @@
ar & s;
ar & c;
val.resize(c, c);
- ar.load_binary(val.limbs(), c);
+ ar.load_binary(val.limbs(), c * sizeof(limb_type));
if(s != val.sign())
val.negate();
val.normalize();
@@ -155,7 +155,7 @@
std::size_t c = val.size();
ar & s;
ar & c;
- ar.save_binary(val.limbs(), c);
+ ar.save_binary(val.limbs(), c * sizeof(limb_type));
}
template <class Archive, class Int>
void do_serialize(Archive& ar, Int& val, mpl::false_ const&, mpl::true_ const&, mpl::true_ const&)
Modified: trunk/boost/multiprecision/rational_adaptor.hpp
==============================================================================
--- trunk/boost/multiprecision/rational_adaptor.hpp Tue Aug 6 23:03:23 2013 (r85230)
+++ trunk/boost/multiprecision/rational_adaptor.hpp 2013-08-07 04:15:51 EDT (Wed, 07 Aug 2013) (r85231)
@@ -171,6 +171,30 @@
}
rational_type& data() { return m_value; }
const rational_type& data()const { return m_value; }
+
+ template <class Archive>
+ void serialize(Archive& ar, const mpl::true_&)
+ {
+ // Saving
+ integer_type n(m_value.numerator()), d(m_value.denominator());
+ ar & n;
+ ar & d;
+ }
+ template <class Archive>
+ void serialize(Archive& ar, const mpl::false_&)
+ {
+ // Loading
+ integer_type n, d;
+ ar & n;
+ ar & d;
+ m_value.assign(n, d);
+ }
+ template <class Archive>
+ void serialize(Archive& ar, const unsigned int /*version*/)
+ {
+ typedef typename Archive::is_saving tag;
+ serialize(ar, tag());
+ }
private:
rational_type m_value;
};
Modified: trunk/libs/multiprecision/test/Jamfile.v2
==============================================================================
--- trunk/libs/multiprecision/test/Jamfile.v2 Tue Aug 6 23:03:23 2013 (r85230)
+++ trunk/libs/multiprecision/test/Jamfile.v2 2013-08-07 04:15:51 EDT (Wed, 07 Aug 2013) (r85231)
@@ -576,6 +576,7 @@
run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release <define>TEST3 : test_cpp_int_serial_3 ;
run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release <define>TEST4 : test_cpp_int_serial_4 ;
run test_cpp_int_deserial.cpp ../../serialization/build//boost_serialization : : : release ;
+run test_cpp_rat_serial.cpp ../../serialization/build//boost_serialization : : : release ;
run test_cpp_dec_float_serial.cpp ../../serialization/build//boost_serialization : : : release <define>TEST1 : test_cpp_dec_float_serial_1 ;
run test_cpp_dec_float_serial.cpp ../../serialization/build//boost_serialization : : : release <define>TEST2 : test_cpp_dec_float_serial_2 ;
Added: trunk/libs/multiprecision/test/test_cpp_rat_serial.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libs/multiprecision/test/test_cpp_rat_serial.cpp 2013-08-07 04:15:51 EDT (Wed, 07 Aug 2013) (r85231)
@@ -0,0 +1,136 @@
+///////////////////////////////////////////////////////////////
+// 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_
+
+//
+// Compare arithmetic results using fixed_int to GMP results.
+//
+
+#ifdef _MSC_VER
+# define _SCL_SECURE_NO_WARNINGS
+#endif
+
+#include <boost/multiprecision/cpp_int.hpp>
+#include <boost/random/mersenne_twister.hpp>
+#include <boost/random/uniform_int.hpp>
+#include <boost/timer.hpp>
+#include "test.hpp"
+
+#include <iostream>
+#include <iomanip>
+#include <sstream>
+#include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/archive/binary_iarchive.hpp>
+#include <boost/archive/binary_oarchive.hpp>
+
+template <class T>
+T generate_random(unsigned bits_wanted)
+{
+ static boost::random::mt19937 gen;
+ typedef boost::random::mt19937::result_type random_type;
+
+ T max_val;
+ unsigned digits;
+ if(std::numeric_limits<T>::is_bounded && (bits_wanted == (unsigned)std::numeric_limits<T>::digits))
+ {
+ max_val = (std::numeric_limits<T>::max)();
+ digits = std::numeric_limits<T>::digits;
+ }
+ else
+ {
+ max_val = T(1) << bits_wanted;
+ digits = bits_wanted;
+ }
+
+ unsigned bits_per_r_val = std::numeric_limits<random_type>::digits - 1;
+ while((random_type(1) << bits_per_r_val) > (gen.max)()) --bits_per_r_val;
+
+ unsigned terms_needed = digits / bits_per_r_val + 1;
+
+ T val = 0;
+ for(unsigned i = 0; i < terms_needed; ++i)
+ {
+ val *= (gen.max)();
+ val += gen();
+ }
+ val %= max_val;
+ if(!val)
+ val = 1;
+ return val;
+}
+
+template <class T>
+void test_neg(const T& x, const boost::mpl::true_&)
+{
+ T val = -x;
+ std::stringstream ss;
+ boost::archive::text_oarchive oa(ss);
+ oa << static_cast<const T&>(val);
+ boost::archive::text_iarchive ia(ss);
+ T val2;
+ ia >> val2;
+ BOOST_CHECK_EQUAL(val, val2);
+
+ ss.clear();
+ boost::archive::binary_oarchive ob(ss);
+ ob << static_cast<const T&>(val);
+ boost::archive::binary_iarchive ib(ss);
+ ib >> val2;
+ BOOST_CHECK_EQUAL(val, val2);
+}
+template <class T>
+void test_neg(const T& , const boost::mpl::false_&){}
+
+template <class T>
+void test()
+{
+ using namespace boost::multiprecision;
+
+ boost::random::mt19937 gen;
+ boost::uniform_int<> d(3, std::numeric_limits<T>::is_bounded ? std::numeric_limits<T>::digits : 3000);
+ boost::timer tim;
+
+ while(true)
+ {
+ T val(generate_random<typename component_type<T>::type>(d(gen)), generate_random<typename component_type<T>::type>(d(gen)));
+ std::stringstream ss;
+ boost::archive::text_oarchive oa(ss);
+ oa << static_cast<const T&>(val);
+ boost::archive::text_iarchive ia(ss);
+ T val2;
+ ia >> val2;
+ BOOST_CHECK_EQUAL(val, val2);
+
+ ss.clear();
+ boost::archive::binary_oarchive ob(ss);
+ ob << static_cast<const T&>(val);
+ boost::archive::binary_iarchive ib(ss);
+ ib >> val2;
+ BOOST_CHECK_EQUAL(val, val2);
+
+ test_neg(val, boost::mpl::bool_<std::numeric_limits<T>::is_signed>());
+
+ //
+ // Check to see if test is taking too long.
+ // Tests run on the compiler farm time out after 300 seconds,
+ // so don't get too close to that:
+ //
+ if(tim.elapsed() > 150)
+ {
+ std::cout << "Timeout reached, aborting tests now....\n";
+ break;
+ }
+ }
+}
+
+int main()
+{
+ using namespace boost::multiprecision;
+ test<cpp_rational>();
+ return boost::report_errors();
+}
+
+
+
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk