May 2009 - PPL-devel - BUGSENG Mailman

Problems with test suite on alpha
by Michael Tautschnig 09 Sep '10

09 Sep '10

Hi PPL developers, I've reported problems with some test cases because of suspected gcc bugs on alpha earlier already. Now it seems that even more test cases are broken, most probably because of the very same bug (I suspect it to be http://gcc.gnu.org/bugzilla/show_bug.cgi?id=8966). My question now is: How to proceed? Shall I specifically disable the failing test cases by surrounding them with an #ifndef __alpha__ or disable the entire test suite on alpha? Thanks, Michael

2 6

Parametric integer linear programming solver
by Sebastian Pop 22 Nov '09

22 Nov '09

Hello, I would like to know whether there exists a parametric integer linear programming solver that can be called from the PPL interface, or how we could use from PPL an existing solver, like http://piplib.org We would need such a tool to improve the precision of the data dependence analysis of Graphite by computing the reaching definitions of array accesses. Thank you, Sebastian Pop -- AMD - GNU Tools

4 10

Re: [PPL-devel] Graphite build fails if PPL configured with --disable-shared
by Roberto Bagnara 08 Jul '09

08 Jul '09

Janis Johnson wrote: > On Mon, 2009-05-11 at 13:07 -0700, Ian Lance Taylor wrote: >> Another Graphite build issue: it appears that I must not use >> --disable-shared when I configure PPL. If I do use --disable-shared, I >> get this: >> >> /home/iant/gnu/ppl-0.10.2-install/lib/libppl_c.a(ppl_c_implementation_common.o): In function `finalize': >> /home/iant/gnu/ppl-0.10.2/interfaces/C/../../src/ppl.hh:1842: undefined reference to `operator delete(void*)' >> >> followed by thousands of similar errors. This is unfortunate, as it >> means that I must manually set LD_LIBRARY_PATH to the directory where >> the PPL library is installed. This also makes it harder for anybody >> else to run the compiler that I build. This needs to be fixed. > > I get around this by setting LDFLAGS for the ppl configure: > > LDFLAGS="-static" \ > ./configure \ > --prefix=$PREFIX \ > --build=powerpc-linux \ > --with-gnu-ld \ > --with-libgmp-prefix=$PREFIX \ > --with-libgmpxx-prefix=$PREFIX \ > --disable-shared I am not sure I understand: we trust that Libtool, which provides us with the --disable-shared option, will do the right thing. And it seems it does here: the static library is built and passes its checks. Perhaps you want something different from what --disable-shared promises, that is, not to build any shared libraries? > I copy libstdc++.a into the directory with the other GCC host > libraries (gmp/mpfr/ppl/cloog/mpc). > > Building these libraries is indeed quite painful. Any suggestion about how to improve the PPL is welcome. This, of course, applies also to the build machinery. All the best, Roberto -- Prof. Roberto Bagnara Computer Science Group Department of Mathematics, University of Parma, Italy http://www.cs.unipr.it/~bagnara/ mailto:bagnara@cs.unipr.it

6 8

[GIT] ppl/ppl(products): Further improvements to frequency() code.
by Patricia Hill 24 May '09

24 May '09

