- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Magic constants avoided.
by Roberto Bagnara 09 Oct '11

09 Oct '11

Module: ppl/ppl Branch: master Commit: f768b3933ef890976ed57198e99fbe90885fb533 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f768b3933ef8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Oct 9 19:45:03 2011 +0200 Magic constants avoided. Detected by ECLAIR service nomagicc. --- demos/ppl_lcdd/ppl_lcdd.cc | 17 ++++++++++------- demos/ppl_pips/ppl_pips.cc | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index 68e6f53..b48962d 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -415,13 +415,16 @@ process_options(int argc, char* argv[]) { #endif // defined(PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME) case 'R': - l = strtol(optarg, &endptr, 10); - if (*endptr || l < 0) - fatal("a non-negative integer must follow `-R'"); - else if (((unsigned long) l) > ULONG_MAX/(1024*1024)) - max_bytes_of_virtual_memory = ULONG_MAX; - else - max_bytes_of_virtual_memory = l*1024*1024; + { + const int MEGA = 1024*1024; + l = strtol(optarg, &endptr, 10); + if (*endptr || l < 0) + fatal("a non-negative integer must follow `-R'"); + else if (static_cast<unsigned long>(l) > ULONG_MAX/MEGA) + max_bytes_of_virtual_memory = ULONG_MAX; + else + max_bytes_of_virtual_memory = l*MEGA; + } break; case 'o': diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 69f2f8a..3b2c193 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -673,13 +673,16 @@ process_options(int argc, char* argv[]) { break; case 'R': - l = strtol(optarg, &endptr, 10); - if (*endptr || l < 0) - fatal("a non-negative integer must follow `-R'"); - else if (((unsigned long) l) > ULONG_MAX/(1024*1024)) - max_bytes_of_virtual_memory = ULONG_MAX; - else - max_bytes_of_virtual_memory = l*1024*1024; + { + const int MEGA = 1024*1024; + l = strtol(optarg, &endptr, 10); + if (*endptr || l < 0) + fatal("a non-negative integer must follow `-R'"); + else if (static_cast<unsigned long>(l) > ULONG_MAX/MEGA) + max_bytes_of_virtual_memory = ULONG_MAX; + else + max_bytes_of_virtual_memory = l*MEGA; + } break; case 'o':

1 0

Integer projection
by Didier Lime 06 Oct '11

06 Oct '11

Dear PPL developers, What would you think is the most sensible way to compute the convex hull of all the integer points in a given polyhedron? drop_some_non_integer_points() seems to be quite close but the description reads like it might not always compute exactly this. Thank you in advance, and also for this very nice library. Cheers, Didier -- Dr. Didier Lime Maître de Conférences IRCCyN / École Centrale de Nantes Nantes, France http://www.irccyn.ec-nantes.fr/~lime

2 3

PPL timings depend on sort (ordering) of input?
by Nestor Aguilera 01 Oct '11

01 Oct '11

Hi, I am new to PPL, coming from CDD (and PORTA), and I am using "ppl_lcdd" (replacing "lcdd_gmp"). I found PPL quite fast on my problems as compared to CDD, so I am quite happy with it. However, working with circulant matrices I found that the timings depend very much on how the problem is presented. I am enclosing two files with the same vertices: those in the "ppl_7.ext" are those in "ppl_1.ext" rotated by 6 places, and the problem is to find the inequalities description of the convex hull. In my machine, "ppl_lcdd" takes about 1.2s to solve "ppl_1" and about 18.3s to solve "ppl_7", although they are essentially the same problem. Can anyone tell me why this is so?, does it depend on any special sorting in the input? Thank you very much. Néstor Aguilera

3 3

[GIT] ppl/ppl(master): For readability, prefer infix notation for operator[ ].
by Enea Zaffanella 30 Sep '11

30 Sep '11

Module: ppl/ppl Branch: master Commit: 95285ecc6049e25569f31f07d64d4f53a1be732e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=95285ecc6049… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Sep 30 13:50:14 2011 +0200 For readability, prefer infix notation for operator[]. --- src/Congruence.cc | 4 ++-- src/Congruence.inlines.hh | 8 +++++--- src/Grid_Generator.cc | 40 ++++++++++++++++++++++------------------ src/Grid_Generator.inlines.hh | 16 +++++++++------- src/Grid_Generator_System.cc | 13 +++++++------ 5 files changed, 45 insertions(+), 36 deletions(-) diff --git a/src/Congruence.cc b/src/Congruence.cc index ee16740..4ac23d5 100644 --- a/src/Congruence.cc +++ b/src/Congruence.cc @@ -185,7 +185,7 @@ PPL::Congruence::is_tautological() const { || (is_proper_congruence() && (inhomogeneous_term() % modulus() == 0))) { for (unsigned i = space_dimension(); i > 0; --i) - if (operator[](i) != 0) + if ((*this)[i] != 0) return false; return true; } @@ -199,7 +199,7 @@ PPL::Congruence::is_inconsistent() const { && ((inhomogeneous_term() % modulus()) == 0))) return false; for (unsigned i = space_dimension(); i > 0; --i) - if (operator[](i) != 0) + if ((*this)[i] != 0) return false; return true; } diff --git a/src/Congruence.inlines.hh b/src/Congruence.inlines.hh index b74261b..5c0ed32 100644 --- a/src/Congruence.inlines.hh +++ b/src/Congruence.inlines.hh @@ -195,7 +195,7 @@ Congruence::is_equality() const { inline bool Congruence::is_equal_at_dimension(dimension_type dim, const Congruence& cg) const { - return operator[](dim) * cg.modulus() == cg[dim] * modulus(); + return (*this)[dim] * cg.modulus() == cg[dim] * modulus(); } inline void @@ -205,8 +205,10 @@ Congruence::set_is_equality() { inline void Congruence::negate(dimension_type start, dimension_type end) { - while (start <= end) - neg_assign(operator[](start++)); + while (start <= end) { + neg_assign((*this)[start]); + ++start; + } } inline memory_size_type diff --git a/src/Grid_Generator.cc b/src/Grid_Generator.cc index cb7b90d..dca4980 100644 --- a/src/Grid_Generator.cc +++ b/src/Grid_Generator.cc @@ -112,21 +112,22 @@ PPL::Grid_Generator::grid_line(const Linear_Expression& e) { void PPL::Grid_Generator::coefficient_swap(Grid_Generator& y) { + Grid_Generator& x = *this; // Swap one coefficient at a time into *this. Doing this instead of // swapping the entire row ensures that the row keeps the same // capacity. if (y.is_line()) - set_is_line(); + x.set_is_line(); else - set_is_ray_or_point(); - PPL_ASSERT(size() > 0); + x.set_is_ray_or_point(); + PPL_ASSERT(x.size() > 0); PPL_ASSERT(y.size() > 0); - dimension_type sz = size() - 1; + dimension_type x_sz = x.size() - 1; dimension_type y_sz = y.size() - 1; // Swap parameter divisors. - std::swap(operator[](sz), y[y_sz]); - for (dimension_type j = (sz > y_sz ? y_sz : sz); j-- > 0; ) - std::swap(operator[](j), y[j]); + std::swap(x[x_sz], y[y_sz]); + for (dimension_type j = (x_sz > y_sz ? y_sz : x_sz); j-- > 0; ) + std::swap(x[j], y[j]); } void @@ -192,8 +193,9 @@ PPL::Grid_Generator::set_is_parameter() { set_is_parameter_or_point(); else if (!is_line_or_parameter()) { // The generator is a point. - Generator::operator[](size() - 1) = Generator::operator[](0); - Generator::operator[](0) = 0; + Grid_Generator& x = *this; + x[size() - 1] = x[0]; + x[0] = 0; } } @@ -228,11 +230,12 @@ PPL::Grid_Generator::is_equivalent_to(const Grid_Generator& y) const { bool PPL::Grid_Generator::is_equal_to(const Grid_Generator& y) const { - if (type() != y.type()) + const Grid_Generator& x = *this; + if (x.type() != y.type()) return false; - for (dimension_type col = (is_parameter() ? size() : size() - 1); - col-- > 0; ) - if (Generator::operator[](col) != y.Generator::operator[](col)) + for (dimension_type + col = x.size() - (x.is_parameter() ? 0 : 1); col-- > 0; ) + if (x[col] != y[col]) return false; return true; } @@ -240,8 +243,9 @@ PPL::Grid_Generator::is_equal_to(const Grid_Generator& y) const { bool PPL::Grid_Generator::all_homogeneous_terms_are_zero() const { // Start at size() - 1 to avoid the extra grid generator column. - for (dimension_type i = size() - 1; --i > 0; ) - if (operator[](i) != 0) + const Grid_Generator& gg = *this; + for (dimension_type i = gg.size() - 1; --i > 0; ) + if (gg[i] != 0) return false; return true; } @@ -259,7 +263,7 @@ PPL::Grid_Generator::scale_to_divisor(Coefficient_traits::const_reference d) { PPL_ASSERT(factor > 0); if (factor > 1) for (dimension_type col = size() - 2; col >= 1; --col) - Generator::operator[](col) *= factor; + (*this)[col] *= factor; } } @@ -387,7 +391,7 @@ PPL::Grid_Generator::OK() const { switch (type()) { case Grid_Generator::LINE: - if (operator[](0) != 0) { + if ((*this)[0] != 0) { #ifndef NDEBUG std::cerr << "Inhomogeneous terms of lines must be zero!" << std::endl; @@ -397,7 +401,7 @@ PPL::Grid_Generator::OK() const { break; case Grid_Generator::PARAMETER: - if (operator[](0) != 0) { + if ((*this)[0] != 0) { #ifndef NDEBUG std::cerr << "Inhomogeneous terms of parameters must be zero!" << std::endl; diff --git a/src/Grid_Generator.inlines.hh b/src/Grid_Generator.inlines.hh index 199e8a1..c1405da 100644 --- a/src/Grid_Generator.inlines.hh +++ b/src/Grid_Generator.inlines.hh @@ -111,9 +111,9 @@ inline void Grid_Generator::set_divisor(Coefficient_traits::const_reference d) { PPL_ASSERT(!is_line()); if (is_line_or_parameter()) - Generator::operator[](size() - 1) = d; + (*this)[size() - 1] = d; else - Generator::operator[](0) = d; + (*this)[0] = d; } inline Coefficient_traits::const_reference @@ -121,15 +121,15 @@ Grid_Generator::divisor() const { if (is_line()) throw_invalid_argument("divisor()", "*this is a line"); if (is_line_or_parameter()) - return Generator::operator[](size() - 1); + return (*this)[size() - 1]; else - return Generator::operator[](0); + return (*this)[0]; } inline bool Grid_Generator::is_equal_at_dimension(dimension_type dim, const Grid_Generator& gg) const { - return operator[](dim) * gg.divisor() == gg[dim] * divisor(); + return (*this)[dim] * gg.divisor() == gg[dim] * divisor(); } inline void @@ -156,8 +156,10 @@ Grid_Generator::operator=(const Generator& g) { inline void Grid_Generator::negate(dimension_type start, dimension_type end) { - while (start <= end) - neg_assign(operator[](start++)); + while (start <= end) { + neg_assign((*this)[start]); + ++start; + } } inline Coefficient_traits::const_reference diff --git a/src/Grid_Generator_System.cc b/src/Grid_Generator_System.cc index 7e42a4d..7e6bdad 100644 --- a/src/Grid_Generator_System.cc +++ b/src/Grid_Generator_System.cc @@ -54,7 +54,7 @@ PPL::Grid_Generator_System::recycling_insert(Grid_Generator_System& gs) { // of swapping each entire row. This ensures that the added rows // have the same capacities as the existing rows. for (dimension_type i = gs_num_rows; i-- > 0; ) - operator[](old_num_rows + i).coefficient_swap(gs[i]); + (*this)[old_num_rows + i].coefficient_swap(gs[i]); } void @@ -78,7 +78,7 @@ PPL::Grid_Generator_System::recycling_insert(Grid_Generator& g) { // Swap one coefficient at a time into the newly added rows, instead // of swapping each entire row. This ensures that the added rows // have the same capacities as the existing rows. - operator[](old_num_rows).coefficient_swap(g); + (*this)[old_num_rows].coefficient_swap(g); } void @@ -206,10 +206,11 @@ PPL_OUTPUT_DEFINITIONS(Grid_Generator_System) void PPL::Grid_Generator_System::ascii_dump(std::ostream& s) const { - const dimension_type num_rows = this->num_rows(); - s << num_rows << " x " << num_columns() << '\n'; + const Grid_Generator_System& ggs = *this; + const dimension_type num_rows = ggs.num_rows(); + s << num_rows << " x " << ggs.num_columns() << '\n'; for (dimension_type i = 0; i < num_rows; ++i) - operator[](i).ascii_dump(s); + ggs[i].ascii_dump(s); } bool @@ -320,7 +321,7 @@ PPL::Grid_Generator_System // Set the diagonal element of each added rows. dimension_type num_rows = this->num_rows(); for (dimension_type row = num_rows - dims; row < num_rows; ++row, ++col) - const_cast<Coefficient&>(operator[](row)[col]) = 1; + const_cast<Coefficient&>((*this)[row][col]) = 1; } void

1 0

[GIT] ppl/ppl(master): For readability, prefer infix notation for operator[ ].
by Enea Zaffanella 30 Sep '11

30 Sep '11

Module: ppl/ppl Branch: master Commit: b0b0a380dc38022669886f3b3b1432fa14f58098 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b0b0a380dc38… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Sep 30 12:11:57 2011 +0200 For readability, prefer infix notation for operator[]. --- src/Congruence_System.cc | 52 +++++++++++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/Congruence_System.cc b/src/Congruence_System.cc index d550edc..1acefe2 100644 --- a/src/Congruence_System.cc +++ b/src/Congruence_System.cc @@ -116,7 +116,7 @@ PPL::Congruence_System::insert(const Constraint& c) { Congruence cg(c, cg_size, row_capacity); add_recycled_row(cg); } - operator[](rows.size()-1).strong_normalize(); + (*this)[rows.size()-1].strong_normalize(); PPL_ASSERT(OK()); } @@ -142,7 +142,7 @@ PPL::Congruence_System::recycling_insert(Congruence_System& cgs) { // Swap one coefficient at a time into the newly added rows, instead // of swapping each entire row. This ensures that the added rows // have the same capacities as the existing rows. - Congruence& new_cg = operator[](old_num_rows + i); + Congruence& new_cg = (*this)[old_num_rows + i]; Congruence& old_cg = cgs[i]; for (dimension_type j = cgs_num_columns; j-- > 0; ) std::swap(new_cg[j], old_cg[j]); @@ -185,13 +185,15 @@ PPL::Congruence_System::insert(const Congruence_System& y) { void PPL::Congruence_System::normalize_moduli() { - dimension_type row = num_rows(); + Congruence_System& cgs = *this; + dimension_type row = cgs.num_rows(); if (row > 0) { // Calculate the LCM of all the moduli. PPL_DIRTY_TEMP_COEFFICIENT(lcm); // Find last proper congruence. while (true) { - lcm = operator[](--row).modulus(); + --row; + lcm = cgs[row].modulus(); if (lcm > 0) break; if (row == 0) @@ -199,38 +201,45 @@ PPL::Congruence_System::normalize_moduli() { return; } while (row > 0) { - const Coefficient& modulus = operator[](--row).modulus(); + --row; + const Coefficient& modulus = cgs[row].modulus(); if (modulus > 0) lcm_assign(lcm, lcm, modulus); } // Represent every row using the LCM as the modulus. PPL_DIRTY_TEMP_COEFFICIENT(factor); - dimension_type row_size = operator[](0).size(); - for (row = num_rows(); row-- > 0; ) { - const Coefficient& modulus = operator[](row).modulus(); + dimension_type row_size = cgs[0].size(); + for (row = cgs.num_rows(); row-- > 0; ) { + Congruence& cgs_row = cgs[row]; + const Coefficient& modulus = cgs_row.modulus(); if (modulus <= 0 || modulus == lcm) continue; exact_div_assign(factor, lcm, modulus); - for (dimension_type col = row_size; col-- > 0; ) - operator[](row)[col] *= factor; - operator[](row)[row_size-1] = lcm; + for (dimension_type col = row_size; col-- > 0; ) { + cgs_row[col] *= factor; + } + cgs_row[row_size-1] = lcm; } } PPL_ASSERT(OK()); } bool -PPL::Congruence_System::is_equal_to(const Congruence_System& cgs) const { - if (num_rows() != cgs.num_rows()) +PPL::Congruence_System::is_equal_to(const Congruence_System& y) const { + const Congruence_System& x = *this; + if (x.num_rows() != y.num_rows()) return false; - for (dimension_type row = cgs.num_rows(); row-- > 0; ) - for (dimension_type col = cgs.num_columns(); col-- > 0; ) { - if (operator[](row)[col] == cgs[row][col]) + for (dimension_type row = y.num_rows(); row-- > 0; ) { + const Congruence& x_row = x[row]; + const Congruence& y_row = y[row]; + for (dimension_type col = y.num_columns(); col-- > 0; ) { + if (x_row[col] == y_row[col]) continue; return false; } + } return true; } @@ -311,7 +320,7 @@ PPL::Congruence_System::has_a_free_dimension() const { std::vector<bool> free_dim(space_dim, true); dimension_type free_dims = space_dim; for (dimension_type row = num_rows(); row-- > 0; ) { - const Congruence& cg = operator[](row); + const Congruence& cg = (*this)[row]; for (dimension_type dim = space_dim; dim-- > 0; ) if (free_dim[dim] && cg[dim+1] != 0) { if (--free_dims == 0) { @@ -514,14 +523,15 @@ PPL::Congruence_System::add_unit_rows_and_columns(dimension_type dims) { // Swap the modulus column into the new last column. swap_columns(col, col + dims); + Congruence_System& cgs = *this; // Swap the added columns to the front of the matrix. for (dimension_type row = old_num_rows; row-- > 0; ) - std::swap(operator[](row), operator[](row + dims)); + std::swap(cgs[row], cgs[row + dims]); col += dims - 1; // Set the diagonal element of each added row. for (dimension_type row = dims; row-- > 0; ) - const_cast<Coefficient&>(operator[](row)[col - row]) = 1; + cgs[row][col - row] = 1; } void @@ -543,7 +553,7 @@ PPL::Congruence_System::concatenate(const Congruence_System& const_cgs) { // Swap the modulus and the new last column, in the old rows. for (dimension_type i = old_num_rows; i-- > 0; ) { - Congruence& cg = operator[](i); + Congruence& cg = (*this)[i]; std::swap(cg[old_modi], cg[modi]); } @@ -551,7 +561,7 @@ PPL::Congruence_System::concatenate(const Congruence_System& const_cgs) { // coefficients along into the appropriate columns. for (dimension_type i = added_rows; i-- > 0; ) { Congruence& cg_old = cgs[i]; - Congruence& cg_new = operator[](old_num_rows + i); + Congruence& cg_new = (*this)[old_num_rows + i]; // The inhomogeneous term is moved to the same column. std::swap(cg_new[0], cg_old[0]); // All homogeneous terms are shifted by `space_dim' columns.

1 0

[GIT] ppl/ppl(master): Removed a redundant explicit cast.
by Enea Zaffanella 30 Sep '11

30 Sep '11

Module: ppl/ppl Branch: master Commit: a87bb62c2afee1571db0d44ac02b756c9e30cb3c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a87bb62c2afe… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Sep 29 18:13:01 2011 +0200 Removed a redundant explicit cast. Detected by ECLAIR service castexpr. --- src/Congruence_System.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Congruence_System.inlines.hh b/src/Congruence_System.inlines.hh index fc20f57..024105b 100644 --- a/src/Congruence_System.inlines.hh +++ b/src/Congruence_System.inlines.hh @@ -41,7 +41,7 @@ Congruence_System::operator[](const dimension_type k) const { inline void Congruence_System::insert(const Congruence& cg) { insert_verbatim(cg); - static_cast<Congruence&>(operator[](rows.size()-1)).strong_normalize(); + (*this)[rows.size()-1].strong_normalize(); PPL_ASSERT(OK()); }

1 0

[GIT] ppl/ppl(master): Removed several redundant explicit casts.
by Enea Zaffanella 30 Sep '11

30 Sep '11

Module: ppl/ppl Branch: master Commit: f2a153cccd6d9d34325ab23c97003ef87d9715e7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f2a153cccd6d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Sep 29 18:07:38 2011 +0200 Removed several redundant explicit casts. Detected by ECLAIR service castexpr. --- src/checked.inlines.hh | 5 +---- src/intervals.defs.hh | 10 ++++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/checked.inlines.hh b/src/checked.inlines.hh index 62657e3..e8742a2 100644 --- a/src/checked.inlines.hh +++ b/src/checked.inlines.hh @@ -566,10 +566,7 @@ Enable_If<(!Safe_Conversion<T1, T2>::value && (!C_Integer<T1>::value || !C_Integer<T2>::value)), bool>::type le(const T1& x, const T2& y) { PPL_DIRTY_TEMP(T1, tmp); - Result r - = assign_r(tmp, - y, - static_cast<Rounding_Dir>(ROUND_UP | ROUND_STRICT_RELATION)); + Result r = assign_r(tmp, y, (ROUND_UP | ROUND_STRICT_RELATION)); if (!result_representable(r)) return true; switch (result_relation(r)) { diff --git a/src/intervals.defs.hh b/src/intervals.defs.hh index a0fbc9f..16a828d 100644 --- a/src/intervals.defs.hh +++ b/src/intervals.defs.hh @@ -173,7 +173,7 @@ public: case V_LGE: return r; case V_LE: - r = assign_r(to, c.value(), static_cast<Rounding_Dir>(ROUND_UP | ROUND_STRICT_RELATION)); + r = assign_r(to, c.value(), (ROUND_UP | ROUND_STRICT_RELATION)); r = result_relation_class(r); if (r == V_EQ) return V_LE; @@ -196,7 +196,7 @@ public: } break; case V_GE: - r = assign_r(to, c.value(), static_cast<Rounding_Dir>(ROUND_DOWN | ROUND_STRICT_RELATION)); + r = assign_r(to, c.value(), (ROUND_DOWN | ROUND_STRICT_RELATION)); r = result_relation_class(r); if (r == V_EQ) return V_GE; @@ -297,8 +297,7 @@ public: switch (rel) { case V_LT: if (is_integer(to)) { - rel = sub_assign_r(to, to, T(1), - static_cast<Rounding_Dir>(ROUND_UP | ROUND_STRICT_RELATION)); + rel = sub_assign_r(to, to, T(1), (ROUND_UP | ROUND_STRICT_RELATION)); rel = result_relation_class(rel); return rel == V_EQ ? V_LE : rel; } @@ -310,8 +309,7 @@ public: return V_LE; case V_GT: if (is_integer(to)) { - rel = add_assign_r(to, to, T(1), - static_cast<Rounding_Dir>(ROUND_DOWN | ROUND_STRICT_RELATION)); + rel = add_assign_r(to, to, T(1), (ROUND_DOWN | ROUND_STRICT_RELATION)); rel = result_relation_class(rel); return rel == V_EQ ? V_GE : rel; }

1 0

[GIT] ppl/ppl(master): Declare functions at file scope.
by Roberto Bagnara 28 Sep '11

28 Sep '11

Module: ppl/ppl Branch: master Commit: 89e6698b40be8fe682b9f80d2993a0b87796eb86 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=89e6698b40be… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Sep 28 14:46:51 2011 +0200 Declare functions at file scope. --- demos/ppl_lpsol/ppl_lpsol.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index b0dad47..76ab48d 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -1001,9 +1001,10 @@ solve_with_simplex(ppl_const_Constraint_System_t cs, return optimum_found; } +extern void set_d_eps(mpq_t x, double val); + static void set_mpq_t_from_double(mpq_t q, double d) { - void set_d_eps(mpq_t x, double val); if (check_results) set_d_eps(q, d); else

1 0

[GIT] ppl/ppl(master): Fixed several indentation mistakes.
by Roberto Bagnara 28 Sep '11

28 Sep '11

Module: ppl/ppl Branch: master Commit: 2d63fb4b83f94a61090bbcbecb4b52d2f47e589b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2d63fb4b83f9… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Sep 28 14:35:16 2011 +0200 Fixed several indentation mistakes. --- demos/ppl_lpsol/ppl_lpsol.c | 2 +- .../ppl_interface_generator_prolog_cc_code.m4 | 35 +++++++++---------- src/BD_Shape.templates.hh | 4 +- src/Box.templates.hh | 2 +- src/Constraint_System.cc | 4 +- src/Octagonal_Shape.templates.hh | 10 +++--- 6 files changed, 28 insertions(+), 29 deletions(-) diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index 5c1e16a..b0dad47 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -762,7 +762,7 @@ add_constraints(ppl_Linear_Expression_t ppl_le, ppl_delete_Constraint(ppl_c); break; - default: + default: fatal("internal error"); break; } diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index 2ef13a6..9253d35 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -31,31 +31,30 @@ m4_define(`ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension_code', `extern "C" Prolog_foreign_return_type ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension(Prolog_term_ref t_nd, Prolog_term_ref t_uoe, - Prolog_term_ref t_ph) -{ - static const char* where = "ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension/3"; - try { - @TOPOLOGY@@CPP_CLASS@* ph; - Prolog_atom uoe = term_to_universe_or_empty(t_uoe, where); - - if (uoe == a_empty) - ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, - where), - EMPTY); + Prolog_term_ref t_ph) { + static const char* where = "ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension/3"; + try { + @TOPOLOGY@@CPP_CLASS@* ph; + Prolog_atom uoe = term_to_universe_or_empty(t_uoe, where); + + if (uoe == a_empty) + ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, + where), + EMPTY); else - ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, - where), - UNIVERSE); + ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, + where), + UNIVERSE); Prolog_term_ref tmp = Prolog_new_term_ref(); Prolog_put_address(tmp, ph); if (Prolog_unify(t_ph, tmp)) { - PPL_REGISTER(ph); - return PROLOG_SUCCESS; - } - else - delete ph; + PPL_REGISTER(ph); + return PROLOG_SUCCESS; } + else + delete ph; + } CATCH_ALL; } diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 7ff321f..53c55a4 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -3005,7 +3005,7 @@ BD_Shape<T>::get_limiting_shape(const Constraint_System& cs, ls_x = d; ls_y = d1; changed = true; - } + } } } } @@ -4311,7 +4311,7 @@ void BD_Shape<T> // Shortest-path closure is preserved, but not reduction. if (marked_shortest_path_reduced()) reset_shortest_path_reduced(); - if (is_w_coeff_one) { + if (is_w_coeff_one) { // Add the new constraints `var - w >= b_lb' // `and var - w <= b_ub'. add_dbm_constraint(w_id, var_id, b_ub); diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 42ca87e..02159ab 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -783,7 +783,7 @@ Box<ITV>::relation_with(const Congruence& cg) const { && Poly_Con_Relation::is_included() && Poly_Con_Relation::is_disjoint(); - if (space_dim == 0) { + if (space_dim == 0) { if (cg.is_inconsistent()) return Poly_Con_Relation::is_disjoint(); else diff --git a/src/Constraint_System.cc b/src/Constraint_System.cc index 058b8f6..1f53bc3 100644 --- a/src/Constraint_System.cc +++ b/src/Constraint_System.cc @@ -116,8 +116,8 @@ adjust_topology_and_space_dimension(const Topology new_topology, // we just decrement the number of columns to be added. Constraint_System& cs = *this; const dimension_type eps_index = old_space_dim + 1; - const dimension_type old_cs_num_rows = cs.num_rows(); - dimension_type cs_num_rows = old_cs_num_rows; + const dimension_type old_cs_num_rows = cs.num_rows(); + dimension_type cs_num_rows = old_cs_num_rows; bool was_sorted = cs.is_sorted(); if (was_sorted) cs.set_sorted(false); diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 7d446ef..72ad5b6 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -1168,7 +1168,7 @@ Octagonal_Shape<T>::is_disjoint_from(const Octagonal_Shape& y) const { const Row_Iterator y_begin = y.matrix.row_begin(); PPL_DIRTY_TEMP(N, neg_y_ci_cj); - for (Row_Iterator i_iter = m_begin; i_iter != m_end; ++i_iter) { + for (Row_Iterator i_iter = m_begin; i_iter != m_end; ++i_iter) { using namespace Implementation::Octagonal_Shapes; const dimension_type i = i_iter.index(); const dimension_type ci = coherent_index(i); @@ -3908,12 +3908,12 @@ Octagonal_Shape<T>::CC76_narrowing_assign(const Octagonal_Shape& y) { bool is_oct_changed = false; typename OR_Matrix<N>::const_element_iterator j = y.matrix.element_begin(); for (typename OR_Matrix<N>::element_iterator i = matrix.element_begin(), - matrix_element_end = matrix.element_end(); + matrix_element_end = matrix.element_end(); i != matrix_element_end; ++i, ++j) { - if (!is_plus_infinity(*i) - && !is_plus_infinity(*j) - && *i != *j) { + if (!is_plus_infinity(*i) + && !is_plus_infinity(*j) + && *i != *j) { *i = *j; is_oct_changed = true; }

