April 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Merge branch 'master' into ppl-0_10-branch.
by Roberto Bagnara 20 Apr '09

20 Apr '09

Module: ppl/ppl Branch: master Commit: 34817d8d83a0046ed7f4966da3ab3a391b930342 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=34817d8d83a0… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Apr 6 22:02:39 2009 +0200 Merge branch 'master' into ppl-0_10-branch. Conflicts (resolved): ChangeLog TODO Watchdog/ChangeLog configure.ac ---

1 0

[GIT] ppl/ppl(master): Update version.
by Roberto Bagnara 20 Apr '09

20 Apr '09

Module: ppl/ppl Branch: master Commit: 2a99071b3d238884e1120d34c994684671a6221f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2a99071b3d23… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Nov 4 09:35:14 2008 +0000 Update version. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index f629b85..9bd92b2 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Process this file with autoconf to produce a configure script. # Every other copy of the package version number gets its value from here. -AC_INIT([the Parma Polyhedra Library],[0.10pre38],[ppl-devel(a)cs.unipr.it],[ppl]) +AC_INIT([the Parma Polyhedra Library], [0.10], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.60)

1 0

[GIT] ppl/ppl(master): Mark ChangeLog.
by Roberto Bagnara 20 Apr '09

20 Apr '09

Module: ppl/ppl Branch: master Commit: d3df008290d14cf5a66ba2603a4fdf0700b9c397 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d3df008290d1… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Nov 4 09:34:23 2008 +0000 Mark ChangeLog. --- ChangeLog | 4 ++++ Watchdog/ChangeLog | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23e1448..b4d4bac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-11-04 Release Manager + + * PPL 0.10 Released. + 2008-11-03 Monday 21:17 Patricia M. Hill <hill(a)comp.leeds.ac.uk> * CREDITS (1.41): Similar changes to those in credits.raw. diff --git a/Watchdog/ChangeLog b/Watchdog/ChangeLog index 80e7d2d..2851afa 100644 --- a/Watchdog/ChangeLog +++ b/Watchdog/ChangeLog @@ -1,3 +1,7 @@ +2008-11-04 Release Manager + + * PPL 0.10 Released. + 2008-11-03 Monday 09:51 Roberto Bagnara <bagnara(a)cs.unipr.it> * INSTALL (1.10): Previous commit reverted.

1 0

[GIT] ppl/ppl(master): Use ASCII only.
by Roberto Bagnara 20 Apr '09

20 Apr '09

Module: ppl/ppl Branch: master Commit: d3349ad56bccefa589c9a858bd76836b09757aca URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d3349ad56bcc… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Nov 4 09:27:25 2008 +0000 Use ASCII only. --- TODO | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index 448e9e2..7c6d9cc 100644 --- a/TODO +++ b/TODO @@ -92,10 +92,10 @@ Enhancements for PPL 0.11 or later versions Polyhedron::fold_dimensions(). - Suppose we are only interested in integral solutions (as is the case, e.g., in most termination analyses). Then cutting-plane methods - (Gomory, Chvátal, ...) allow to shrink polyhedra still not losing any + (Gomory, Chvatal, ...) allow to shrink polyhedra still not losing any integral solution. See http://www.cs.unipr.it/ppl/Documentation/bibliography#NemhauserW88 - Check the work by Kent Andersen and Gérard Cornuéjols on + Check the work by Kent Andersen and Gerard Cornuejols on reduce-and-split cuts. - Add an implementation of Minkowski addition. Check the algorithm described in

1 0

[GIT] ppl/ppl(master): This commit was generated by cvs to git conversion to create branch
by Roberto Bagnara 20 Apr '09

20 Apr '09

Module: ppl/ppl Branch: master Commit: 8475cfb5ba2e1fdba36e452a68cad2502a8bf4a1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8475cfb5ba2e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Nov 4 08:30:58 2008 +0000 This commit was generated by cvs to git conversion to create branch 'ppl-0_10-branch'. ---

1 0

[GIT] ppl/ppl(master): Bit_Row iterators reimplemented more efficiently.
by Roberto Bagnara 20 Apr '09