Module: ppl/ppl Branch: products Commit: a648638a1c5f2b288e03625b5dc07a2bc69d9bd8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a648638a1c5f… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 24 08:44:02 2009 +0100 Further improvements to frequency() code. --- src/BD_Shape.templates.hh | 6 ++++-- src/Box.templates.hh | 3 ++- src/Octagonal_Shape.templates.hh | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index ced24f6..c000d9e 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -825,7 +825,8 @@ BD_Shape<T>::frequency(const Linear_Expression& expr, // If `v' is constant, replace it in `le' by the value. numer_denom(tmp, num, den); le -= coeff*v; - le = den*le - num*coeff; + le *= den; + le -= num*coeff; val_den *= den; constant_v = true; continue; @@ -846,7 +847,8 @@ BD_Shape<T>::frequency(const Linear_Expression& expr, // So apply this equality to eliminate `v' in `le'. numer_denom(tmp, num, den); le -= coeff*v - coeff*vj; - le = den*le - num*coeff; + le *= den; + le -= num*coeff; val_den *= den; constant_v = true; break; diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 232b42d..a9e08ed 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -1409,7 +1409,8 @@ Box<ITV>::frequency(const Linear_Expression& expr, num = tmp.get_num(); den = tmp.get_den(); le -= coeff*v; - le = den*le + num*coeff; + le *= den; + le += num*coeff; val_den *= den; continue; } diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 437257f..5bfc43b 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -962,7 +962,8 @@ Octagonal_Shape<T>::frequency(const Linear_Expression& expr, numer_denom(m_i_ii, num, den); den *= 2; le -= coeff*v; - le = den*le - num*coeff; + le *= den; + le -= num*coeff; val_den *= den; constant_v = true; continue;

1 0

[GIT] ppl/ppl(products): Code for frequency() improved.
by Patricia Hill 24 May '09

24 May '09

Module: ppl/ppl Branch: products Commit: c5965cbb6eed173edfc9120168dce59764b19aee URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c5965cbb6eed… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 24 08:14:06 2009 +0100 Code for frequency() improved. --- src/BD_Shape.templates.hh | 2 +- src/Octagonal_Shape.templates.hh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 5c5168e..ced24f6 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -845,7 +845,7 @@ BD_Shape<T>::frequency(const Linear_Expression& expr, // and the difference with `v' in the BD shape is constant. // So apply this equality to eliminate `v' in `le'. numer_denom(tmp, num, den); - le = le - coeff*v + coeff*vj; + le -= coeff*v - coeff*vj; le = den*le - num*coeff; val_den *= den; constant_v = true; diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index b3faa2a..437257f 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -994,9 +994,9 @@ Octagonal_Shape<T>::frequency(const Linear_Expression& expr, // So apply this equality to eliminate `v' in `le'. numer_denom(m_i_j, num, den); le -= coeff*v; - le = le + coeff*vj; + le += coeff*vj; le *= den; - le = le - num*coeff; + le -= num*coeff; val_den *= den; constant_v = true; break; @@ -1013,9 +1013,9 @@ Octagonal_Shape<T>::frequency(const Linear_Expression& expr, // So apply this equality to eliminate `v' in `le'. numer_denom(m_i_j1, num, den); le -= coeff*v; - le = le - coeff*vj; + le -= coeff*vj; le *= den; - le = le - num*coeff; + le -= num*coeff; val_den *= den; constant_v = true; break;

1 0

[GIT] ppl/ppl(products): A new product called Shape_Preserving_Product added.
by Patricia Hill 24 May '09

24 May '09

Module: ppl/ppl Branch: products Commit: b01615895b5ccf6112b176ce96eda8c40928d275 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b01615895b5c… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 24 07:11:57 2009 +0100 A new product called Shape_Preserving_Product added. --- src/Partially_Reduced_Product.defs.hh | 53 +++++++ src/Partially_Reduced_Product.inlines.hh | 10 ++ src/Partially_Reduced_Product.templates.hh | 127 +++++++++++++---- src/Partially_Reduced_Product.types.hh | 3 + tests/Partially_Reduced_Product/Makefile.am | 17 ++- tests/Partially_Reduced_Product/congruences1.cc | 2 +- .../shapepreservingproduct1.cc | 151 ++++++++++++++++++++ 7 files changed, 336 insertions(+), 27 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=b0161589…

1 0

[GIT] ppl/ppl(products): The method frequency() added to the Affine_Space domain.
by Patricia Hill 24 May '09

24 May '09

Module: ppl/ppl Branch: products Commit: 68dd5db1d102fc5bd5157fc14124abc5c5bf9b43 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=68dd5db1d102… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat May 23 20:56:45 2009 +0100 The method frequency() added to the Affine_Space domain. --- src/Affine_Space.defs.hh | 33 +++++++++++++++++++++++++++++++++ src/Affine_Space.inlines.hh | 7 +++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/src/Affine_Space.defs.hh b/src/Affine_Space.defs.hh index 464936a..2a7a9e7 100644 --- a/src/Affine_Space.defs.hh +++ b/src/Affine_Space.defs.hh @@ -828,6 +828,39 @@ public: Coefficient& inf_n, Coefficient& inf_d, bool& minimum, Generator& point) const; + /*! \brief + Returns <CODE>true</CODE> if and only if \p *this is not empty and + \p expr is discrete in \p *this, in which case the maximum frequency + and the value for \p expr that is closest to zero are computed. + + \param expr + The linear expression for which the frequency is needed; + + \param freq_n + The numerator of the maximum frequency of \p expr; + + \param freq_d + The denominator of the maximum frequency of \p expr; + + \param val_n + The numerator of a value of \p expr at a point in the grid + that is closest to zero; + + \param val_d + The denominator of a value of \p expr at a point in the grid + that is closest to zero; + + \exception std::invalid_argument + Thrown if \p expr and \p *this are dimension-incompatible. + + If \p *this is empty or \p expr can take any real number in \p *this, + <CODE>false</CODE> is returned and \p freq_n, \p freq_d, + \p val_n and \p val_d are left untouched. + */ + bool frequency(const Linear_Expression& expr, + Coefficient& freq_n, Coefficient& freq_d, + Coefficient& val_n, Coefficient& val_d) const; + //! Returns <CODE>true</CODE> if and only if \p *this contains \p y. /*! \exception std::invalid_argument diff --git a/src/Affine_Space.inlines.hh b/src/Affine_Space.inlines.hh index 10a236c..b79e725 100644 --- a/src/Affine_Space.inlines.hh +++ b/src/Affine_Space.inlines.hh @@ -175,6 +175,13 @@ Affine_Space::minimize(const Linear_Expression& expr, return gr.minimize(expr, inf_n, inf_d, minimum, point); } +inline bool +Affine_Space::frequency(const Linear_Expression& expr, + Coefficient& freq_n, Coefficient& freq_d, + Coefficient& val_n, Coefficient& val_d) const { + return gr.frequency(expr, freq_n, freq_d, val_n, val_d); +} + /*! \relates Affine_Space */ inline bool operator!=(const Affine_Space& x, const Affine_Space& y) {

1 0

[GIT] ppl/ppl(products): Bug in frequency() for Octagonal shapes fixed.
by Patricia Hill 24 May '09

24 May '09

Module: ppl/ppl Branch: products Commit: 0ef46ef0cbc64d9f9a472d433abf01507fd078fd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0ef46ef0cbc6… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat May 23 20:55:47 2009 +0100 Bug in frequency() for Octagonal shapes fixed. --- src/Octagonal_Shape.templates.hh | 30 +++++++++++++++----- tests/Octagonal_Shape/frequency1.cc | 50 +++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 8 deletions(-) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 8793f09..b3faa2a 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -983,13 +983,8 @@ Octagonal_Shape<T>::frequency(const Linear_Expression& expr, const dimension_type cj = coherent_index(j); const dimension_type cjj = coherent_index(j+1); - // Check if we want the sum or difference constraint. - // If the coefficients for `v' and `vj' are the same, use - // the sum constraint, otherwise use the difference constraint. - bool same_sign = (sgn(coeff) == sgn(coeff_j)); - - Row_Reference m_j = (same_sign) ? *(m_begin + j + 1) : *(m_begin + j); - Row_Reference m_cj = (same_sign) ? *(m_begin + cjj) : *(m_begin + cj); + Row_Reference m_j = *(m_begin + j); + Row_Reference m_cj = *(m_begin + cj); const N& m_j_i = m_j[i]; const N& m_i_j = m_cj[ci]; if ((!is_plus_infinity(m_i_j) && !is_plus_infinity(m_j_i)) @@ -999,7 +994,26 @@ Octagonal_Shape<T>::frequency(const Linear_Expression& expr, // So apply this equality to eliminate `v' in `le'. numer_denom(m_i_j, num, den); le -= coeff*v; - le = (same_sign) ? le - coeff*vj : le + coeff*vj; + le = le + coeff*vj; + le *= den; + le = le - num*coeff; + val_den *= den; + constant_v = true; + break; + } + + m_j = *(m_begin + j + 1); + m_cj = *(m_begin + cjj); + const N& m_j_i1 = m_j[i]; + const N& m_i_j1 = m_cj[ci]; + if ((!is_plus_infinity(m_i_j1) && !is_plus_infinity(m_j_i1)) + && (is_additive_inverse(m_i_j1, m_j_i1))) { + // The coefficient for `vj' in `le' is not 0 + // and the constraint with `v' is an equality. + // So apply this equality to eliminate `v' in `le'. + numer_denom(m_i_j1, num, den); + le -= coeff*v; + le = le - coeff*vj; le *= den; le = le - num*coeff; val_den *= den; diff --git a/tests/Octagonal_Shape/frequency1.cc b/tests/Octagonal_Shape/frequency1.cc index 293cc8b..02a8754 100644 --- a/tests/Octagonal_Shape/frequency1.cc +++ b/tests/Octagonal_Shape/frequency1.cc @@ -243,6 +243,54 @@ test10() { return ok; } +bool +test11() { + Variable A(0); + Variable B(1); + Variable C(2); + + TOctagonal_Shape os(3); + os.add_constraint(2*A + 2*B == 1); + os.add_constraint(B - C == 1); + os.add_constraint(B <= 2); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (os.frequency(Linear_Expression(A - B + 2*C + 1), + num, den, valn, vald) + && num == 0 && den == 1 && valn == -1 && vald == 2); + print_constraints(os, "*** os ***"); + nout << "valn " << valn << ", vald " << vald << endl; + + return ok; +} + +bool +test12() { + Variable A(0); + Variable B(1); + Variable C(2); + + TOctagonal_Shape os(3); + os.add_constraint(2*A - 2*B == 1); + os.add_constraint(B + C == 1); + os.add_constraint(B <= 2); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (os.frequency(Linear_Expression(A + B + 2*C + 1), + num, den, valn, vald) + && num == 0 && den == 1 && valn == 7 && vald == 2); + print_constraints(os, "*** os ***"); + nout << "valn " << valn << ", vald " << vald << endl; + + return ok; +} + } // namespace BEGIN_MAIN @@ -256,4 +304,6 @@ BEGIN_MAIN DO_TEST(test08); DO_TEST(test09); DO_TEST(test10); + DO_TEST(test11); + DO_TEST(test12); END_MAIN

1 0

[GIT] ppl/ppl(products): Added the method frequency() to the Box domain.
by Patricia Hill 22 May '09

22 May '09

Module: ppl/ppl Branch: products Commit: 46be509da515e0e7f8909d4a31846876b00bfa02 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=46be509da515… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri May 22 15:32:07 2009 +0100 Added the method frequency() to the Box domain. --- src/Box.defs.hh | 33 ++++++++ src/Box.templates.hh | 73 ++++++++++++++++ tests/Box/Makefile.am | 3 + tests/Box/frequency1.cc | 210 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 319 insertions(+), 0 deletions(-) diff --git a/src/Box.defs.hh b/src/Box.defs.hh index 2981336..217f55d 100644 --- a/src/Box.defs.hh +++ b/src/Box.defs.hh @@ -682,6 +682,39 @@ public: Generator& g) const; /*! \brief + Returns <CODE>true</CODE> if and only if \p *this is not empty and + \p expr is discrete in \p *this, in which case the maximum frequency + and the value for \p expr that is closest to zero are computed. + + \param expr + The linear expression for which the frequency is needed; + + \param freq_n + The numerator of the maximum frequency of \p expr; + + \param freq_d + The denominator of the maximum frequency of \p expr; + + \param val_n + The numerator of a value of \p expr at a point in the grid + that is closest to zero; + + \param val_d + The denominator of a value of \p expr at a point in the grid + that is closest to zero; + + \exception std::invalid_argument + Thrown if \p expr and \p *this are dimension-incompatible. + + If \p *this is empty or \p expr can take any real number in \p *this, + <CODE>false</CODE> is returned and \p freq_n, \p freq_d, + \p val_n and \p val_d are left untouched. + */ + bool frequency(const Linear_Expression& expr, + Coefficient& freq_n, Coefficient& freq_d, + Coefficient& val_n, Coefficient& val_d) const; + + /*! \brief Returns <CODE>true</CODE> if and only if \p *this contains \p y. \exception std::invalid_argument diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 9918363..232b42d 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -1355,6 +1355,79 @@ Box<ITV>::contains_integer_point() const { template <typename ITV> bool +Box<ITV>::frequency(const Linear_Expression& expr, + Coefficient& freq_n, Coefficient& freq_d, + Coefficient& val_n, Coefficient& val_d) const { + dimension_type space_dim = space_dimension(); + // The dimension of `expr' must be at most the dimension of *this. + if (space_dim < expr.space_dimension()) + throw_dimension_incompatible("frequency(e, ...)", "e", expr); + + // Check if `expr' has a constant value. + // If it is constant, set the frequency `freq_n' to 0 + // and return true. Otherwise the values for \p expr + // are not discrete so return false. + + // Space dimension = 0: if empty, then return false; + // otherwise the frequency is 0 and the value is the inhomogeneous term. + if (space_dim == 0) { + if (is_empty()) + return false; + freq_n = 0; + freq_d = 1; + val_n = expr.inhomogeneous_term(); + val_d = 1; + return true; + } + + // For an empty Box, we simply return false. + if (marked_empty()) + return false; + + // The Box has at least 1 dimension and is not empty. + PPL_DIRTY_TEMP_COEFFICIENT(coeff); + PPL_DIRTY_TEMP_COEFFICIENT(num); + PPL_DIRTY_TEMP_COEFFICIENT(den); + PPL_DIRTY_TEMP0(mpq_class, tmp); + Linear_Expression le = expr; + + PPL_DIRTY_TEMP_COEFFICIENT(val_den); + val_den = 1; + + for (dimension_type i = space_dim; i-- > 0; ) { + const Variable v(i); + coeff = le.coefficient(v); + if (coeff == 0) { + continue; + } + + const ITV& seq_i = seq[i]; + // Check if `v' is constant in the BD shape. + if (seq_i.is_singleton()) { + // If `v' is constant, replace it in `le' by the value. + assign_r(tmp, seq_i.lower(), ROUND_NOT_NEEDED); + num = tmp.get_num(); + den = tmp.get_den(); + le -= coeff*v; + le = den*le + num*coeff; + val_den *= den; + continue; + } + // The expression `expr' is not constant. + return false; + } + + // The expression `expr' is constant. + freq_n = 0; + freq_d = 1; + + // Reduce `val_n' and `val_d'. + normalize2(le.inhomogeneous_term(), val_den, val_n, val_d); + return true; +} + +template <typename ITV> +bool Box<ITV>::constrains(Variable var) const { // `var' should be one of the dimensions of the polyhedron. const dimension_type var_space_dim = var.space_dimension(); diff --git a/tests/Box/Makefile.am b/tests/Box/Makefile.am index 965ee15..bd37972 100644 --- a/tests/Box/Makefile.am +++ b/tests/Box/Makefile.am @@ -77,6 +77,7 @@ empty1 \ equality1 \ expandspacedim1 \ foldspacedims1 \ +frequency1 \ frombdshape1 \ frombox1 \ fromgensys1 \ @@ -211,6 +212,8 @@ expandspacedim1_SOURCES = expandspacedim1.cc foldspacedims1_SOURCES = foldspacedims1.cc +frequency1_SOURCES = frequency1.cc + frombdshape1_SOURCES = frombdshape1.cc frombox1_SOURCES = frombox1.cc diff --git a/tests/Box/frequency1.cc b/tests/Box/frequency1.cc new file mode 100644 index 0000000..9b03553 --- /dev/null +++ b/tests/Box/frequency1.cc @@ -0,0 +1,210 @@ +/* Test Box::frequency(). + Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +#include "ppl_test.hh" + +using namespace Parma_Polyhedra_Library::IO_Operators; + +namespace { + +// Universe and empty bd shape. +bool +test01() { + Variable A(0); + + TBox box1(1); + + TBox box2(1, EMPTY); + + Coefficient num1; + Coefficient den1; + Coefficient valn1; + Coefficient vald1; + Coefficient num2; + Coefficient den2; + Coefficient valn2; + Coefficient vald2; + bool ok = (!box1.frequency(A, num1, den1, valn1, vald1) + && !box2.frequency(A, num2, den2, valn2, vald2)); + print_constraints(box1, "*** box1 ***"); + print_constraints(box2, "*** box2 ***"); + + return ok; +} + +// 0-dimension polyhedra. +bool +test02() { + TBox box1(0); + + TBox box2(0, EMPTY); + + Coefficient num1; + Coefficient den1; + Coefficient valn1; + Coefficient vald1; + Coefficient num2; + Coefficient den2; + Coefficient valn2; + Coefficient vald2; + bool ok = (box1.frequency(Linear_Expression(3), num1, den1, valn1, vald1) + && num1 == 0 && den1 == 1 && valn1 == 3 && vald1 == 1 + && !box2.frequency(Linear_Expression(3), num2, den2, valn2, vald2)); + print_constraints(box1, "*** box1 ***"); + print_constraints(box2, "*** box2 ***"); + + return ok; +} + +// Non-relational test. +bool +test03() { + Variable A(0); + + TBox box(1); + box.add_constraint(A == 0); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (box.frequency(Linear_Expression(A), num, den, valn, vald) + && num == 0 && den == 1 && valn == 0 && vald == 1); + print_constraints(box, "*** box ***"); + + return ok; +} + +bool +test04() { + Variable A(0); + Variable B(1); + + TBox box(2); + box.add_constraint(A >= 0); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (!box.frequency(Linear_Expression(A), num, den, valn, vald)); + print_constraints(box, "*** box ***"); + + return ok; +} + +bool +test05() { + Variable A(0); + Variable B(1); + + TBox box(2); + box.add_constraint(A <= 0); + box.add_constraint(B >= 5); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (!box.frequency(Linear_Expression(B), num, den, valn, vald)); + print_constraints(box, "*** box ***"); + + return ok; +} + +bool +test06() { + Variable A(0); + Variable B(1); + + TBox box(2); + box.add_constraint(2*A == 1); + box.add_constraint(B == 2); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (box.frequency(Linear_Expression(A + B - 3), num, den, valn, vald) + && num == 0 && den == 1 && valn == -1 && vald == 2); + print_constraints(box, "*** box ***"); + nout << "valn " << valn << ", vald " << vald << endl; + + return ok; +} + +bool +test07() { + Variable A(0); + Variable B(1); + + TBox box(2); + box.add_constraint(A <= 1); + box.add_constraint(A >= 0); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (!box.frequency(Linear_Expression(A - B), num, den, valn, vald)); + print_constraints(box, "*** box ***"); + + return ok; +} + +bool +test08() { + Variable A(0); + Variable B(1); + Variable C(2); + + TBox box(3); + box.add_constraint(A == 1); + box.add_constraint(2*B == -1); + box.add_constraint(3*C == 2); + box.add_constraint(B <= 2); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (box.frequency(Linear_Expression(A - B + C + 1), + num, den, valn, vald) + && num == 0 && den == 1 && valn == 19 && vald == 6); + print_constraints(box, "*** box ***"); + nout << "valn " << valn << ", vald " << vald << endl; + + return ok; +} + +} // namespace + +BEGIN_MAIN + DO_TEST(test01); + DO_TEST(test02); + DO_TEST(test03); + DO_TEST(test04); + DO_TEST(test05); + DO_TEST(test06); + DO_TEST(test07); + DO_TEST(test08); +END_MAIN

1 0

[GIT] ppl/ppl(products): Added the method frequency() to the Octagonal shape domain.
by Patricia Hill 22 May '09

22 May '09

Module: ppl/ppl Branch: products Commit: f21ee4e62c55773048617a12a1f1dd8bae349ff9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f21ee4e62c55… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri May 22 11:01:10 2009 +0100 Added the method frequency() to the Octagonal shape domain. Improved the code for the same method for BD shapes. Corrected some typos in comments in these files. --- src/BD_Shape.templates.hh | 48 ++++--- src/Octagonal_Shape.defs.hh | 33 +++++ src/Octagonal_Shape.templates.hh | 141 +++++++++++++++++++- tests/Octagonal_Shape/Makefile.am | 3 + tests/Octagonal_Shape/frequency1.cc | 259 +++++++++++++++++++++++++++++++++++ 5 files changed, 458 insertions(+), 26 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=f21ee4e6…

1 0