[SCM] polybori: Polynomials over Boolean Rings branch, upstream-hg, updated. b4a5cffaa908c53e1d958a42110f8c4dad853aa3
Alexander Dreyer
adreyer at gmx.de
Fri Mar 23 08:01:56 UTC 2012
The following commit has been merged in the upstream-hg branch:
commit 6bedd109d1f4d97e04540bf7092b5fadbea30fdd
Author: Alexander Dreyer <adreyer at gmx.de>
Date: Thu Mar 1 14:12:44 2012 +0100
CHA: Use test more platform independent
diff --git a/testsuite/src/DelayedLongProductTest.cc b/testsuite/src/DelayedLongProductTest.cc
index 9303c08..0de6fcf 100644
--- a/testsuite/src/DelayedLongProductTest.cc
+++ b/testsuite/src/DelayedLongProductTest.cc
@@ -27,7 +27,8 @@ USING_NAMESPACE_PBORIGB
struct Fdelayedlongprod {
typedef unsigned long long_type;
unsigned nhalf;
- Fdelayedlongprod(): nhalf(sizeof(long_type)*4) {
+ unsigned nbits;
+ Fdelayedlongprod(): nhalf(sizeof(long_type)*4), nbits(sizeof(long_type)*8) {
BOOST_TEST_MESSAGE( "setup fixture" );
}
@@ -79,12 +80,13 @@ BOOST_AUTO_TEST_CASE(test_less) {
BOOST_CHECK_EQUAL((DelayedLongProduct(long_type(5)<<nhalf, 7) >
long_type(36)<<nhalf), false);
- BOOST_CHECK_EQUAL((DelayedLongProduct(long_type(5)<<16, long_type(7)<<16) >
- long_type(34)<<32), true);
- BOOST_CHECK_EQUAL((DelayedLongProduct(long_type(5)<<16, long_type(7)<<16) >
- long_type(35)<<32), false);
- BOOST_CHECK_EQUAL((DelayedLongProduct(long_type(5)<<16, long_type(7)<<16) >
- long_type(36)<<32), false);
+ BOOST_CHECK_EQUAL((DelayedLongProduct(long_type(5)<<(nhalf - 4), long_type(7)<<(nhalf-4)) >
+ long_type(34)<<(nbits - 8)), true);
+ BOOST_CHECK_EQUAL((DelayedLongProduct(long_type(5)<<(nhalf - 4), long_type(7)<<(nhalf-4)) >
+ long_type(35)<<(nbits - 8)), false);
+ BOOST_CHECK_EQUAL((DelayedLongProduct(long_type(5)<<(nhalf - 4), long_type(7)<<(nhalf-4)) >
+ long_type(36)<<(nbits - 8)), false);
+
BOOST_CHECK_EQUAL((DelayedLongProduct(long_type(3)<<16, long_type(1)<<16) >
Long64From32BitsPair<4, 0>::get()), false);
--
polybori: Polynomials over Boolean Rings
More information about the debian-science-commits
mailing list