20 Apr '09

Module: ppl/ppl Branch: master Commit: 0dbad6c0854d82ebeed8d0ab04bd915f3699a005 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0dbad6c0854d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Apr 20 22:06:33 2009 +0200 Bit_Row iterators reimplemented more efficiently. --- src/Bit_Row.cc | 77 +-------------------- src/Bit_Row.defs.hh | 6 -- src/Bit_Row.inlines.hh | 172 ++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 165 insertions(+), 90 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index 4cece3a..1983f21 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -28,75 +28,6 @@ site: http://www.cs.unipr.it/ppl/ . */ namespace PPL = Parma_Polyhedra_Library; -#if !PPL_HAVE_DECL_FFS || PPL_SIZEOF_MP_LIMB_T != PPL_SIZEOF_INT -unsigned int -PPL::Bit_Row::first_one(mp_limb_t w) { - unsigned int r = 0; - w = w & -w; -#if PPL_SIZEOF_MP_LIMB_T == 8 - if ((w & 0xffffffff) == 0) { - w >>= 32; - r += 32; - } -#elif PPL_SIZEOF_MP_LIMB_T != 4 -#error "Size of mp_limb_t not supported by Bit_Row::first_one(mp_limb_t w)." -#endif - if ((w & 0xffff) == 0) { - w >>= 16; - r += 16; - } - if ((w & 0xff) == 0) { - w >>= 8; - r += 8; - } - if (w & 0xf0) - r += 4; - if (w & 0xcc) - r += 2; - if (w & 0xaa) - r += 1; - return r; -} -#endif // !PPL_HAVE_DECL_FFS || PPL_SIZEOF_MP_LIMB_T != PPL_SIZEOF_INT - -unsigned int -PPL::Bit_Row::last_one(mp_limb_t w) { - unsigned int r = 0; -#if PPL_SIZEOF_MP_LIMB_T == 8 - if (w & -#if PPL_SIZEOF_LONG == 8 - 0xffffffff00000000 -#else - 0xffffffff00000000LL -#endif - ) { - w >>= 32; - r += 32; - } -#elif PPL_SIZEOF_MP_LIMB_T != 4 -#error "Size of mp_limb_t not supported by Bit_Row::last_one(mp_limb_t w)." -#endif - if (w & 0xffff0000) { - w >>= 16; - r += 16; - } - if (w & 0xff00) { - w >>= 8; - r += 8; - } - if (w & 0xf0) { - w >>= 4; - r += 4; - } - if (w & 0xc) { - w >>= 2; - r += 2; - } - if (w & 0x2) - r += 1; - return r; -} - unsigned long PPL::Bit_Row::first() const { const mp_size_t vec_size = vec->_mp_size; @@ -106,7 +37,7 @@ PPL::Bit_Row::first() const { for (; li < vec_size; ++li, ++p) { const mp_limb_t limb = *p; if (limb != 0) - return li*PPL_BITS_PER_GMP_LIMB + first_one(limb); + return li*PPL_BITS_PER_GMP_LIMB + Implementation::first_one(limb); } return ULONG_MAX; } @@ -136,7 +67,7 @@ PPL::Bit_Row::next(unsigned long position) const { while (true) { if (limb != 0) - return li*PPL_BITS_PER_GMP_LIMB + first_one(limb); + return li*PPL_BITS_PER_GMP_LIMB + Implementation::first_one(limb); ++li; if (li == vec_size) break; @@ -156,7 +87,7 @@ PPL::Bit_Row::last() const { const mp_srcptr p = vec->_mp_d + li; const mp_limb_t limb = *p; assert(limb != 0); - return li*PPL_BITS_PER_GMP_LIMB + last_one(limb); + return li*PPL_BITS_PER_GMP_LIMB + Implementation::last_one(limb); } unsigned long @@ -189,7 +120,7 @@ PPL::Bit_Row::prev(unsigned long position) const { while (true) { if (limb != 0) - return li*PPL_BITS_PER_GMP_LIMB + last_one(limb); + return li*PPL_BITS_PER_GMP_LIMB + Implementation::last_one(limb); if (li == 0) break; --li; diff --git a/src/Bit_Row.defs.hh b/src/Bit_Row.defs.hh index ce278c9..ee1c98e 100644 --- a/src/Bit_Row.defs.hh +++ b/src/Bit_Row.defs.hh @@ -203,12 +203,6 @@ private: Upon entry, \p vec must have allocated enough space to contain the result. */ void union_helper(const Bit_Row& x, const Bit_Row& y); - - //! Assuming \p w is nonzero, returns the index of the first set bit in \p w. - static unsigned int first_one(mp_limb_t w); - - //! Assuming \p w is nonzero, returns the index of the last set bit in \p w. - static unsigned int last_one(mp_limb_t w); }; namespace std { diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index 5084a64..2ad8a19 100644 --- a/src/Bit_Row.inlines.hh +++ b/src/Bit_Row.inlines.hh @@ -91,8 +91,9 @@ Bit_Row::clear_from(const unsigned long k) { inline unsigned long Bit_Row::count_ones() const { - assert(vec->_mp_size >= 0); - return vec->_mp_size == 0 ? 0 : mpn_popcount(vec->_mp_d, vec->_mp_size); + mp_size_t x_size = vec->_mp_size; + assert(x_size >= 0); + return x_size == 0 ? 0 : mpn_popcount(vec->_mp_d, x_size); } inline bool @@ -120,15 +121,6 @@ Bit_Row::total_memory_in_bytes() const { return sizeof(*this) + external_memory_in_bytes(); } -#if PPL_HAVE_DECL_FFS && PPL_SIZEOF_MP_LIMB_T == PPL_SIZEOF_INT - -inline unsigned int -Bit_Row::first_one(mp_limb_t w) { - return ffs(w)-1; -} - -#endif - /*! \relates Bit_Row */ inline void set_union(const Bit_Row& x, const Bit_Row& y, Bit_Row& z) { @@ -160,6 +152,164 @@ set_difference(const Bit_Row& x, const Bit_Row& y, Bit_Row& z) { mpz_and(z.vec, x.vec, complement_y.get_mpz_t()); } +namespace Implementation { + +#if defined(__GNUC__) + +/*! \brief + Assuming \p u is nonzero, returns the index of the first set bit in \p u. +*/ +inline unsigned int +first_one(unsigned int u) { + assert(u != 0); + return __builtin_ctz(u); +} + +/*! \brief + Assuming \p ul is nonzero, returns the index of the first set bit in + \p ul. +*/ +inline unsigned int +first_one(unsigned long ul) { + assert(ul != 0); + return __builtin_ctzl(ul); +} + +/*! \brief + Assuming \p ull is nonzero, returns the index of the first set bit in + \p ull. +*/ +inline unsigned int +first_one(unsigned long long ull) { + assert(ull != 0); + return __builtin_ctzll(ull); +} + +#elif PPL_HAVE_DECL_FFS && PPL_SIZEOF_MP_LIMB_T == PPL_SIZEOF_INT + +/*! \brief + Assuming \p w is nonzero, returns the index of the first set bit in \p w. +*/ +inline unsigned int +first_one(mp_limb_t w) { + return ffs(w)-1; +} + +#else + +/*! \brief + Assuming \p w is nonzero, returns the index of the first set bit in \p w. +*/ +inline unsigned int +first_one(mp_limb_t w) { + unsigned int r = 0; + w = w & -w; +#if PPL_SIZEOF_MP_LIMB_T == 8 + if ((w & 0xffffffff) == 0) { + w >>= 32; + r += 32; + } +#elif PPL_SIZEOF_MP_LIMB_T != 4 +#error "size of mp_limb_t not supported by first_one(mp_limb_t w)." +#endif + if ((w & 0xffff) == 0) { + w >>= 16; + r += 16; + } + if ((w & 0xff) == 0) { + w >>= 8; + r += 8; + } + if (w & 0xf0) + r += 4; + if (w & 0xcc) + r += 2; + if (w & 0xaa) + r += 1; + return r; +} +#endif // !defined(__GNUC__) + // && (!PPL_HAVE_DECL_FFS || PPL_SIZEOF_MP_LIMB_T != PPL_SIZEOF_INT) + +#if defined(__GNUC__) + +/*! \brief + Assuming \p u is nonzero, returns the index of the last set bit in \p u. +*/ +inline unsigned int +last_one(unsigned int u) { + assert(u != 0); + return sizeof(unsigned int)*CHAR_BIT - 1 - __builtin_clz(u); +} + +/*! \brief + Assuming \p ul is nonzero, returns the index of the last set bit in + \p ul. +*/ +inline unsigned int +last_one(unsigned long ul) { + assert(ul != 0); + return sizeof(unsigned long)*CHAR_BIT - 1 - __builtin_clzl(ul); +} + +/*! \brief + Assuming \p ull is nonzero, returns the index of the last set bit in + \p ull. +*/ +inline unsigned int +last_one(unsigned long long ull) { + assert(ull != 0); + return sizeof(unsigned long long)*CHAR_BIT - 1 - __builtin_clzll(ull); +} + +#else // !defined(__GNUC__) + +/*! \brief + Assuming \p w is nonzero, returns the index of the last set bit in \p w. +*/ +inline unsigned int +last_one(mp_limb_t w) { + assert(w != 0); + unsigned int r = 0; +#if PPL_SIZEOF_MP_LIMB_T == 8 + if (w & +#if PPL_SIZEOF_LONG == 8 + 0xffffffff00000000 +#else + 0xffffffff00000000LL +#endif + ) { + w >>= 32; + r += 32; + } +#elif PPL_SIZEOF_MP_LIMB_T != 4 +#error "size of mp_limb_t not supported by last_one(mp_limb_t w)." +#endif + if (w & 0xffff0000) { + w >>= 16; + r += 16; + } + if (w & 0xff00) { + w >>= 8; + r += 8; + } + if (w & 0xf0) { + w >>= 4; + r += 4; + } + if (w & 0xc) { + w >>= 2; + r += 2; + } + if (w & 0x2) + r += 1; + return r; +} + +#endif // !defined(__GNUC__) + +} // namespace Implementation + } // namespace Parma_Polyhedra_Library