1 0

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 23 Sep '11

23 Sep '11

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d73822e02b49… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:54:50 2011 +0200 Generator_System: avoid calling Linear_Expression::get_row() and Generator.expression() in some methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5b8f47136eb3… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:44:52 2011 +0200 Generator: remove the swap() method that takes two dimension_type parameters. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a9c740d3d4f2… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:41:48 2011 +0200 Constraint, Generator: use Linear_Expression::ascii_{dump,load}() when needed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=39ce5f1dcb0a… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:41:07 2011 +0200 Linear_Expression: the ascii_dump() and ascii_load() methods now produce the same output, no matter if the representation is dense or sparse (note that sparse representations are still *not* supported, however). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=10ba8673ccfc… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:29:51 2011 +0200 Constraint: use the {set_,}epsilon_coefficient() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0a1efe6bf9a5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:24:02 2011 +0200 Constraint: add the epsilon_coefficient() and set_epsilon_coefficient() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=705116ceb77c… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:21:56 2011 +0200 Generator: use the {set_,}epsilon_coefficient() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3bdf40035542… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:15:33 2011 +0200 Generator: add the epsilon_coefficient() and set_epsilon_coefficient() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=abefaa121d19… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:12:10 2011 +0200 Generator: avoid using Linear_Expression::get_row() in several methods (#2). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=71247a631699… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:59:17 2011 +0200 Generator: avoid using Linear_Expression::get_row() in several methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1dc8351035f4… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:55:31 2011 +0200 Generator: use Linear_Expression::permute_space_dimensions() in permute_space_dimensions(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=37d313b16516… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:54:52 2011 +0200 Generator: use Linear_Expression::remove_space_dimensions() in remove_space_dimensions(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=230e5eab5031… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:53:37 2011 +0200 Generator: avoid calling Linear_Expression::get_row() in point(), closure_point(), ray() and line(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=50a03f9ea4d1… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:52:09 2011 +0200 The compare() function for Generator objects now uses the compare() for Linear_Expression, and it is a friend of the Generator class. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9f1709c737e5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:50:06 2011 +0200 Constraint: avoid calling Linear_Expression::get_row() in sign_normalize(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=311eaed59352… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:48:55 2011 +0200 The compare() function for Constrant objects now uses the compare() for Linear_Expression, and it is a friend of the Constraint class. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cde9d339178e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:47:18 2011 +0200 Add a compare() function for Linear_Expression objects. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ce285788f5c1… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:59:42 2011 +0200 Constraint, Generator, Grid_Generator: remove the linear_combine() method that takes a dimension_type. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=72492f5097c5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 11:10:52 2011 +0200 Linear_System: avoid using the linear_combine() method that takes a dimension_type (#3). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e37fd996d375… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 11:10:47 2011 +0200 Linear_System: avoid using the linear_combine() method that takes a dimension_type (#2). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7577a99fd785… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 11:10:27 2011 +0200 Linear_System: avoid using the linear_combine() method that takes a dimension_type (#1). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=46d836ec7655… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:53:21 2011 +0200 Polyhedron: use Generator::linear_combine_inhomogeneous() instead of the linear_combine() method that takes a dimension_type, in BHRZ03_evolving_points(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a9c868e733c7… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:51:37 2011 +0200 Grid_Generator: add a linear_combine() method a a linear_combine_inhomogeneous() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5c2af1eaec85… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:49:29 2011 +0200 Generator: add a linear_combine() method a a linear_combine_inhomogeneous() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7ef60b409c10… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:49:07 2011 +0200 Constraint: add a linear_combine() method a a linear_combine_inhomogeneous() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=84230b7a7ece… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:17:15 2011 +0200 Linear_Expression: add a linear_combine() method a a linear_combine_inhomogeneous() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0e43e5d8be77… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Sep 18 19:07:04 2011 +0200 Constraint: remove some calls to Linear_Expression::get_row() (#2). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=069a3d528bb4… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Sep 18 19:06:33 2011 +0200 Replace an assert() with PPL_ASSERT(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7d63368fb307… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Sep 18 18:40:17 2011 +0200 Constraint: remove some calls to Linear_Expression::get_row() (#1). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1ab03cc46ddd… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Sep 18 18:39:34 2011 +0200 Linear_Expression: add some methods.

1 0