February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Avoid commented-out code.
by Roberto Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: a0e8fa1b03ede3be0ba1795f8774234437e07ce0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a0e8fa1b03ed… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 08:17:30 2012 +0100 Avoid commented-out code. Detected by ECLAIR service cmntdout. --- src/iterator_to_const.defs.hh | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/iterator_to_const.defs.hh b/src/iterator_to_const.defs.hh index af51673..4444b7d 100644 --- a/src/iterator_to_const.defs.hh +++ b/src/iterator_to_const.defs.hh @@ -65,7 +65,6 @@ private: friend class const_iterator_to_const<Container>; template <typename T> friend class Powerset; - //template <typename T> friend class Ask_Tell; public: // Same traits of the const_iterator, therefore @@ -138,7 +137,6 @@ private: friend class iterator_to_const<Container>; template <typename T> friend class Powerset; - //template <typename T> friend class Ask_Tell; public: // Same traits of the underlying const_iterator.

1 0

[GIT] ppl/ppl(master): Fixed punctuation in comments.
by Roberto Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: e9cbb6dcb1507d145f924ecd4dc625b07a01d644 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9cbb6dcb150… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 08:11:59 2012 +0100 Fixed punctuation in comments. --- src/PIP_Tree.cc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index d30dba1..1d43319 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -2299,10 +2299,10 @@ PIP_Solution_Node::update_tableau( else { const dimension_type mv = mapping[v_index]; if (basis[v_index]) { - // Basic variable : add coeff_i * x_i + // Basic variable: add coeff_i * x_i add_mul_assign(v_row[mv], coeff_i, denom); } else { - // Non-basic variable : add coeff_i * row_i + // Non-basic variable: add coeff_i * row_i add_mul_assign_row(v_row, coeff_i, tableau.s[mv]); add_mul_assign_row(p_row, coeff_i, tableau.t[mv]); } @@ -2597,7 +2597,7 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, PPL_DIRTY_TEMP_COEFFICIENT(s_pivot_pj); s_pivot_pj = s_pivot.get(pj); - // Compute columns s[*][j] : + // Compute columns s[*][j]: // s[i][j] -= s[i][pj] * s_pivot[j] / s_pivot_pj; for (dimension_type i = num_rows; i-- > 0; ) { Row& s_i = tableau.s[i]; @@ -2634,7 +2634,7 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, } } - // Compute columns t[*][j] : + // Compute columns t[*][j]: // t[i][j] -= s[i][pj] * t_pivot[j] / s_pivot_pj; for (dimension_type i = num_rows; i-- > 0; ) { Row& s_i = tableau.s[i]; @@ -2698,7 +2698,7 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, } } - // Compute column s[*][pj] : s[i][pj] /= s_pivot_pj; + // Compute column s[*][pj]: s[i][pj] /= s_pivot_pj; // Update column only if pivot coordinate != 1. if (s_pivot_pj != pivot_denom) { Row::iterator itr;

1 0

[GIT] ppl/ppl(master): Avoid commented-out code.
by Roberto Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: b8d5d49fe4558480808babf8388a04493ed2af82 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b8d5d49fe455… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 08:10:19 2012 +0100 Avoid commented-out code. Detected by ECLAIR service cmntdout. --- src/Interval.inlines.hh | 1 - src/PIP_Tree.cc | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/Interval.inlines.hh b/src/Interval.inlines.hh index 08ee6ec..1f1b2f0 100644 --- a/src/Interval.inlines.hh +++ b/src/Interval.inlines.hh @@ -1002,7 +1002,6 @@ operator/(const Interval<B, Info>& x, const Interval<B, Info>& y) { template <typename Boundary, typename Info> inline std::ostream& operator<<(std::ostream& os, const Interval<Boundary, Info>& x) { - // PPL_ASSERT(x.OK()); if (check_empty_arg(x)) return os << "[]"; if (x.is_singleton()) { diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 7cd260f..d30dba1 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -249,7 +249,6 @@ column_lower(const Matrix& tableau, if (ja == jb) { // Same column: just compare the ratios. // This works since all columns are lexico-positive. - // return cst_a * sij_b > cst_b * sij_a; return lhs_coeff > rhs_coeff; }

1 0

[GIT] ppl/ppl(master): Comment punctuation fixed.
by Roberto Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 0dbe69df7a291d78b532a8dd11003fd230d82e32 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0dbe69df7a29… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 08:03:28 2012 +0100 Comment punctuation fixed. --- src/BD_Shape.templates.hh | 2 +- src/Octagonal_Shape.templates.hh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 8ef7bfe..bb38d16 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -305,7 +305,7 @@ BD_Shape<T>::affine_dimension() const { // The vector `predecessor' is used to represent equivalence classes: // `predecessor[i] == i' if and only if `i' is the leader of its - // equivalence class (i.e., the minimum index in the class); + // equivalence class (i.e., the minimum index in the class). std::vector<dimension_type> predecessor; compute_predecessors(predecessor); diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 27bcd0a..bb8b59b 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -960,7 +960,7 @@ Octagonal_Shape<T>::affine_dimension() const { // The vector `leaders' is used to represent non-singular // equivalence classes: // `leaders[i] == i' if and only if `i' is the leader of its - // equivalence class (i.e., the minimum index in the class); + // equivalence class (i.e., the minimum index in the class). std::vector<dimension_type> leaders; compute_leaders(leaders); @@ -996,7 +996,7 @@ Octagonal_Shape<T>::minimized_congruences() const { // The vector `leaders' is used to represent equivalence classes: // `leaders[i] == i' if and only if `i' is the leader of its - // equivalence class (i.e., the minimum index in the class); + // equivalence class (i.e., the minimum index in the class). std::vector<dimension_type> leaders; compute_leaders(leaders);

1 0

[GIT] ppl/ppl(master): Avoid unnamed namespace in header file.
by Roberto Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: e8d622c7f000c31be848de1f6cb181a28d842fd8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e8d622c7f000… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Feb 23 20:01:53 2012 +0100 Avoid unnamed namespace in header file. Detected by ECLAIR service hedrfile. --- src/initializer.hh | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/initializer.hh b/src/initializer.hh index 9e6f3c1..1e0cb6e 100644 --- a/src/initializer.hh +++ b/src/initializer.hh @@ -27,17 +27,13 @@ site: http://bugseng.com/products/ppl/ . */ #include "Init.defs.hh" #ifndef PPL_NO_AUTOMATIC_INITIALIZATION -namespace { -Parma_Polyhedra_Library::Init Parma_Polyhedra_Library_initializer; +static Parma_Polyhedra_Library::Init Parma_Polyhedra_Library_initializer; -} // namespace #else -namespace { -Parma_Polyhedra_Library::Init* Parma_Polyhedra_Library_initializer_p; +static Parma_Polyhedra_Library::Init* Parma_Polyhedra_Library_initializer_p; -} // namespace #endif namespace Parma_Polyhedra_Library {

1 0

[GIT] ppl/ppl(master): Enclose macro argument in parentheses.
by Roberto Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: f26f9957b54a3e328e9dd9562cf95ec96f503058 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f26f9957b54a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Feb 23 19:59:13 2012 +0100 Enclose macro argument in parentheses. Detected by ECLAIR service macrbody. --- src/compiler.hh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/compiler.hh b/src/compiler.hh index 1ee7a9b..0aa3e85 100644 --- a/src/compiler.hh +++ b/src/compiler.hh @@ -77,7 +77,8 @@ struct Suppress_Uninitialized_Warnings_Type { type name #endif -#define sizeof_to_bits(size) (size * static_cast<std::size_t>(CHAR_BIT)) +#define sizeof_to_bits(size) \ + ((size) * static_cast<std::size_t>(CHAR_BIT)) #if !defined(__GNUC__)

1 0

[GIT] ppl/ppl(master): Removed interval restrictions.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: b5afe018d5f069b74c9603986a0b83e17c66316f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b5afe018d5f0… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 18:41:57 2012 +0100 Removed interval restrictions. --- interfaces/interfaced_boxes.hh | 21 +- src/Boundary.defs.hh | 62 +-- src/Box.templates.hh | 4 - src/Checked_Number.defs.hh | 2 +- src/Integer_Interval.hh | 5 +- src/Interval.defs.hh | 91 +---- src/Interval.inlines.hh | 73 +--- src/Interval.templates.hh | 1 - src/Interval_Info.defs.hh | 26 +- src/Interval_Restriction.defs.hh | 877 ------------------------------------ src/Makefile.am | 1 - src/Rational_Interval.hh | 6 +- tests/Box/interval1.cc | 6 +- tests/Box/refinewithconstraint2.cc | 6 +- tests/ppl_test.hh | 10 +- 15 files changed, 42 insertions(+), 1149 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=b5afe018…

1 0

[GIT] ppl/ppl(master): Prefer using C_Integer traits rather than <climits> macros,
by Enea Zaffanella 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: b736306cfce299d80dd85052d6c6c93bdbc2cdf1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b736306cfce2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 23 18:40:30 2012 +0100 Prefer using C_Integer traits rather than <climits> macros, thereby avoiding implicit conversions changing type signedness. Detected by ECLAIR service utypflag. --- src/Bit_Row.inlines.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index 159cf48..fb10b91 100644 --- a/src/Bit_Row.inlines.hh +++ b/src/Bit_Row.inlines.hh @@ -57,13 +57,13 @@ Bit_Row::Bit_Row(const Bit_Row& y, const Bit_Row& z) { PPL_ASSERT(z_size >= 0); if (y_size < z_size) { PPL_ASSERT(static_cast<unsigned long>(z_size) - <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); + <= C_Integer<unsigned long>::max / PPL_BITS_PER_GMP_LIMB); mpz_init2(vec, static_cast<unsigned long>(z_size) * PPL_BITS_PER_GMP_LIMB); union_helper(y, z); } else { PPL_ASSERT(static_cast<unsigned long>(y_size) - <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); + <= C_Integer<unsigned long>::max / PPL_BITS_PER_GMP_LIMB); mpz_init2(vec, static_cast<unsigned long>(y_size) * PPL_BITS_PER_GMP_LIMB); union_helper(z, y); } @@ -135,13 +135,13 @@ Bit_Row::union_assign(const Bit_Row& x, const Bit_Row& y) { 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); + <= C_Integer<unsigned long>::max / PPL_BITS_PER_GMP_LIMB); mpz_realloc2(vec, static_cast<unsigned long>(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); + <= C_Integer<unsigned long>::max / PPL_BITS_PER_GMP_LIMB); mpz_realloc2(vec, static_cast<unsigned long>(x_size) * PPL_BITS_PER_GMP_LIMB); union_helper(y, x); }

1 0

[GIT] ppl/ppl(master): Rewritten function to avoid mixing signed and unsigned integer types.
by Enea Zaffanella 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 0739cd0ea3eaac5d117266245898b505901da822 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0739cd0ea3ea… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 23 18:21:22 2012 +0100 Rewritten function to avoid mixing signed and unsigned integer types. Detected by ECLAIR service utypflag. --- src/wrap_string.cc | 57 +++++++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/wrap_string.cc b/src/wrap_string.cc index 1845f8d..06dac11 100644 --- a/src/wrap_string.cc +++ b/src/wrap_string.cc @@ -23,6 +23,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "ppl-config.h" #include "wrap_string.hh" +#include "assert.hh" #include <cstdlib> namespace Parma_Polyhedra_Library { @@ -31,48 +32,50 @@ namespace IO_Operators { std::string wrap_string(const std::string& src_string, - unsigned indent_depth, - unsigned preferred_first_line_length, - unsigned preferred_line_length) { + const unsigned indent_depth, + const unsigned preferred_first_line_length, + const unsigned preferred_line_length) { + const unsigned npos = C_Integer<unsigned>::max; std::string dst_string; const char *src = src_string.c_str(); - for (int line = 0; ; ++line) { - int line_length = ((line == 0) - ? preferred_first_line_length - : preferred_line_length); - int last_comma = -1; - int last_space = -1; - int split_pos = -1; - int i; - for (i = 0; i <= line_length; ++i) { - if (src[i] == '\0' || src[i] == '\n') { - split_pos = i; + for (unsigned line = 0; ; ++line) { + const unsigned line_length = ((line == 0) + ? preferred_first_line_length + : preferred_line_length); + unsigned last_comma = npos; + unsigned last_space = npos; + unsigned split_pos = npos; + unsigned idx; + for (idx = 0; idx <= line_length; ++idx) { + if (src[idx] == '\0' || src[idx] == '\n') { + split_pos = idx; break; } - if (src[i] == ',' && i < line_length) - last_comma = i; - if (is_space(src[i]) && (i == 0 || !is_space(src[i-1]))) - last_space = i; + if (src[idx] == ',' && idx < line_length) + last_comma = idx; + if (is_space(src[idx]) && (idx == 0 || !is_space(src[idx-1]))) + last_space = idx; } - if (split_pos < 0) { - if (last_comma >= 0) + if (split_pos == npos) { + if (last_comma != npos) split_pos = last_comma + 1; - else if (last_space >= 0) + else if (last_space != npos) split_pos = last_space; else { - for ( ; src[i] != 0; ++i) { - if (src[i] == ',') { - ++i; + for ( ; src[idx] != 0; ++idx) { + if (src[idx] == ',') { + ++idx; break; } - if (is_space(src[i])) + if (is_space(src[idx])) break; } - split_pos = i; + split_pos = idx; } } + PPL_ASSERT(split_pos != npos); if (split_pos > 0 && line > 0 && indent_depth > 0) - dst_string.append(indent_depth, ' '); + dst_string.append(indent_depth, ' '); dst_string.append(src, split_pos); src += split_pos; if (is_space(*src))

1 0

[GIT] ppl/ppl(master): Avoid implicit conversion changing signedness.
by Enea Zaffanella 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 876b91f81ffc77c5fdbc0ca3935e6025f1853e9a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=876b91f81ffc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 23 15:37:18 2012 +0100 Avoid implicit conversion changing signedness. Detected by ECLAIR service utypflag. --- src/MIP_Problem.cc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index e3ad951..83eeeb8 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -744,13 +744,14 @@ PPL::MIP_Problem::process_pending_constraints() { // * number of non-pending constraints that are no longer satisfied // due to re-merging of split variables. - dimension_type num_satisfied_inequalities - = std::count(is_satisfied_inequality.begin(), - is_satisfied_inequality.end(), - true); + const dimension_type num_satisfied_inequalities + = static_cast<dimension_type>(std::count(is_satisfied_inequality.begin(), + is_satisfied_inequality.end(), + true)); const dimension_type unfeasible_tableau_rows_size = unfeasible_tableau_rows.size(); + PPL_ASSERT(additional_tableau_rows >= num_satisfied_inequalities); const dimension_type additional_artificial_vars = (additional_tableau_rows - num_satisfied_inequalities) + unfeasible_tableau_rows_size;

1 0