1 0

[GIT] ppl/ppl(master): The exact integer upper bound methods for shapes are now under Git control . The methods are named integer_upper_bound_assign_if_exact; they can only be instantiated if the template parameter T is an integer datatype .
by Enea Zaffanella 20 Apr '09

20 Apr '09

Module: ppl/ppl Branch: master Commit: 13ef1bd74112c763825dc481b93b00837bd36f56 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=13ef1bd74112… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Apr 20 14:01:46 2009 +0200 The exact integer upper bound methods for shapes are now under Git control. The methods are named integer_upper_bound_assign_if_exact; they can only be instantiated if the template parameter T is an integer datatype. --- src/BD_Shape.defs.hh | 33 ++ src/BD_Shape.inlines.hh | 17 +- src/BD_Shape.templates.hh | 17 +- src/Octagonal_Shape.defs.hh | 37 ++- src/Octagonal_Shape.inlines.hh | 6 - src/Octagonal_Shape.templates.hh | 224 ++++++++++- tests/BD_Shape/Makefile.am | 3 + tests/BD_Shape/integerupperboundifexact1.cc | 387 ++++++++++++++++ tests/Octagonal_Shape/Makefile.am | 3 + tests/Octagonal_Shape/integerupperboundifexact1.cc | 461 ++++++++++++++++++++ tests/Octagonal_Shape/upperboundifexact1.cc | 246 ++++++----- 11 files changed, 1314 insertions(+), 120 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=13ef1bd7…

