November 2011 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added missing guard against multiple inclusions.
by Roberto Bagnara 06 Nov '11

06 Nov '11

Module: ppl/ppl Branch: master Commit: 35a5eeb76ebc1383776b4cbe802e3d8b2e16ea0d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=35a5eeb76ebc… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Nov 5 20:49:58 2011 +0100 Added missing guard against multiple inclusions. Detected by ECLAIR service inclgard. --- configure.ac | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 458f2f4..d035793 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,9 @@ AC_SUBST(ISODATE) AH_TOP([ /* BEGIN ppl-config.h */ +#ifndef PPL_ppl_config_h +#define PPL_ppl_config_h 1 + /* Unique (nonzero) code for the IEEE 754 Single Precision floating point format. */ #define PPL_FLOAT_IEEE754_SINGLE 1 @@ -122,6 +125,8 @@ AH_BOTTOM([ #define PPL_U(x) x +#endif /* !defined(PPL_ppl_config_h) */ + /* END ppl-config.h */ ])

1 0

[GIT] ppl/ppl(master): Revised.
by Roberto Bagnara 05 Nov '11

05 Nov '11

Module: ppl/ppl Branch: master Commit: a39916112aa5de36a5fdfc083a6df3f8110d7355 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a39916112aa5… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Nov 5 19:47:53 2011 +0100 Revised. --- doc/user.tex | 56 ++++++++++++++++++++++++++++++-------------------------- 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/doc/user.tex b/doc/user.tex index 6680d5f..62faa88 100644 --- a/doc/user.tex +++ b/doc/user.tex @@ -35,20 +35,21 @@ \usepackage{textcomp} \usepackage{alltt} \usepackage{times} +\usepackage{tocloft} \usepackage{ifpdf} \ifpdf \usepackage[pdftex, pagebackref=true, colorlinks=true, linkcolor=blue, - unicode + unicode,draft ]{hyperref} \else \usepackage[ps2pdf, pagebackref=true, colorlinks=true, linkcolor=blue, - unicode + unicode,draft ]{hyperref} \usepackage{pspicture} \fi @@ -57,21 +58,22 @@ \usepackage{ppl} \makeindex \setcounter{tocdepth}{2} -\renewcommand{\footrulewidth}{0.4pt} -\rfoot[\fancyplain{}{\scriptsize The Parma Polyhedra Library User's Manual (version $projectnumber). See \url{http://bugseng.com/products/ppl/} for more information.}]{} -\lfoot[]{\fancyplain{}{\scriptsize The Parma Polyhedra Library User's Manual (version $projectnumber). See \url{http://bugseng.com/products/ppl/} for more information.}} +\renewcommand{\footrulewidth}{0.4pt} +\fancyfoot{} +\fancyfoot[LE,RO]{\includegraphics[height=0.4cm]{ppl_logo_no_ppl.pdf}} +\fancyfoot[RE,LO]{\small The PPL User's Manual (version $projectnumber). See \url{http://bugseng.com} for more information.} \setlength{\headheight}{24pt} -%% This only applies to the title: it avoids a pdf duplicate link error. -\pagenumbering{Alph} - \begin{document} \title{ +\includegraphics[height=9cm]{ppl_logo.pdf} \\ +\ \\ The Parma Polyhedra Library \\ -User's Manual\thanks{This work - has been partly supported by: +User's Manual\thanks{This work is based on previous work also by +Elisa Ricci, Sara Bonini, Andrea Pescetti, Angela Stazzone, Tatiana Zolo. +This work has been partly supported by: University of Parma's FIL scientific research project (ex 60\%) ``Pure and Applied Mathematics''; MURST project @@ -95,27 +97,24 @@ User's Manual\thanks{This work } \author{ Roberto Bagnara\thanks{bagnara(a)cs.unipr.it, - Department of Mathematics, University of Parma, Italy.} \\ -Patricia M. Hill\thanks{hill(a)comp.leeds.ac.uk, - School of Computing, University of Leeds, U.K.} \\ + Department of Mathematics, University of Parma, Italy, + and BUGSENG srl.} \\ +Patricia M. Hill\thanks{patricia.hill(a)bugseng.com, + BUGSENG srl.} \\ Enea Zaffanella\thanks{zaffanella(a)cs.unipr.it, - Department of Mathematics, University of Parma, Italy.} \\ -\ \\ -based on previous work also by \\ -\ \\ -Elisa Ricci \\ -\ \\ -and \\ -\ \\ -Sara Bonini \\ -Andrea Pescetti \\ -Angela Stazzone \\ -Tatiana Zolo + Department of Mathematics, University of Parma, Italy, + and BUGSENG srl.} \\ +Abramo Bagnara\thanks{abramo.bagnara(a)bugseng.com, + BUGSENG srl.} \\ } \maketitle +\thispagestyle{empty} +\clearpage{\pagestyle{empty}\cleardoublepage} \newpage -Copyright \copyright\ 2001--2010 Roberto Bagnara (bagnara(a)cs.unipr.it). +Copyright \copyright\ 2001--2010 Roberto Bagnara (bagnara(a)cs.unipr.it).\\ +Copyright \copyright\ 2010--2011 BUGSENG srl (http://bugseng.com) + This document describes the Parma Polyhedra Library (PPL). @@ -144,7 +143,12 @@ site: \begin{center} \href{http://bugseng.com/products/ppl/}{\tt http://bugseng.com/products/ppl/} \end{center} +\clearpage{\pagestyle{empty}\cleardoublepage} + +\addtolength{\cftsubsecnumwidth}{1em} \pagenumbering{roman} \tableofcontents +\clearpage{\pagestyle{empty}\cleardoublepage} + \pagenumbering{arabic}

1 0

[GIT] ppl/ppl(master): The PPL logo in various formats.
by Roberto Bagnara 05 Nov '11

05 Nov '11

Module: ppl/ppl Branch: master Commit: 8dcf9b3f83ff6b8f86481a2b24b304e083818e4e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8dcf9b3f83ff… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Nov 5 19:47:11 2011 +0100 The PPL logo in various formats. --- doc/.gitignore | 1 + doc/ppl_logo.eps | 341 +++++++++++++++++++++++++++++++++++++++++++++++ doc/ppl_logo.pdf | Bin 0 -> 4963 bytes doc/ppl_logo.svg | 89 ++++++++++++ doc/ppl_logo_no_ppl.eps | 322 ++++++++++++++++++++++++++++++++++++++++++++ doc/ppl_logo_no_ppl.pdf | Bin 0 -> 4678 bytes doc/ppl_logo_no_ppl.svg | 116 ++++++++++++++++ 7 files changed, 869 insertions(+), 0 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=8dcf9b3f…

1 0

[GIT] ppl/ppl(master): Indentation fixes.
by Roberto Bagnara 05 Nov '11

05 Nov '11

Module: ppl/ppl Branch: master Commit: 97f3e98708cbb53eabf0fb0c30f38e50eb549369 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=97f3e98708cb… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Nov 5 15:32:14 2011 +0100 Indentation fixes. Detected by ECLAIR service indntion. --- src/BD_Shape.defs.hh | 2 +- src/BD_Shape.inlines.hh | 12 ++++++------ src/BD_Shape.templates.hh | 4 ++-- src/Box.defs.hh | 2 +- src/DB_Matrix.templates.hh | 2 +- src/DB_Row.defs.hh | 4 ++-- src/Grid.defs.hh | 2 +- src/Grid_public.cc | 6 +++--- src/Octagonal_Shape.inlines.hh | 12 ++++++------ src/Octagonal_Shape.templates.hh | 6 +++--- src/Partially_Reduced_Product.templates.hh | 8 ++++---- src/Pointset_Powerset.defs.hh | 10 +++++----- src/Polyhedron_public.cc | 2 +- src/Variables_Set.cc | 2 +- src/minimize.cc | 2 +- 15 files changed, 38 insertions(+), 38 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=97f3e987…

1 0

[GIT] ppl/ppl(master): Code layout corrections.
by Roberto Bagnara 04 Nov '11

04 Nov '11

Module: ppl/ppl Branch: master Commit: 367a91ec09da66585614d6829dbb089066d57c77 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=367a91ec09da… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Nov 4 21:34:30 2011 +0100 Code layout corrections. --- src/BD_Shape.templates.hh | 6 +++--- src/PIP_Tree.cc | 3 ++- src/checked_int.inlines.hh | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 0635784..9d21ed6 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -3756,7 +3756,7 @@ BD_Shape<T>::refine(const Variable var, if (expr.coefficient(Variable(pinf_index-1)) == denominator) // Add the constraint `v - pinf_index <= sum'. add_dbm_constraint(pinf_index, v, sum); - break; + break; case GREATER_OR_EQUAL: // Compute an upper approximation for `-sc_expr' into `sum'. @@ -4460,7 +4460,7 @@ void BD_Shape<T>::refine_with_linear_form_inequality( return; } } - else if (left_t == 1){ + else if (left_t == 1) { if (left_w_coeff == 1 || left_w_coeff == -1) { if (right_t == 0 || (right_w_coeff == 1 || right_w_coeff == -1)) { left_one_var_refine(left_w_id, right_t, right_w_id, left, right); @@ -4660,7 +4660,7 @@ BD_Shape<T> add_assign_r(ub, ub, a_plus_minus_b_minus, ROUND_UP); add_dbm_constraint(right_w_id + 1, 0, ub); } - return; + return; } if (is_left_coeff_one && is_right_coeff_minus_one) { // over-approximate (if is it possible) the inequality diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 84577a4..11d4603 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -2267,7 +2267,8 @@ PIP_Solution_Node::update_tableau( // Transform (expr > 0) into (expr - 1 >= 0). --p_row0; p_row0 *= denom; - } else + } + else if (constraint.is_strict_inequality()) // Transform (expr > 0) into (expr - 1 >= 0). neg_assign(p_row[0], denom); diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index c45f306..f3b7cf9 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -985,7 +985,7 @@ add_signed_int(Type& to, const Type x, const Type y, Rounding_Dir dir) { return set_pos_overflow_int<To_Policy>(to, dir); } else if (x < Extended_Int<To_Policy, Type>::min - y) - return set_neg_overflow_int<To_Policy>(to, dir); + return set_neg_overflow_int<To_Policy>(to, dir); } to = x + y; return V_EQ; @@ -1014,7 +1014,7 @@ sub_signed_int(Type& to, const Type x, const Type y, Rounding_Dir dir) { return set_neg_overflow_int<To_Policy>(to, dir); } else if (x > Extended_Int<To_Policy, Type>::max + y) - return set_pos_overflow_int<To_Policy>(to, dir); + return set_pos_overflow_int<To_Policy>(to, dir); } to = x - y; return V_EQ;

1 0

[GIT] ppl/ppl(master): Avoid reusing names reserved by the C++ standard.
by Roberto Bagnara 04 Nov '11

04 Nov '11

Module: ppl/ppl Branch: master Commit: a49e3ce4af0a4a44a7d0b902a2db47cdede0ef88 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a49e3ce4af0a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Nov 4 21:15:08 2011 +0100 Avoid reusing names reserved by the C++ standard. Detected by ECLAIR service resvidnt. --- src/checked_float.inlines.hh | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 5085261..cec9662 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -65,33 +65,33 @@ multiply_add(long double x, long double y, long double z) { #if PPL_HAVE_DECL_RINTF inline float -rint(float x) { - return ::rintf(x); +round_to_integer(float x) { + return rintf(x); } #endif inline double -rint(double x) { - return ::rint(x); +round_to_integer(double x) { + return rint(x); } #if PPL_HAVE_DECL_RINTL inline long double -rint(long double x) { - return ::rintl(x); +round_to_integer(long double x) { + return rintl(x); } #elif !PPL_CXX_PROVIDES_PROPER_LONG_DOUBLE // If proper long doubles are not provided, this is most likely // because long double and double are the same type: use rint(). inline long double -rint(long double x) { - return ::rint(x); +round_to_integer(long double x) { + return rint(x); } #elif defined(__i386__) && (defined(__GNUC__) || defined(__INTEL_COMPILER)) // On Cygwin, we have proper long doubles but rintl() is not defined: // luckily, one machine instruction is enough to save the day. inline long double -rint(long double x) { +round_to_integer(long double x) { long double i; __asm__ ("frndint" : "=t" (i) : "0" (x)); return i; @@ -198,7 +198,7 @@ is_pinf_float(const T v) { template <typename Policy, typename T> inline bool is_int_float(const T v) { - return rint(v) == v; + return round_to_integer(v) == v; } template <typename Policy, typename T> @@ -371,9 +371,9 @@ floor_float(Type& to, const Type from, Rounding_Dir) { if (To_Policy::fpu_check_nan_result && is_nan<From_Policy>(from)) return assign_special<To_Policy>(to, VC_NAN, ROUND_IGNORE); if (fpu_direct_rounding(ROUND_DOWN)) - to = rint(from); + to = round_to_integer(from); else if (fpu_inverse_rounding(ROUND_DOWN)) { - to = rint(-from); + to = round_to_integer(-from); limit_precision(to); to = -to; } @@ -381,7 +381,7 @@ floor_float(Type& to, const Type from, Rounding_Dir) { fpu_rounding_control_word_type old = fpu_save_rounding_direction(round_fpu_dir(ROUND_DOWN)); limit_precision(from); - to = rint(from); + to = round_to_integer(from); limit_precision(to); fpu_restore_rounding_direction(old); } @@ -394,9 +394,9 @@ ceil_float(Type& to, const Type from, Rounding_Dir) { if (To_Policy::fpu_check_nan_result && is_nan<From_Policy>(from)) return assign_special<To_Policy>(to, VC_NAN, ROUND_IGNORE); if (fpu_direct_rounding(ROUND_UP)) - to = rint(from); + to = round_to_integer(from); else if (fpu_inverse_rounding(ROUND_UP)) { - to = rint(-from); + to = round_to_integer(-from); limit_precision(to); to = -to; } @@ -404,7 +404,7 @@ ceil_float(Type& to, const Type from, Rounding_Dir) { fpu_rounding_control_word_type old = fpu_save_rounding_direction(round_fpu_dir(ROUND_UP)); limit_precision(from); - to = rint(from); + to = round_to_integer(from); limit_precision(to); fpu_restore_rounding_direction(old); }

1 0

[GIT] ppl/ppl(master): Avoid reusing names reserved by the C++ standard.
by Roberto Bagnara 04 Nov '11

04 Nov '11

Module: ppl/ppl Branch: master Commit: 56686f99aae8f60dc42c97bcd44c1b7a733c7507 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=56686f99aae8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Nov 4 21:09:55 2011 +0100 Avoid reusing names reserved by the C++ standard. Detected by ECLAIR service resvidnt. --- src/checked_float.inlines.hh | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index c6ed19a..5085261 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -34,30 +34,30 @@ namespace Parma_Polyhedra_Library { namespace Checked { inline float -fma(float x, float y, float z) { +multiply_add(float x, float y, float z) { #if PPL_HAVE_DECL_FMAF && defined(FP_FAST_FMAF) \ && !defined(__alpha) && !defined(__FreeBSD__) - return ::fmaf(x, y, z); + return fmaf(x, y, z); #else return x*y + z; #endif } inline double -fma(double x, double y, double z) { +multiply_add(double x, double y, double z) { #if PPL_HAVE_DECL_FMA && defined(FP_FAST_FMA) \ && !defined(__alpha) && !defined(__FreeBSD__) - return ::fma(x, y, z); + return fma(x, y, z); #else return x*y + z; #endif } inline long double -fma(long double x, long double y, long double z) { +multiply_add(long double x, long double y, long double z) { #if PPL_HAVE_DECL_FMAL && defined(FP_FAST_FMAL) \ && !defined(__alpha) && !defined(__FreeBSD__) - return ::fmal(x, y, z); + return fmal(x, y, z); #else return x*y + z; #endif @@ -919,9 +919,9 @@ add_mul_float(Type& to, const Type x, const Type y, Rounding_Dir dir) { // FIXME: missing check_inf_add_inf prepare_inexact<To_Policy>(dir); if (fpu_direct_rounding(dir)) - to = fma(x, y, to); + to = multiply_add(x, y, to); else if (fpu_inverse_rounding(dir)) { - to = fma(-x, y, -to); + to = multiply_add(-x, y, -to); limit_precision(to); to = -to; } @@ -931,7 +931,7 @@ add_mul_float(Type& to, const Type x, const Type y, Rounding_Dir dir) { limit_precision(x); limit_precision(y); limit_precision(to); - to = fma(x, y, to); + to = multiply_add(x, y, to); limit_precision(to); fpu_restore_rounding_direction(old); } @@ -952,9 +952,9 @@ sub_mul_float(Type& to, const Type x, const Type y, Rounding_Dir dir) { // FIXME: missing check_inf_add_inf prepare_inexact<To_Policy>(dir); if (fpu_direct_rounding(dir)) - to = fma(x, -y, to); + to = multiply_add(x, -y, to); else if (fpu_inverse_rounding(dir)) { - to = fma(x, y, -to); + to = multiply_add(x, y, -to); limit_precision(to); to = -to; } @@ -964,7 +964,7 @@ sub_mul_float(Type& to, const Type x, const Type y, Rounding_Dir dir) { limit_precision(x); limit_precision(y); limit_precision(to); - to = fma(x, -y, to); + to = multiply_add(x, -y, to); limit_precision(to); fpu_restore_rounding_direction(old); }

1 0

[GIT] ppl/ppl(master): FIXME resolved.
by Roberto Bagnara 04 Nov '11

04 Nov '11

Module: ppl/ppl Branch: master Commit: 0876ffa984a99f22b38fc72d6ae4e23814064f4d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0876ffa984a9… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Nov 4 20:52:55 2011 +0100 FIXME resolved. --- src/Polyhedron_nonpublic.cc | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/Polyhedron_nonpublic.cc b/src/Polyhedron_nonpublic.cc index 75e7564..ddab81f 100644 --- a/src/Polyhedron_nonpublic.cc +++ b/src/Polyhedron_nonpublic.cc @@ -1181,8 +1181,6 @@ PPL::Polyhedron::strongly_minimize_constraints() const { // Now we check if there exists another strict inequality // constraint having a superset of its saturators, // when disregarding points. - /* FIXME: what is this clear for? */ - sat_ci.clear(); sat_ci.union_assign(sat[i], sat_all_but_points); bool eps_redundant = false; for (dimension_type j = 0; j < cs_rows; ++j)

1 0

[GIT] ppl/ppl(master): Avoid reusing names reserved by the C++ standard.
by Roberto Bagnara 04 Nov '11

04 Nov '11

Module: ppl/ppl Branch: master Commit: 7682a06a0a07e2070438880368ef2d465fa71e38 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7682a06a0a07… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Nov 4 20:10:21 2011 +0100 Avoid reusing names reserved by the C++ standard. In the process, consistency improved with respect to conventions used throughout the library. Detected by ECLAIR service resvidnt. --- src/Bit_Row.defs.hh | 31 ++++++++++--------------------- src/Bit_Row.inlines.hh | 23 ++++++++++------------- src/Polyhedron_nonpublic.cc | 35 ++++++++++++++++++----------------- 3 files changed, 38 insertions(+), 51 deletions(-) diff --git a/src/Bit_Row.defs.hh b/src/Bit_Row.defs.hh index c876893..30984bc 100644 --- a/src/Bit_Row.defs.hh +++ b/src/Bit_Row.defs.hh @@ -85,24 +85,6 @@ bool subset_or_equal(const Bit_Row& x, const Bit_Row& y, #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) bool strict_subset(const Bit_Row& x, const Bit_Row& y); -#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS -//! Set-theoretic union. -/*! \relates Bit_Row */ -#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -void set_union(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); - -#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS -//! Set-theoretic intersection. -/*! \relates Bit_Row */ -#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -void set_intersection(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); - -#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS -//! Set-theoretic difference. -/*! \relates Bit_Row */ -#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -void set_difference(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); - } // namespace Parma_Polyhedra_Library #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS @@ -150,6 +132,16 @@ public: //! Clears all the bits of the row. void clear(); + //! Assigns to \p *this the set-theoretic union of \p x and \p y. + void union_assign(const Bit_Row& x, const Bit_Row& y); + + //! Assigns to \p *this the set-theoretic intersection of \p x and \p y. + void intersection_assign(const Bit_Row& x, const Bit_Row& y); + + //! Assigns to \p *this the set-theoretic difference of \p x and \p y. + void difference_assign(const Bit_Row& x, const Bit_Row& y); + + friend int compare(const Bit_Row& x, const Bit_Row& y); friend bool operator==(const Bit_Row& x, const Bit_Row& y); friend bool operator!=(const Bit_Row& x, const Bit_Row& y); @@ -157,9 +149,6 @@ public: friend bool subset_or_equal(const Bit_Row& x, const Bit_Row& y, bool& strict_subset); friend bool strict_subset(const Bit_Row& x, const Bit_Row& y); - friend void set_union(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); - friend void set_intersection(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); - friend void set_difference(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); //! Returns the index of the first set bit or ULONG_MAX if no bit is set. unsigned long first() const; diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index 3e815c3..c9882e3 100644 --- a/src/Bit_Row.inlines.hh +++ b/src/Bit_Row.inlines.hh @@ -126,39 +126,36 @@ Bit_Row::total_memory_in_bytes() const { return sizeof(*this) + external_memory_in_bytes(); } -/*! \relates Bit_Row */ inline void -set_union(const Bit_Row& x, const Bit_Row& y, Bit_Row& z) { +Bit_Row::union_assign(const Bit_Row& x, const Bit_Row& y) { const mp_size_t x_size = x.vec->_mp_size; PPL_ASSERT(x_size >= 0); const mp_size_t y_size = y.vec->_mp_size; PPL_ASSERT(y_size >= 0); if (x_size < y_size) { PPL_ASSERT(static_cast<unsigned long>(y_size) - <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_realloc2(z.vec, y_size * PPL_BITS_PER_GMP_LIMB); - z.union_helper(x, y); + <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); + mpz_realloc2(vec, y_size * PPL_BITS_PER_GMP_LIMB); + union_helper(x, y); } else { PPL_ASSERT(static_cast<unsigned long>(x_size) <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_realloc2(z.vec, x_size * PPL_BITS_PER_GMP_LIMB); - z.union_helper(y, x); + mpz_realloc2(vec, x_size * PPL_BITS_PER_GMP_LIMB); + union_helper(y, x); } } -/*! \relates Bit_Row */ inline void -set_intersection(const Bit_Row& x, const Bit_Row& y, Bit_Row& z) { - mpz_and(z.vec, x.vec, y.vec); +Bit_Row::intersection_assign(const Bit_Row& x, const Bit_Row& y) { + mpz_and(vec, x.vec, y.vec); } -/*! \relates Bit_Row */ inline void -set_difference(const Bit_Row& x, const Bit_Row& y, Bit_Row& z) { +Bit_Row::difference_assign(const Bit_Row& x, const Bit_Row& y) { PPL_DIRTY_TEMP(mpz_class, complement_y); mpz_com(complement_y.get_mpz_t(), y.vec); - mpz_and(z.vec, x.vec, complement_y.get_mpz_t()); + mpz_and(vec, x.vec, complement_y.get_mpz_t()); } namespace Implementation { diff --git a/src/Polyhedron_nonpublic.cc b/src/Polyhedron_nonpublic.cc index eaa2007..75e7564 100644 --- a/src/Polyhedron_nonpublic.cc +++ b/src/Polyhedron_nonpublic.cc @@ -1145,7 +1145,7 @@ PPL::Polyhedron::strongly_minimize_constraints() const { if (cs[i].is_strict_inequality()) { // First, check if it is saturated by no closure points Bit_Row sat_ci; - set_union(sat[i], sat_lines_and_closure_points, sat_ci); + sat_ci.union_assign(sat[i], sat_lines_and_closure_points); if (sat_ci == sat_lines) { // It is saturated by no closure points. if (!found_eps_leq_one) { @@ -1181,8 +1181,9 @@ PPL::Polyhedron::strongly_minimize_constraints() const { // Now we check if there exists another strict inequality // constraint having a superset of its saturators, // when disregarding points. + /* FIXME: what is this clear for? */ sat_ci.clear(); - set_union(sat[i], sat_all_but_points, sat_ci); + sat_ci.union_assign(sat[i], sat_all_but_points); bool eps_redundant = false; for (dimension_type j = 0; j < cs_rows; ++j) if (i != j && cs[j].is_strict_inequality() @@ -1531,7 +1532,7 @@ PPL::Polyhedron::BHZ09_C_poly_hull_assign_if_exact(const Polyhedron& y) { const bool included = y.relation_with(x_cs[i]).implies(Poly_Con_Relation::is_included()); if (!included) { - set_union(x_gs_red_in_y, x_sat[i], row_union); + row_union.union_assign(x_gs_red_in_y, x_sat[i]); if (row_union != all_ones) return false; } @@ -1610,8 +1611,8 @@ PPL::Polyhedron::BHZ09_NNC_poly_hull_assign_if_exact(const Polyhedron& y) { return true; Bit_Row x_nonpoints_nonred_in_y; - set_difference(x_gs_nonred_in_y, x_points_nonred_in_y, - x_nonpoints_nonred_in_y); + x_nonpoints_nonred_in_y.difference_assign(x_gs_nonred_in_y, + x_points_nonred_in_y); const Constraint_System& x_cs = x.con_sys; const Constraint_System& y_cs = y.con_sys; @@ -1655,20 +1656,20 @@ PPL::Polyhedron::BHZ09_NNC_poly_hull_assign_if_exact(const Polyhedron& y) { // Skip constraint if it is not violated by `y'. if (y.relation_with(x_c).implies(Poly_Con_Relation::is_included())) continue; - set_difference(all_ones, x_sat[i], saturators); + saturators.difference_assign(all_ones, x_sat[i]); // Check condition 1. - set_intersection(x_nonpoints_nonred_in_y, saturators, tmp_set); + tmp_set.intersection_assign(x_nonpoints_nonred_in_y, saturators); if (!tmp_set.empty()) return false; if (x_c.is_strict_inequality()) { // Postpone check for condition 3. x_cs_condition_3.set(i); - set_intersection(x_closure_points, saturators, tmp_set); - set_union(x_gs_condition_3, tmp_set, x_gs_condition_3); + tmp_set.intersection_assign(x_closure_points, saturators); + x_gs_condition_3.union_assign(x_gs_condition_3, tmp_set); } else { // Check condition 2. - set_intersection(x_points_nonred_in_y_closure, saturators, tmp_set); + tmp_set.intersection_assign(x_points_nonred_in_y_closure, saturators); if (!tmp_set.empty()) return false; } @@ -1678,8 +1679,8 @@ PPL::Polyhedron::BHZ09_NNC_poly_hull_assign_if_exact(const Polyhedron& y) { // (the statement of the NNC theorem in BHZ09 is symmetric). Bit_Row y_nonpoints_nonred_in_x; - set_difference(y_gs_nonred_in_x, y_points_nonred_in_x, - y_nonpoints_nonred_in_x); + y_nonpoints_nonred_in_x.difference_assign(y_gs_nonred_in_x, + y_points_nonred_in_x); // Filter away the points of `y_gs' that would be redundant // in the topological closure of `x'. @@ -1714,20 +1715,20 @@ PPL::Polyhedron::BHZ09_NNC_poly_hull_assign_if_exact(const Polyhedron& y) { // Skip constraint if it is not violated by `x'. if (x.relation_with(y_c).implies(Poly_Con_Relation::is_included())) continue; - set_difference(all_ones, y_sat[i], saturators); + saturators.difference_assign(all_ones, y_sat[i]); // Check condition 1. - set_intersection(y_nonpoints_nonred_in_x, saturators, tmp_set); + tmp_set.intersection_assign(y_nonpoints_nonred_in_x, saturators); if (!tmp_set.empty()) return false; if (y_c.is_strict_inequality()) { // Postpone check for condition 3. y_cs_condition_3.set(i); - set_intersection(y_closure_points, saturators, tmp_set); - set_union(y_gs_condition_3, tmp_set, y_gs_condition_3); + tmp_set.intersection_assign(y_closure_points, saturators); + y_gs_condition_3.union_assign(y_gs_condition_3, tmp_set); } else { // Check condition 2. - set_intersection(y_points_nonred_in_x_closure, saturators, tmp_set); + tmp_set.intersection_assign(y_points_nonred_in_x_closure, saturators); if (!tmp_set.empty()) return false; }

1 0

[GIT] ppl/ppl(master): Scope of variables reduced.
by Roberto Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 246ba9a3d0b882797558e60536f486838aaaacf3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=246ba9a3d0b8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Nov 3 20:38:48 2011 +0100 Scope of variables reduced. Detected by ECLAIR service minscope. --- src/Linear_Form.inlines.hh | 9 ++++----- src/checked.cc | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Linear_Form.inlines.hh b/src/Linear_Form.inlines.hh index 65ab261..2e0cfba 100644 --- a/src/Linear_Form.inlines.hh +++ b/src/Linear_Form.inlines.hh @@ -197,10 +197,10 @@ template <typename C> inline void Linear_Form<C>::ascii_dump(std::ostream& s) const { using namespace IO_Operators; + dimension_type space_dim = space_dimension(); + s << space_dim << "\n"; const char separator = ' '; - dimension_type space = space_dimension(); - s << space << "\n"; - for (dimension_type i = 0; i <= space; ++i) + for (dimension_type i = 0; i <= space_dim; ++i) s << vec[i] << separator; s << "\n"; } @@ -230,8 +230,7 @@ Linear_Form<C>::overflows() const { if (!inhomogeneous_term().is_bounded()) return true; - dimension_type dimension = space_dimension(); - for (dimension_type i = 0; i < dimension; ++i) { + for (dimension_type i = space_dimension(); i-- > 0; ) { if (!coefficient(Variable(i)).is_bounded()) return true; } diff --git a/src/checked.cc b/src/checked.cc index e886489..0e33f2a 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -219,9 +219,10 @@ parse_number_part(std::istream& is, number_struct& num) { return V_CVT_STR_UNK; if (c != '^') goto unexpected; - std::string::const_iterator i; num.base = 0; - for (i = num.mantissa.begin(); i != num.mantissa.end(); i++) { + for (std::string::const_iterator i = num.mantissa.begin(); + i != num.mantissa.end(); + i++) { num.base = num.base * 10 + get_digit(*i, 10); if (num.base > 36) goto unexpected;

1 0