March 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Obsolete FIXME removed.
by Roberto Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: master Commit: 0236c7c508e749e534804fffb5652b8a26da18ba URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0236c7c508e7… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 23 14:20:57 2009 +0100 Obsolete FIXME removed. --- src/OR_Matrix.inlines.hh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/OR_Matrix.inlines.hh b/src/OR_Matrix.inlines.hh index 8d19ba2..cb62cb9 100644 --- a/src/OR_Matrix.inlines.hh +++ b/src/OR_Matrix.inlines.hh @@ -66,7 +66,6 @@ OR_Matrix<T>::Pseudo_Row::Pseudo_Row() , size_(0) #endif { - // FIXME(0.10.1): is zeroing necessary/wanted? } template <typename T> @@ -238,7 +237,7 @@ OR_Matrix<T>::any_row_iterator::operator--(int) { template <typename T> template <typename U> inline typename OR_Matrix<T>::template any_row_iterator& -OR_Matrix<T>::any_row_iterator::operator+=(difference_type m) { +OR_Matrix<T>::any_row_iterator::operator+=(const difference_type m) { difference_type increment = m + m*m/2 + m*e; if (e%2 == 0 && m%2 == 1) ++increment;

1 0

[GIT] ppl/ppl(master): Little formatting improvement.
by Roberto Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: master Commit: ca5e2908ccb9c179cb646e56199f06961fa7d366 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ca5e2908ccb9… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 23 14:19:49 2009 +0100 Little formatting improvement. --- src/Octagonal_Shape.templates.hh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index ef78d2a..415fdb2 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -2441,8 +2441,7 @@ Octagonal_Shape<T>::difference_assign(const Octagonal_Shape& y) { template <typename T> bool -Octagonal_Shape<T> -::simplify_using_context_assign(const Octagonal_Shape& y) { +Octagonal_Shape<T>::simplify_using_context_assign(const Octagonal_Shape& y) { // FIXME(0.10.1): provide a real implementation. used(y); return true;

1 0

[GIT] ppl/ppl(master): Use consistent parameter names in helper function wrap.
by Enea Zaffanella 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: master Commit: f2b5e3f20ae7b7912d824a06585407d011aa8137 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f2b5e3f20ae7… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 23 08:21:36 2009 +0100 Use consistent parameter names in helper function wrap. --- src/pretty_print.cc | 10 +++++----- src/pretty_print.hh | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pretty_print.cc b/src/pretty_print.cc index 697f5e6..cba5790 100644 --- a/src/pretty_print.cc +++ b/src/pretty_print.cc @@ -185,11 +185,11 @@ size_t wrap(Write_Function& wfunc, } void -wrap(std::string& dst, const std::string& src_string, +wrap(std::string& dst_string, const std::string& src_string, unsigned indent_depth, unsigned preferred_first_line_length, unsigned preferred_line_length) { - dst.clear(); + dst_string.clear(); const char *src = src_string.c_str(); for (int line = 0; ; ++line) { int linelen = (line == 0 @@ -227,8 +227,8 @@ wrap(std::string& dst, const std::string& src_string, } } if (split_pos > 0 && line > 0 && indent_depth > 0) - dst.append(indent_depth, ' '); - dst.append(src, split_pos); + dst_string.append(indent_depth, ' '); + dst_string.append(src, split_pos); src += split_pos; if (isspace(*src)) ++src; @@ -236,7 +236,7 @@ wrap(std::string& dst, const std::string& src_string, ++src; if (*src == '\0') break; - dst.push_back('\n'); + dst_string.push_back('\n'); } } diff --git a/src/pretty_print.hh b/src/pretty_print.hh index f3ac636..a5504f2 100644 --- a/src/pretty_print.hh +++ b/src/pretty_print.hh @@ -142,10 +142,10 @@ c_pretty_print(const T& o, write_function wfunc, void* data, //! Helper function for the wrapping of lines. /*! - \param dst + \param dst_string The destination string. - \param src + \param src_string The source string holding the lines to wrap. \param indent_depth @@ -158,7 +158,7 @@ c_pretty_print(const T& o, write_function wfunc, void* data, The preferred length for all the lines but the first one. */ void -wrap(std::string& dst, const std::string& src_string, +wrap(std::string& dst_string, const std::string& src_string, unsigned indent_depth, unsigned preferred_first_line_length, unsigned preferred_line_length);

1 0

[GIT] ppl/ppl(master): Updated to reflect the new way `ppl_lpsol' is invoked.
by Roberto Bagnara 22 Mar '09

22 Mar '09

Module: ppl/ppl Branch: master Commit: 3f006fdff891abb7574bd4ac58b514af403c1f33 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3f006fdff891… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 22 22:35:35 2009 +0100 Updated to reflect the new way `ppl_lpsol' is invoked. --- demos/ppl_lpsol/expected_mpz_a | 146 ++++++++++++++++++++-------------------- 1 files changed, 73 insertions(+), 73 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=3f006fdf…

1 0

[GIT] ppl/ppl(master): Tightened the machinery used to generate the configuration headers.
by Roberto Bagnara 22 Mar '09

22 Mar '09

Module: ppl/ppl Branch: master Commit: d567481d9369ef8f9f02dd88055a3b16457b4eaa URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d567481d9369… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 22 22:01:47 2009 +0100 Tightened the machinery used to generate the configuration headers. --- Makefile.am | 16 +++++- Watchdog/Makefile.am | 14 +++++ Watchdog/pwl-config.sed | 42 ++++++++-------- ppl-config.sed | 130 +++++++++++++++++++++++----------------------- 4 files changed, 114 insertions(+), 88 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=d567481d…

1 0

[GIT] ppl/ppl(master): Added a test for operator-(var, expr) and operator-( expr, var).
by Enea Zaffanella 22 Mar '09

22 Mar '09

Module: ppl/ppl Branch: master Commit: 19f0a1a2a915daddcbbcfea41844d51049eed5ae URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=19f0a1a2a915… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Mar 22 19:05:01 2009 +0100 Added a test for operator-(var, expr) and operator-(expr, var). --- tests/Polyhedron/linearexpression1.cc | 42 +++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/tests/Polyhedron/linearexpression1.cc b/tests/Polyhedron/linearexpression1.cc index 84a7f16..b980221 100644 --- a/tests/Polyhedron/linearexpression1.cc +++ b/tests/Polyhedron/linearexpression1.cc @@ -87,9 +87,51 @@ test02() { return ok1 && ok2; } +bool +test03() { + Variable A(15); + Variable B(10); + + Linear_Expression e1 = A; + Linear_Expression e2 = B; + + Linear_Expression known_result1 = e1 - e2; + + bool ok1 = EQUIVALENT(A - B, known_result1) + && EQUIVALENT(Linear_Expression(A) - B, known_result1) + && EQUIVALENT(A - Linear_Expression(B), known_result1) + && EQUIVALENT(Linear_Expression(A) - Linear_Expression(B), known_result1); + + nout << "*** known_result1 ***" << endl + << known_result1 << endl; + + Linear_Expression known_result2 = e2 - e1; + + bool ok2 = EQUIVALENT(B - A, known_result2) + && EQUIVALENT(Linear_Expression(B) - A, known_result2) + && EQUIVALENT(B - Linear_Expression(A), known_result2) + && EQUIVALENT(Linear_Expression(B) - Linear_Expression(A), known_result2); + + nout << "*** known_result2 ***" << endl + << known_result2 << endl; + + Linear_Expression known_result3 = e1 - e1; + + bool ok3 = EQUIVALENT(A - A, known_result3) + && EQUIVALENT(Linear_Expression(A) - A, known_result3) + && EQUIVALENT(A - Linear_Expression(A), known_result3) + && EQUIVALENT(Linear_Expression(A) - Linear_Expression(A), known_result3); + + nout << "*** known_result3 ***" << endl + << known_result3 << endl; + + return ok1 && ok2 && ok3; +} + } // namespace BEGIN_MAIN DO_TEST(test01); DO_TEST(test02); + DO_TEST(test03); END_MAIN

1 0

[GIT] ppl/ppl(master): Improved functions and methods to build linear expressions.
by Roberto Bagnara 22 Mar '09

22 Mar '09

Module: ppl/ppl Branch: master Commit: 27265c8661e2ae0daef395d8ae9fffc63102d11c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=27265c8661e2… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 22 19:38:01 2009 +0100 Improved functions and methods to build linear expressions. Avoid complex inline functions and methods. --- src/Linear_Expression.cc | 69 +++++++++++++++++++++++++++++++++++--- src/Linear_Expression.inlines.hh | 59 -------------------------------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/Linear_Expression.cc b/src/Linear_Expression.cc index a694a15..23b4ca1 100644 --- a/src/Linear_Expression.cc +++ b/src/Linear_Expression.cc @@ -77,6 +77,35 @@ PPL::Linear_Expression::Linear_Expression(const Congruence& cg) e[i] = cg[i]; } +PPL::Linear_Expression::Linear_Expression(const Variable v) + : Linear_Row(v.space_dimension() <= max_space_dimension() + ? v.space_dimension() + 1 + : (throw std::length_error("PPL::Linear_Expression::" + "Linear_Expression(v):\n" + "v exceeds the maximum allowed " + "space dimension."), + v.space_dimension() + 1) + , Linear_Row::Flags()) { + ++((*this)[v.space_dimension()]); +} + +PPL::Linear_Expression::Linear_Expression(const Variable v, const Variable w) + : Linear_Row() { + const dimension_type v_space_dim = v.space_dimension(); + const dimension_type w_space_dim = w.space_dimension(); + const dimension_type space_dim = std::max(v_space_dim, w_space_dim); + if (space_dim > max_space_dimension()) + throw std::length_error("PPL::Linear_Expression::" + "Linear_Expression(v, w):\n" + "v or w exceed the maximum allowed " + "space dimension."); + construct(space_dim+1, Linear_Row::Flags()); + if (v_space_dim != w_space_dim) { + ++((*this)[v_space_dim]); + --((*this)[w_space_dim]); + } +} + /*! \relates Parma_Polyhedra_Library::Linear_Expression */ PPL::Linear_Expression PPL::operator+(const Linear_Expression& e1, const Linear_Expression& e2) { @@ -110,6 +139,21 @@ PPL::operator+(const Linear_Expression& e1, const Linear_Expression& e2) { return r; } +/*! \relates Linear_Expression */ +PPL::Linear_Expression +PPL::operator+(const Variable v, const Linear_Expression& e) { + const dimension_type v_space_dim = v.space_dimension(); + if (v_space_dim > Linear_Expression::max_space_dimension()) + throw std::length_error("Linear_Expression " + "PPL::operator+(v, e):\n" + "v exceeds the maximum allowed " + "space dimension."); + const dimension_type space_dim = std::max(v_space_dim, e.space_dimension()); + Linear_Expression r(e, space_dim+1); + ++r[v_space_dim]; + return r; +} + /*! \relates Parma_Polyhedra_Library::Linear_Expression */ PPL::Linear_Expression PPL::operator+(Coefficient_traits::const_reference n, @@ -189,11 +233,26 @@ PPL::operator-(const Variable v, const Linear_Expression& e) { "space dimension."); const dimension_type e_space_dim = e.space_dimension(); const dimension_type space_dim = std::max(v_space_dim, e_space_dim); - Linear_Expression result(space_dim+1, false); - ++result[v_space_dim]; - for (dimension_type i = e_space_dim+1; i-- > 0; ) - result[i] -= e[i]; - return result; + Linear_Expression r(e, space_dim+1); + for (dimension_type i = e.size(); i-- > 0; ) + neg_assign(r[i]); + ++r[v_space_dim]; + return r; +} + +/*! \relates Linear_Expression */ +PPL::Linear_Expression +PPL::operator-(const Linear_Expression& e, const Variable v) { + const dimension_type v_space_dim = v.space_dimension(); + if (v_space_dim > Linear_Expression::max_space_dimension()) + throw std::length_error("Linear_Expression " + "PPL::operator-(e, v):\n" + "v exceeds the maximum allowed " + "space dimension."); + const dimension_type space_dim = std::max(v_space_dim, e.space_dimension()); + Linear_Expression r(e, space_dim+1); + --r[v_space_dim]; + return r; } /*! \relates Parma_Polyhedra_Library::Linear_Expression */ diff --git a/src/Linear_Expression.inlines.hh b/src/Linear_Expression.inlines.hh index 1af543a..535fa91 100644 --- a/src/Linear_Expression.inlines.hh +++ b/src/Linear_Expression.inlines.hh @@ -45,37 +45,6 @@ Linear_Expression::Linear_Expression(dimension_type sz, bool) } inline -Linear_Expression::Linear_Expression(const Variable v) - : Linear_Row(v.space_dimension() <= max_space_dimension() - ? v.space_dimension() + 1 - : (throw std::length_error("PPL::Linear_Expression::" - "Linear_Expression(v):\n" - "v exceeds the maximum allowed " - "space dimension."), - v.space_dimension() + 1) - , Linear_Row::Flags()) { - ++((*this)[v.space_dimension()]); -} - -inline -Linear_Expression::Linear_Expression(const Variable v, const Variable w) - : Linear_Row() { - const dimension_type v_space_dim = v.space_dimension(); - const dimension_type w_space_dim = w.space_dimension(); - const dimension_type space_dim = std::max(v_space_dim, w_space_dim); - if (space_dim > max_space_dimension()) - throw std::length_error("PPL::Linear_Expression::" - "Linear_Expression(v, w):\n" - "v or w exceed the maximum allowed " - "space dimension."); - construct(space_dim+1, Linear_Row::Flags()); - if (v_space_dim != w_space_dim) { - ++((*this)[v_space_dim]); - --((*this)[w_space_dim]); - } -} - -inline Linear_Expression::Linear_Expression(const Linear_Expression& e) : Linear_Row(e) { } @@ -143,20 +112,6 @@ operator+(const Linear_Expression& e, Coefficient_traits::const_reference n) { /*! \relates Linear_Expression */ inline Linear_Expression -operator+(const Variable v, const Linear_Expression& e) { - const dimension_type v_space_dim = v.space_dimension(); - if (v_space_dim > Linear_Expression::max_space_dimension()) - throw std::length_error("PPL::operator+(v, e):\n" - "v exceeds the maximum allowed " - "space dimension."); - const dimension_type space_dim = std::max(v_space_dim, e.space_dimension()); - Linear_Expression result(e, space_dim+1); - ++result[v_space_dim]; - return result; -} - -/*! \relates Linear_Expression */ -inline Linear_Expression operator+(const Linear_Expression& e, const Variable v) { return v + e; } @@ -175,20 +130,6 @@ operator-(const Variable v, const Variable w) { /*! \relates Linear_Expression */ inline Linear_Expression -operator-(const Linear_Expression& e, const Variable v) { - const dimension_type v_space_dim = v.space_dimension(); - if (v_space_dim > Linear_Expression::max_space_dimension()) - throw std::length_error("PPL::operator-(e, v):\n" - "v exceeds the maximum allowed " - "space dimension."); - const dimension_type space_dim = std::max(v_space_dim, e.space_dimension()); - Linear_Expression result(e, space_dim+1); - --result[v_space_dim]; - return result; -} - -/*! \relates Linear_Expression */ -inline Linear_Expression operator*(const Linear_Expression& e, Coefficient_traits::const_reference n) { return n * e; }

1 0

[GIT] ppl/ppl(master): Three FIXMEs related to Linear_Expression resolved.
by Enea Zaffanella 22 Mar '09

22 Mar '09

Module: ppl/ppl Branch: master Commit: 1491112a597743c630269e2c67f84eafc6b31928 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1491112a5977… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Mar 22 17:47:33 2009 +0100 Three FIXMEs related to Linear_Expression resolved. The three operators are now friend of Linear_Expression: hence they can use the sizing constructors and limit the use of short-lived temporaries. --- src/Linear_Expression.cc | 25 ++++++++++++++++++++++--- src/Linear_Expression.defs.hh | 6 ++++++ src/Linear_Expression.inlines.hh | 29 ++++++++++++++++++----------- 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/src/Linear_Expression.cc b/src/Linear_Expression.cc index aabaad5..a694a15 100644 --- a/src/Linear_Expression.cc +++ b/src/Linear_Expression.cc @@ -180,13 +180,30 @@ PPL::operator-(const Linear_Expression& e1, const Linear_Expression& e2) { /*! \relates Parma_Polyhedra_Library::Linear_Expression */ PPL::Linear_Expression +PPL::operator-(const Variable v, const Linear_Expression& e) { + const dimension_type v_space_dim = v.space_dimension(); + if (v_space_dim > Linear_Expression::max_space_dimension()) + throw std::length_error("Linear_Expression " + "PPL::operator-(v, e):\n" + "v exceeds the maximum allowed " + "space dimension."); + const dimension_type e_space_dim = e.space_dimension(); + const dimension_type space_dim = std::max(v_space_dim, e_space_dim); + Linear_Expression result(space_dim+1, false); + ++result[v_space_dim]; + for (dimension_type i = e_space_dim+1; i-- > 0; ) + result[i] -= e[i]; + return result; +} + +/*! \relates Parma_Polyhedra_Library::Linear_Expression */ +PPL::Linear_Expression PPL::operator-(Coefficient_traits::const_reference n, const Linear_Expression& e) { Linear_Expression r(e); for (dimension_type i = e.size(); i-- > 0; ) neg_assign(r[i]); r[0] += n; - return r; } @@ -222,7 +239,8 @@ PPL::Linear_Expression& PPL::operator+=(Linear_Expression& e, const Variable v) { const dimension_type v_space_dim = v.space_dimension(); if (v_space_dim > Linear_Expression::max_space_dimension()) - throw std::length_error("PPL::operator+=(e, v):\n" + throw std::length_error("Linear_Expression& " + "PPL::operator+=(e, v):\n" "v exceeds the maximum allowed space dimension."); const dimension_type e_size = e.size(); if (e_size <= v_space_dim) { @@ -255,7 +273,8 @@ PPL::Linear_Expression& PPL::operator-=(Linear_Expression& e, const Variable v) { const dimension_type v_space_dim = v.space_dimension(); if (v_space_dim > Linear_Expression::max_space_dimension()) - throw std::length_error("PPL::operator-=(e, v):\n" + throw std::length_error("Linear_Expression& " + "PPL::operator-=(e, v):\n" "v exceeds the maximum allowed space dimension."); const dimension_type e_size = e.size(); if (e_size <= v_space_dim) { diff --git a/src/Linear_Expression.defs.hh b/src/Linear_Expression.defs.hh index db4af74..6b1adc1 100644 --- a/src/Linear_Expression.defs.hh +++ b/src/Linear_Expression.defs.hh @@ -409,6 +409,8 @@ private: friend Linear_Expression operator+(const Linear_Expression& e, Coefficient_traits::const_reference n); friend Linear_Expression + operator+(Variable v, const Linear_Expression& e); + friend Linear_Expression operator+(Variable v, Variable w); friend Linear_Expression @@ -422,6 +424,10 @@ private: operator-(Coefficient_traits::const_reference n, const Linear_Expression& e); friend Linear_Expression operator-(const Linear_Expression& e, Coefficient_traits::const_reference n); + friend Linear_Expression + operator-(Variable v, const Linear_Expression& e); + friend Linear_Expression + operator-(const Linear_Expression& e, Variable v); friend Linear_Expression operator*(Coefficient_traits::const_reference n, const Linear_Expression& e); diff --git a/src/Linear_Expression.inlines.hh b/src/Linear_Expression.inlines.hh index a5da9d2..1af543a 100644 --- a/src/Linear_Expression.inlines.hh +++ b/src/Linear_Expression.inlines.hh @@ -144,8 +144,15 @@ operator+(const Linear_Expression& e, Coefficient_traits::const_reference n) { /*! \relates Linear_Expression */ inline Linear_Expression operator+(const Variable v, const Linear_Expression& e) { - // FIXME(0.10.1): provide a better implementation. - return e + Linear_Expression(v); + const dimension_type v_space_dim = v.space_dimension(); + if (v_space_dim > Linear_Expression::max_space_dimension()) + throw std::length_error("PPL::operator+(v, e):\n" + "v exceeds the maximum allowed " + "space dimension."); + const dimension_type space_dim = std::max(v_space_dim, e.space_dimension()); + Linear_Expression result(e, space_dim+1); + ++result[v_space_dim]; + return result; } /*! \relates Linear_Expression */ @@ -168,16 +175,16 @@ operator-(const Variable v, const Variable w) { /*! \relates Linear_Expression */ inline Linear_Expression -operator-(const Variable v, const Linear_Expression& e) { - // FIXME(0.10.1): provide a better implementation. - return Linear_Expression(v) - e; -} - -/*! \relates Linear_Expression */ -inline Linear_Expression operator-(const Linear_Expression& e, const Variable v) { - // FIXME(0.10.1): provide a better implementation. - return e - Linear_Expression(v); + const dimension_type v_space_dim = v.space_dimension(); + if (v_space_dim > Linear_Expression::max_space_dimension()) + throw std::length_error("PPL::operator-(e, v):\n" + "v exceeds the maximum allowed " + "space dimension."); + const dimension_type space_dim = std::max(v_space_dim, e.space_dimension()); + Linear_Expression result(e, space_dim+1); + --result[v_space_dim]; + return result; } /*! \relates Linear_Expression */

1 0

[GIT] ppl/ppl(master): Dealt with a FIXME related to variable names.
by Enea Zaffanella 22 Mar '09

22 Mar '09

Module: ppl/ppl Branch: master Commit: 019b1eb83a88653d3293d596e3d0f2eabf4a8d1f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=019b1eb83a88… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Mar 22 13:54:28 2009 +0100 Dealt with a FIXME related to variable names. --- src/Octagonal_Shape.templates.hh | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 08aadd4..ef78d2a 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -1631,10 +1631,8 @@ Octagonal_Shape<T>::relation_with(const Generator& g) const { ? Coefficient_zero() : g.coefficient(y); - // FIXME(0.10.1)! Find better names. - const bool is_binary_equality = is_additive_inverse(m_ii_jj, m_i_j); - const bool is_a_binary_equality = is_additive_inverse(m_i_jj, m_ii_j); - if (is_binary_equality) { + const bool difference_is_equality = is_additive_inverse(m_ii_jj, m_i_j); + if (difference_is_equality) { // The constraint has form ax - ay = b. // The scalar product has the form // 'den * coeff_x - den * coeff_y - num * g.divisor()'. @@ -1698,7 +1696,8 @@ Octagonal_Shape<T>::relation_with(const Generator& g) const { } } - if (is_a_binary_equality) { + const bool sum_is_equality = is_additive_inverse(m_i_jj, m_ii_j); + if (sum_is_equality) { // The constraint has form ax + ay = b. // The scalar product has the form // 'den * coeff_x + den * coeff_y - num * g.divisor()'.

1 0

[GIT] ppl/w3ppl(master): Get rid of no longer needed .cvsignore files.
by Enea Zaffanella 22 Mar '09

22 Mar '09

Module: ppl/w3ppl Branch: master Commit: 868b9602bd4c8337f55dce5c4fb1d8f481a6120f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/w3ppl.git;a=commit;h=868b9602bd… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Mar 22 12:38:07 2009 +0100 Get rid of no longer needed .cvsignore files. --- htdocs/.cvsignore | 2 -- htdocs/About/.cvsignore | 2 -- htdocs/Applications/.cvsignore | 2 -- htdocs/Bugs/.cvsignore | 2 -- htdocs/Contribute/.cvsignore | 2 -- htdocs/Credits/.cvsignore | 2 -- htdocs/Documentation/.cvsignore | 4 ---- htdocs/Documentation/mirror/.cvsignore | 2 -- htdocs/Download/.cvsignore | 2 -- htdocs/Links/.cvsignore | 2 -- htdocs/MailingLists/.cvsignore | 2 -- htdocs/images/abstractions/.cvsignore | 15 --------------- 12 files changed, 0 insertions(+), 39 deletions(-) diff --git a/htdocs/.cvsignore b/htdocs/.cvsignore deleted file mode 100644 index 7291bbd..0000000 --- a/htdocs/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.depend -*.html diff --git a/htdocs/About/.cvsignore b/htdocs/About/.cvsignore deleted file mode 100644 index 7291bbd..0000000 --- a/htdocs/About/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.depend -*.html diff --git a/htdocs/Applications/.cvsignore b/htdocs/Applications/.cvsignore deleted file mode 100644 index 7291bbd..0000000 --- a/htdocs/Applications/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.depend -*.html diff --git a/htdocs/Bugs/.cvsignore b/htdocs/Bugs/.cvsignore deleted file mode 100644 index 7291bbd..0000000 --- a/htdocs/Bugs/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.depend -*.html diff --git a/htdocs/Contribute/.cvsignore b/htdocs/Contribute/.cvsignore deleted file mode 100644 index 7291bbd..0000000 --- a/htdocs/Contribute/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.depend -*.html diff --git a/htdocs/Credits/.cvsignore b/htdocs/Credits/.cvsignore deleted file mode 100644 index 7291bbd..0000000 --- a/htdocs/Credits/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.depend -*.html diff --git a/htdocs/Documentation/.cvsignore b/htdocs/Documentation/.cvsignore deleted file mode 100644 index 4ebc7e2..0000000 --- a/htdocs/Documentation/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -*.html -.depend -bibliography.raw -citations.raw diff --git a/htdocs/Documentation/mirror/.cvsignore b/htdocs/Documentation/mirror/.cvsignore deleted file mode 100644 index 7291bbd..0000000 --- a/htdocs/Documentation/mirror/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.depend -*.html diff --git a/htdocs/Download/.cvsignore b/htdocs/Download/.cvsignore deleted file mode 100644 index 7291bbd..0000000 --- a/htdocs/Download/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.depend -*.html diff --git a/htdocs/Links/.cvsignore b/htdocs/Links/.cvsignore deleted file mode 100644 index 7291bbd..0000000 --- a/htdocs/Links/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.depend -*.html diff --git a/htdocs/MailingLists/.cvsignore b/htdocs/MailingLists/.cvsignore deleted file mode 100644 index 7291bbd..0000000 --- a/htdocs/MailingLists/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.depend -*.html diff --git a/htdocs/images/abstractions/.cvsignore b/htdocs/images/abstractions/.cvsignore deleted file mode 100644 index d5987fa..0000000 --- a/htdocs/images/abstractions/.cvsignore +++ /dev/null @@ -1,15 +0,0 @@ -abstractions.aux -abstractions.dvi -abstractions.log -abstractions.ps -abstractions_bboxes.gif -abstractions_bdiffs.gif -abstractions_noabstr.gif -abstractions_octagons.gif -abstractions_polys.gif -abstractions_rcongrs.gif -abstractions_scongrs.gif -abstractions_signs.gif -abstractions_tcongrs.gif -abstractions_zpolys1.gif -abstractions_zpolys2.gif

1 0