1 0

[GIT] ppl/ppl(master): Added assert to check for possible overflow.
by Abramo Bagnara 20 Apr '09

20 Apr '09

Module: ppl/ppl Branch: master Commit: 2956e3e5df7090d8f92bf5337f40249a3732981c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2956e3e5df70… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Apr 20 16:48:58 2009 +0200 Added assert to check for possible overflow. --- src/Bit_Row.inlines.hh | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index c681c8a..5084a64 100644 --- a/src/Bit_Row.inlines.hh +++ b/src/Bit_Row.inlines.hh @@ -52,11 +52,13 @@ Bit_Row::Bit_Row(const Bit_Row& y, const Bit_Row& z) { const mp_size_t y_size = y.vec->_mp_size; const mp_size_t z_size = z.vec->_mp_size; if (y_size < z_size) { - mpz_init2(vec, z_size*PPL_BITS_PER_GMP_LIMB); + assert(z_size <= ULONG_MAX / PPL_BITS_PER_GMP_LIB); + mpz_init2(vec, z_size * PPL_BITS_PER_GMP_LIMB); union_helper(y, z); } else { - mpz_init2(vec, y_size*PPL_BITS_PER_GMP_LIMB); + assert(y_size <= ULONG_MAX / PPL_BITS_PER_GMP_LIB); + mpz_init2(vec, y_size * PPL_BITS_PER_GMP_LIMB); union_helper(z, y); } } @@ -133,11 +135,13 @@ set_union(const Bit_Row& x, const Bit_Row& y, Bit_Row& z) { const mp_size_t x_size = x.vec->_mp_size; const mp_size_t y_size = y.vec->_mp_size; if (x_size < y_size) { - mpz_realloc2(z.vec, y_size*PPL_BITS_PER_GMP_LIMB); + assert(y_size <= ULONG_MAX / PPL_BITS_PER_GMP_LIB); + mpz_realloc2(z.vec, y_size * PPL_BITS_PER_GMP_LIMB); z.union_helper(x, y); } else { - mpz_realloc2(z.vec, x_size*PPL_BITS_PER_GMP_LIMB); + assert(x_size <= ULONG_MAX / PPL_BITS_PER_GMP_LIB); + mpz_realloc2(z.vec, x_size * PPL_BITS_PER_GMP_LIMB); z.union_helper(y, x); } }

