Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package brial for openSUSE:Factory checked
in at 2023-01-15 17:58:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/brial (Old)
and /work/SRC/openSUSE:Factory/.brial.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "brial"
Sun Jan 15 17:58:08 2023 rev:5 rq:1058443 version:1.2.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/brial/brial.changes 2022-07-29
16:48:27.478745992 +0200
+++ /work/SRC/openSUSE:Factory/.brial.new.32243/brial.changes 2023-01-15
17:58:13.462223653 +0100
@@ -1,0 +2,6 @@
+Sun Jan 15 10:28:41 UTC 2023 - Jan Engelhardt <jeng...@inai.de>
+
+- Update to release 1.2.12
+ * Address testing problems with boost 1.81.0
+
+-------------------------------------------------------------------
Old:
----
brial-1.2.11.tar.bz2
New:
----
brial-1.2.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ brial.spec ++++++
--- /var/tmp/diff_new_pack.bZQzri/_old 2023-01-15 17:58:15.686236853 +0100
+++ /var/tmp/diff_new_pack.bZQzri/_new 2023-01-15 17:58:15.690236877 +0100
@@ -1,7 +1,7 @@
#
# spec file for package brial
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define lname libbrial3
Name: brial
-Version: 1.2.11
+Version: 1.2.12
Release: 0
Summary: The Polynomials over Boolean Rings Computer Algebra System
License: GPL-2.0-or-later
++++++ brial-1.2.11.tar.bz2 -> brial-1.2.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/brial-1.2.11/configure new/brial-1.2.12/configure
--- old/brial-1.2.11/configure 2022-07-29 11:09:48.000000000 +0200
+++ new/brial-1.2.12/configure 2023-01-14 23:25:37.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for BRiAl 1.2.11.
+# Generated by GNU Autoconf 2.71 for BRiAl 1.2.12.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -618,8 +618,8 @@
# Identity of this package.
PACKAGE_NAME='BRiAl'
PACKAGE_TARNAME='brial'
-PACKAGE_VERSION='1.2.11'
-PACKAGE_STRING='BRiAl 1.2.11'
+PACKAGE_VERSION='1.2.12'
+PACKAGE_STRING='BRiAl 1.2.12'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1388,7 +1388,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures BRiAl 1.2.11 to adapt to many kinds of systems.
+\`configure' configures BRiAl 1.2.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1459,7 +1459,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of BRiAl 1.2.11:";;
+ short | recursive ) echo "Configuration of BRiAl 1.2.12:";;
esac
cat <<\_ACEOF
@@ -1597,7 +1597,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-BRiAl configure 1.2.11
+BRiAl configure 1.2.12
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1749,7 +1749,7 @@
#define $2 innocuous_$2
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below. */
+ which can conflict with char $2 (void); below. */
#include <limits.h>
#undef $2
@@ -1760,7 +1760,7 @@
#ifdef __cplusplus
extern "C"
#endif
-char $2 ();
+char $2 (void);
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
@@ -2228,7 +2228,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by BRiAl $as_me 1.2.11, which was
+It was created by BRiAl $as_me 1.2.12, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2514,9 +2514,7 @@
/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */
struct buf { int x; };
struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
+static char *e (char **p, int i)
{
return p[i];
}
@@ -2567,6 +2565,7 @@
extern int printf (const char *, ...);
extern int dprintf (int, const char *, ...);
extern void *malloc (size_t);
+extern void free (void *);
// Check varargs macros. These examples are taken from C99 6.10.3.5.
// dprintf is used instead of fprintf to avoid needing to declare
@@ -3715,7 +3714,7 @@
# Define the identity of the package.
PACKAGE='brial'
- VERSION='1.2.11'
+ VERSION='1.2.12'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -12933,8 +12932,14 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
int
main (void)
{
@@ -12995,8 +13000,14 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char shl_load ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load (void);
int
main (void)
{
@@ -13039,8 +13050,14 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
int
main (void)
{
@@ -13078,8 +13095,14 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
int
main (void)
{
@@ -13117,8 +13140,14 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dld_link ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link (void);
int
main (void)
{
@@ -21334,7 +21363,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by BRiAl $as_me 1.2.11, which was
+This file was extended by BRiAl $as_me 1.2.12, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21402,7 +21431,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-BRiAl config.status 1.2.11
+BRiAl config.status 1.2.12
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/brial-1.2.11/configure.ac
new/brial-1.2.12/configure.ac
--- old/brial-1.2.11/configure.ac 2022-07-29 11:09:22.000000000 +0200
+++ new/brial-1.2.12/configure.ac 2023-01-14 23:15:31.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/brial-1.2.11/libbrial/include/polybori/config.h
new/brial-1.2.12/libbrial/include/polybori/config.h
--- old/brial-1.2.11/libbrial/include/polybori/config.h 2022-07-29
11:25:42.000000000 +0200
+++ new/brial-1.2.12/libbrial/include/polybori/config.h 2023-01-14
23:25:42.000000000 +0100
@@ -24,10 +24,10 @@
#define PACKAGE_NAME "BRiAl"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "BRiAl 1.2.11"
+#define PACKAGE_STRING "BRiAl 1.2.12"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "brial"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.11"
+#define PACKAGE_VERSION "1.2.12"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/brial-1.2.11/tests/BoolePolynomialTest.cc
new/brial-1.2.12/tests/BoolePolynomialTest.cc
--- old/brial-1.2.11/tests/BoolePolynomialTest.cc 2021-06-15
23:45:55.000000000 +0200
+++ new/brial-1.2.12/tests/BoolePolynomialTest.cc 2023-01-14
23:14:33.000000000 +0100
@@ -337,46 +337,6 @@
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 @@
"{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 @@
"{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 @@
"{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 @@
"{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 @@
"{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};
