New Upstream Release - brial
Ready changes
Summary
Merged new upstream version: 1.2.12 (was: 1.2.11).
Diff
diff --git a/.travis.yml b/.travis.yml
index 26cb1524..51d3128a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,25 @@
language: cpp
sudo: required
-dist: xenial
+dist: jammy
#compiler:
#- gcc
#- clang
addons_shortcuts:
- addons_gcc5: &gcc5
+ addons_gcc11: &gcc11
apt:
sources: ['ubuntu-toolchain-r-test']
- packages: [ 'g++-5', 'autoconf-archive', 'libgmp-dev' ]
- addons_gcc9: &gcc9
- apt:
- sources: ['ubuntu-toolchain-r-test']
- packages: [ 'g++-9', 'autoconf-archive', 'libgmp-dev' ]
+ packages: [ 'g++-11', 'autoconf-archive', 'libgmp-dev' ]
install:
- export CXX="$COMPILER"
- $CXX --version
- autoconf --version
- - wget https://github.com/malb/m4ri/archive/release-20140914.tar.gz
- - tar -xzf release-20140914.tar.gz
- - pushd m4ri-release-20140914/ && autoreconf --install && ./configure --disable-openmp && make && sudo make install && popd
+ - wget https://github.com/malb/m4ri/archive/release-20200125.tar.gz
+ - tar -xzf release-20200125.tar.gz
+ - pushd m4ri-release-20200125/ && autoreconf --install && ./configure --disable-openmp && make && sudo make install && popd
- export BOOST_VERSION=${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_MAINTENANCE_VERSION}
- export BOOST_DIR=boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_MAINTENANCE_VERSION}
- wget -O ${BOOST_DIR}.tar.bz2 https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/${BOOST_DIR}.tar.bz2/download
@@ -41,62 +37,32 @@ script:
matrix:
include:
- os: linux
- compiler: "gcc-5"
- env:
- - COMPILER=g++-5
- - BOOST_MAJOR_VERSION=1
- - BOOST_MINOR_VERSION=65
- - BOOST_MAINTENANCE_VERSION=1
- addons: *gcc5
- - os: linux
- compiler: "gcc-9"
+ compiler: "gcc-11"
env:
- - COMPILER=g++-9
- - BOOST_MAJOR_VERSION=1
- - BOOST_MINOR_VERSION=65
- - BOOST_MAINTENANCE_VERSION=1
- addons: *gcc9
- - os: osx
- osx_image: xcode9.4
- env:
- - COMPILER=clang++
+ - COMPILER=g++-11
- BOOST_MAJOR_VERSION=1
- - BOOST_MINOR_VERSION=65
- - BOOST_MAINTENANCE_VERSION=1
+ - BOOST_MINOR_VERSION=80
+ - BOOST_MAINTENANCE_VERSION=0
+ addons: *gcc11
- os: osx
osx_image: xcode11.3
env:
- COMPILER=clang++
- BOOST_MAJOR_VERSION=1
- - BOOST_MINOR_VERSION=65
- - BOOST_MAINTENANCE_VERSION=1
- - os: linux
- compiler: "gcc-5"
- env:
- - COMPILER=g++-5
- - BOOST_MAJOR_VERSION=1
- - BOOST_MINOR_VERSION=72
+ - BOOST_MINOR_VERSION=80
- BOOST_MAINTENANCE_VERSION=0
- addons: *gcc5
- os: linux
- compiler: "gcc-9"
+ compiler: "gcc-11"
env:
- - COMPILER=g++-9
- - BOOST_MAJOR_VERSION=1
- - BOOST_MINOR_VERSION=72
- - BOOST_MAINTENANCE_VERSION=0
- addons: *gcc9
- - os: osx
- osx_image: xcode9.4
- env:
- - COMPILER=clang++
+ - COMPILER=g++-11
- BOOST_MAJOR_VERSION=1
- - BOOST_MINOR_VERSION=72
+ - BOOST_MINOR_VERSION=81
- BOOST_MAINTENANCE_VERSION=0
+ addons: *gcc11
- os: osx
osx_image: xcode11.3
env:
- COMPILER=clang++
- BOOST_MAJOR_VERSION=1
- - BOOST_MINOR_VERSION=72
+ - BOOST_MINOR_VERSION=81
- BOOST_MAINTENANCE_VERSION=0
diff --git a/configure.ac b/configure.ac
index ec974045..94344313 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([BRiAl],[1.2.11])
+AC_INIT([BRiAl],[1.2.12])
AC_CONFIG_MACRO_DIRS([m4])
AM_INIT_AUTOMAKE([foreign -Wall -Werror tar-ustar])
diff --git a/debian/changelog b/debian/changelog
index a385a430..c9621033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+brial (1.2.12-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 09 Feb 2023 06:48:51 -0000
+
brial (1.2.11-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/sage_brial_fixup.patch b/debian/patches/sage_brial_fixup.patch
index dbdfe49d..70b74a45 100644
--- a/debian/patches/sage_brial_fixup.patch
+++ b/debian/patches/sage_brial_fixup.patch
@@ -2,9 +2,11 @@ Description: fix for an import error (turns it into warnings)
Author: Julien Puydt
Forwarded: https://github.com/BRiAl/libBRiAl/issues/4
---- brial.orig/sage-brial/brial/PyPolyBoRi.py
-+++ brial/sage-brial/brial/PyPolyBoRi.py
-@@ -69,7 +69,7 @@
+Index: brial.git/sage-brial/brial/PyPolyBoRi.py
+===================================================================
+--- brial.git.orig/sage-brial/brial/PyPolyBoRi.py
++++ brial.git/sage-brial/brial/PyPolyBoRi.py
+@@ -69,7 +69,7 @@ from sage.rings.polynomial.pbori import
import weakref
diff --git a/debian/patches/typo.patch b/debian/patches/typo.patch
index f4077065..05389c9c 100644
--- a/debian/patches/typo.patch
+++ b/debian/patches/typo.patch
@@ -2,9 +2,11 @@ Description: fix a trivial typo in a source file
Author: Julien Puydt
Forwarded: https://github.com/BRiAl/libBRiAl/issues/3
---- brial.orig/libbrial/src/CErrorInfo.cc
-+++ brial/libbrial/src/CErrorInfo.cc
-@@ -48,7 +48,7 @@
+Index: brial.git/libbrial/src/CErrorInfo.cc
+===================================================================
+--- brial.git.orig/libbrial/src/CErrorInfo.cc
++++ brial.git/libbrial/src/CErrorInfo.cc
+@@ -48,7 +48,7 @@ CErrorInfo::text(errornum_type num) {
PBORI_TRACE_FUNC( "CErrorInfo::text(errornum_type) const" );
if PBORI_UNLIKELY(num < 0 || num >= CTypes::last_error)
diff --git a/tests/BoolePolynomialTest.cc b/tests/BoolePolynomialTest.cc
index a66fc03b..b6266462 100644
--- a/tests/BoolePolynomialTest.cc
+++ b/tests/BoolePolynomialTest.cc
@@ -337,46 +337,6 @@ BOOST_AUTO_TEST_CASE(test_ordering_independent) {
BOOST_CHECK_EQUAL(poly_type(x*y + x + z + 1).lexLead(), x*y);
BOOST_CHECK_EQUAL(poly_type(ring).lexLeadDeg(), -1);
- BOOST_TEST_MESSAGE( "stableHash");
-
-#ifdef PBORI_TEST_64BITTED
-#if BOOST_VERSION < 106200 || defined(__APPLE__)
- BOOST_CHECK_EQUAL(poly_type(1, ring).stableHash(), 4801919416);
- BOOST_CHECK_EQUAL(poly_type(x).stableHash(), 173100285919);
- BOOST_CHECK_EQUAL(poly_type(x*y).stableHash(), 11091674931773);
- BOOST_CHECK_EQUAL(poly_type(x*y + z).stableHash(), 46073228251744210);
- BOOST_CHECK_EQUAL(poly_type(x*y + z + 1).stableHash(), 3005992135566960638);
- BOOST_CHECK_EQUAL(poly_type(x*y + x + z).stableHash(), 3006002441743652495);
- BOOST_CHECK_EQUAL(poly_type(x*y + x + z + 1).stableHash(), 5907816585472828820);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1, ring).stableHash(), 16982317933699389295u);
- BOOST_CHECK_EQUAL(poly_type(x).stableHash(), 14511566905035657723u);
- BOOST_CHECK_EQUAL(poly_type(x*y).stableHash(), 1160268684422367443);
- BOOST_CHECK_EQUAL(poly_type(x*y + z).stableHash(), 15553547522801749128u);
- BOOST_CHECK_EQUAL(poly_type(x*y + z + 1).stableHash(), 14746308500923705671u);
- BOOST_CHECK_EQUAL(poly_type(x*y + x + z).stableHash(), 6609543853578108291);
- BOOST_CHECK_EQUAL(poly_type(x*y + x + z + 1).stableHash(), 13745298887294022704u);
-#endif // BOOST_VERSION
-#else
-#if BOOST_VERSION < 106200
- BOOST_CHECK_EQUAL(poly_type(1, ring).stableHash(), 2654501304);
- BOOST_CHECK_EQUAL(poly_type(x).stableHash(), 3449012191);
- BOOST_CHECK_EQUAL(poly_type(x*y).stableHash(), 4216922685);
- BOOST_CHECK_EQUAL(poly_type(x*y + z).stableHash(), 4229314514);
- BOOST_CHECK_EQUAL(poly_type(x*y + z + 1).stableHash(), 517852158);
- BOOST_CHECK_EQUAL(poly_type(x*y + x + z).stableHash(), 689818255);
- BOOST_CHECK_EQUAL(poly_type(x*y + x + z + 1).stableHash(), 3337575060);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1, ring).stableHash(), 879054753);
- BOOST_CHECK_EQUAL(poly_type(x).stableHash(), 3481556931);
- BOOST_CHECK_EQUAL(poly_type(x*y).stableHash(), 569922758);
- BOOST_CHECK_EQUAL(poly_type(x*y + z).stableHash(), 240822309);
- BOOST_CHECK_EQUAL(poly_type(x*y + z + 1).stableHash(), 2507878590);
- BOOST_CHECK_EQUAL(poly_type(x*y + x + z).stableHash(), 433737400);
- BOOST_CHECK_EQUAL(poly_type(x*y + x + z + 1).stableHash(), 628776654);
-#endif // BOOST_VERSION
-#endif
-
BOOST_TEST_MESSAGE( "deg, TotalDeg, length, nNodes, nUsedVariables, usedVariables");
BOOST_CHECK_EQUAL(poly_type(ring).deg(), -1);
BOOST_CHECK_EQUAL(poly_type(0, ring).deg(), -1);
@@ -592,43 +552,7 @@ BOOST_FIXTURE_TEST_CASE(test_ordering_lp, OrderGenFix<BoolePolyRing::lp>) {
"{a,d}, {a,f}, {a}, {b,d,f}, {b,d}, {b,f}, {b}, "
"{d,f}, {d}, {f}, {}}"));
-#ifdef PBORI_TEST_64BITTED
-#if (BOOST_VERSION < 106200) || defined(__APPLE__)
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 4801919416);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 173100285919);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 11091674931773);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 11091674972829);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 173100285919);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 173100285919);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 16982317933699389295u);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 14511566905035657723u);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 1160268684422367443);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 994909422134781907);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 14511566905035657723u);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 14511566905035657723u);
-#endif // BOOST_VERSION
-#else
-#if BOOST_VERSION < 106200
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 2654501304);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3449012191);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 4216922685);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 4216963741);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3449012191);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 3449012191);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 879054753);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3481556931);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 569922758);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 1713393842);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3481556931);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 3481556931);
-#endif // BOOST_VERSION
-#endif
+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), poly2.leadStableHash());
// naturally lexicographicsl
BOOST_CHECK_EQUAL_COLLECTIONS(poly1.begin(), poly1.end(),
@@ -712,43 +636,7 @@ BOOST_FIXTURE_TEST_CASE(test_ordering_dlex, OrderGenFix<BoolePolyRing::dlex>) {
"{a,d}, {a,f}, {a}, {b,d,f}, {b,d}, {b,f}, {b}, "
"{d,f}, {d}, {f}, {}}"));
-#ifdef PBORI_TEST_64BITTED
-#if (BOOST_VERSION < 106200) || defined(__APPLE__)
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 4801919416);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 173100285919);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 11091674931773);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 11091674972829);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 706244161997016);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(),11091674972829);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 16982317933699389295u);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 14511566905035657723u);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 1160268684422367443);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 994909422134781907);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 13332077148710286618u);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 994909422134781907);
-#endif // BOOST_VERSION
-#else
-#if BOOST_VERSION < 106200
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 2654501304);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3449012191);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 4216922685);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 4216963741);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 1214744792);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 4216963741);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 879054753);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3481556931);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 569922758);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 1713393842);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 2080251592);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 1713393842);
-#endif // BOOST_VERSION
-#endif
+ BOOST_CHECK_NE(poly1.leadStableHash(), poly2.leadStableHash());
BooleMonomial terms1[] = {c*d*e, c*e*f, g*h, a, b};
BooleMonomial terms2[] = {c*d, e*f, g*h, a, b};
@@ -825,43 +713,7 @@ BOOST_FIXTURE_TEST_CASE(test_ordering_dp_asc, OrderGenFix<BoolePolyRing::dp_asc>
"{a,d}, {a,f}, {a}, {b,d,f}, {b,d}, {b,f}, {b}, "
"{d,f}, {d}, {f}, {}}"));
-#ifdef PBORI_TEST_64BITTED
-#if (BOOST_VERSION < 106200) || defined(__APPLE__)
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 4801919416);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 173100285919);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 11091674931773);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 11091674972829);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 706244162000938);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 11091674956572);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 16982317933699389295u);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 14511566905035657723u);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 1160268684422367443);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 994909422134781907);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 16171595639562729641u);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 298249910754104916);
-#endif // BOOST_VERSION
-#else
-#if BOOST_VERSION < 106200
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 2654501304);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3449012191);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 4216922685);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 4216963741);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 1214748714);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 4216947484);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 879054753);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3481556931);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 569922758);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 1713393842);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3527394431);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 9141547);
-#endif // BOOST_VERSION
-#endif
+ BOOST_CHECK_NE(poly1.leadStableHash(), poly2.leadStableHash());
BooleMonomial terms1[] = {c*e*f, c*d*e, g*h, b, a};
BooleMonomial terms2[] = {g*h, e*f, c*d, b, a};
@@ -940,43 +792,7 @@ BOOST_FIXTURE_TEST_CASE(test_ordering_block_dlex, OrderGenFix<BoolePolyRing::blo
"{a,d}, {a,f}, {a}, {b,d,f}, {b,d}, {b,f}, {b}, "
"{d,f}, {d}, {f}, {}}"));
-#ifdef PBORI_TEST_64BITTED
-#if (BOOST_VERSION < 106200) || defined(__APPLE__)
- BOOST_CHECK_EQUAL(poly_type(1,ring).leadStableHash(), 4801919416);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 173100285919);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 11091674931773);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 11091674972829);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 173100285919);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 173100285919);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1,ring).leadStableHash(), 16982317933699389295u);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 14511566905035657723u);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 1160268684422367443);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 994909422134781907);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 14511566905035657723u);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 14511566905035657723u);
-#endif // BOOST_VERSION
-#else
-#if BOOST_VERSION < 106200
- BOOST_CHECK_EQUAL(poly_type(1,ring).leadStableHash(), 2654501304);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3449012191);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 4216922685);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 4216963741);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3449012191);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 3449012191);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1,ring).leadStableHash(), 879054753);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3481556931);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 569922758);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 1713393842);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3481556931);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 3481556931);
-#endif // BOOST_VERSION
-#endif
+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), poly2.leadStableHash());
BooleMonomial terms1[] = {a, b, c*d*e, c*e*f, g*h};
@@ -1055,43 +871,7 @@ BOOST_FIXTURE_TEST_CASE(test_ordering_block_dp_asc, OrderGenFix<BoolePolyRing::b
"{a,d}, {a,f}, {a}, {b,d,f}, {b,d}, {b,f}, {b}, "
"{d,f}, {d}, {f}, {}}"));
-#ifdef PBORI_TEST_64BITTED
-#if (BOOST_VERSION < 106200) || defined(__APPLE__)
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 4801919416);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 173100285919);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 11091674931773);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 11091674972829);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 706244162000938);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 11091674972829);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 16982317933699389295u);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 14511566905035657723u);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 1160268684422367443);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 994909422134781907);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 16171595639562729641u);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 994909422134781907);
-#endif // BOOST_VERSION
-#else
-#if BOOST_VERSION < 106200
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 2654501304);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3449012191);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 4216922685);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 4216963741);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 1214748714);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 4216963741);
-#else // BOOST_VERSION
- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 879054753);
- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3481556931);
- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 569922758);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
- 1713393842);
- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3527394431);
- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 1713393842);
-#endif // BOOST_VERSION
-#endif
+ BOOST_CHECK_NE(poly1.leadStableHash(), poly2.leadStableHash());
BooleMonomial terms1[] = {c*e*f, c*d*e, b, a, g*h};
BooleMonomial terms2[] = {c*d, b, a, g*h, e*f};