1 0

[GIT] ppl/ppl(master): Merge branch 'master' of ssh://bagnara@git.cs.unipr. it/git/ppl/ppl.
by Roberto Bagnara 20 Apr '09

20 Apr '09

Module: ppl/ppl Branch: master Commit: 88284403410adf0226853028becf67551778060c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=88284403410a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Apr 20 16:24:53 2009 +0200 Merge branch 'master' of ssh://bagnara@git.cs.unipr.it/git/ppl/ppl. Resolved conflicts: src/Bit_Row.inlines.hh ---

1 0

[GIT] ppl/ppl(master): Improved set_union(const Bit_Row&, const Bit_Row&, Bit_Row&).
by Roberto Bagnara 20 Apr '09

20 Apr '09

Module: ppl/ppl Branch: master Commit: 12dc53fb2a829b9ae88c49c5a5dd796df4cc8ced URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=12dc53fb2a82… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Apr 20 16:15:22 2009 +0200 Improved set_union(const Bit_Row&, const Bit_Row&, Bit_Row&). Used the new Bit_Row set-union constructor wherever possible. --- src/Bit_Row.cc | 2 -- src/Bit_Row.inlines.hh | 17 ++++++++++++++--- src/Polyhedron_nonpublic.cc | 15 ++++----------- src/conversion.cc | 3 +-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index e1d2e0f..4cece3a 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -28,8 +28,6 @@ site: http://www.cs.unipr.it/ppl/ . */ namespace PPL = Parma_Polyhedra_Library; -#define PPL_BITS_PER_GMP_LIMB (PPL_SIZEOF_MP_LIMB_T*CHAR_BIT) - #if !PPL_HAVE_DECL_FFS || PPL_SIZEOF_MP_LIMB_T != PPL_SIZEOF_INT unsigned int PPL::Bit_Row::first_one(mp_limb_t w) { diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index 5321f41..c681c8a 100644 --- a/src/Bit_Row.inlines.hh +++ b/src/Bit_Row.inlines.hh @@ -33,6 +33,8 @@ site: http://www.cs.unipr.it/ppl/ . */ # include <string.h> #endif +#define PPL_BITS_PER_GMP_LIMB (PPL_SIZEOF_MP_LIMB_T*CHAR_BIT) + namespace Parma_Polyhedra_Library { inline @@ -50,11 +52,11 @@ Bit_Row::Bit_Row(const Bit_Row& y, const Bit_Row& z) { const mp_size_t y_size = y.vec->_mp_size; const mp_size_t z_size = z.vec->_mp_size; if (y_size < z_size) { - mpz_init2(vec, z_size); + mpz_init2(vec, z_size*PPL_BITS_PER_GMP_LIMB); union_helper(y, z); } else { - mpz_init2(vec, y_size); + mpz_init2(vec, y_size*PPL_BITS_PER_GMP_LIMB); union_helper(z, y); } } @@ -128,7 +130,16 @@ Bit_Row::first_one(mp_limb_t w) { /*! \relates Bit_Row */ inline void set_union(const Bit_Row& x, const Bit_Row& y, Bit_Row& z) { - mpz_ior(z.vec, x.vec, y.vec); + const mp_size_t x_size = x.vec->_mp_size; + const mp_size_t y_size = y.vec->_mp_size; + if (x_size < y_size) { + mpz_realloc2(z.vec, y_size*PPL_BITS_PER_GMP_LIMB); + z.union_helper(x, y); + } + else { + mpz_realloc2(z.vec, x_size*PPL_BITS_PER_GMP_LIMB); + z.union_helper(y, x); + } } /*! \relates Bit_Row */ diff --git a/src/Polyhedron_nonpublic.cc b/src/Polyhedron_nonpublic.cc index da60e84..857b302 100644 --- a/src/Polyhedron_nonpublic.cc +++ b/src/Polyhedron_nonpublic.cc @@ -1122,15 +1122,9 @@ PPL::Polyhedron::strongly_minimize_constraints() const { throw std::runtime_error("PPL internal error: " "strongly_minimize_constraints."); } - Bit_Row sat_lines_and_rays; - set_union(sat_all_but_points, sat_all_but_closure_points, - sat_lines_and_rays); - Bit_Row sat_lines_and_closure_points; - set_union(sat_all_but_rays, sat_all_but_points, - sat_lines_and_closure_points); - Bit_Row sat_lines; - set_union(sat_lines_and_rays, sat_lines_and_closure_points, - sat_lines); + Bit_Row sat_lines_and_rays(sat_all_but_points, sat_all_but_closure_points); + Bit_Row sat_lines_and_closure_points(sat_all_but_rays, sat_all_but_points); + Bit_Row sat_lines(sat_lines_and_rays, sat_lines_and_closure_points); // These flags are maintained to later decide if we have to add the // eps_leq_one constraint and whether or not the constraint system @@ -1304,8 +1298,7 @@ PPL::Polyhedron::strongly_minimize_generators() const { if (gs[i].is_point()) { // Compute the Bit_Row corresponding to the candidate point // when strict inequality constraints are ignored. - Bit_Row sat_gi; - set_union(sat[i], sat_all_but_strict_ineq, sat_gi); + Bit_Row sat_gi(sat[i], sat_all_but_strict_ineq); // Check if the candidate point is actually eps-redundant: // namely, if there exists another point that saturates // all the non-strict inequalities saturated by the candidate. diff --git a/src/conversion.cc b/src/conversion.cc index 7c0b04b..3249fbd 100644 --- a/src/conversion.cc +++ b/src/conversion.cc @@ -676,8 +676,7 @@ PPL::Polyhedron::conversion(Linear_System& source, // Being the union of `sat[i]' and `sat[j]', // `new_satrow' corresponds to a ray that saturates all the // constraints saturated by both `dest[i]' and `dest[j]'. - Bit_Row new_satrow(sat[i]); - set_union(new_satrow, sat[j], new_satrow); + Bit_Row new_satrow(sat[i], sat[j]); // Compute the number of common saturators. // NOTE: this number has to be less than `k' because

1 0