August 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Missing sections added.
by Roberto Bagnara 02 Aug '10

02 Aug '10

Module: ppl/ppl Branch: master Commit: a2765aa095520c639466ba9e8bc27bb77e231d13 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a2765aa09552… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Aug 2 10:06:57 2010 +0200 Missing sections added. --- doc/definitions.dox | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/definitions.dox b/doc/definitions.dox index 7cdb3cd..b94d2e8 100644 --- a/doc/definitions.dox +++ b/doc/definitions.dox @@ -439,12 +439,24 @@ that are consistent with respect to the desired results. \section Approximating_Integers Approximating Integers -FIXME(0.11): to be written. +The Parma Polyhedra Library provides support for approximating +integer computations using the geometric descriptors it provides. +In this section we briefly explain these facilities. \subsection Dropping_Non_Integer_Points Dropping Non-Integer Points -FIXME(0.11): to be written. +When a geometric descriptor is used to approximate integer quantities, +all the points with non-integral coordinates represent an imprecision +of the description. Of course, removing all these points may be +impossible (because of convexity) or too expensive. The PPL provides +the operator <CODE>drop_some_non_integer_points</CODE> to possibly +tighten a descriptor by dropping some points with non-integer +coordinates, using algorithms whose complexity is bounded by +a parameter. The set of dimensions that represent integer quantities +can be optionally specified. It is worth to stress the role of +<EM>some</EM> in the operator name: in general no optimality guarantee +is provided. \subsection Approximating_Bounded_Integers Approximating Bounded Integers @@ -502,8 +514,6 @@ Supported overflow behaviors are: </DD> </DL> -FIXME(0.11): to be continued. - \subsubsection Wrapping_Operator Wrapping Operator

1 0

[GIT] ppl/ppl(master): Updated.
by Roberto Bagnara 02 Aug '10

02 Aug '10

Module: ppl/ppl Branch: master Commit: b99dd92358b6e510c335c70f87767f92a6728936 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b99dd92358b6… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Aug 2 09:17:16 2010 +0200 Updated. --- Watchdog/config.guess | 4 ++-- config.guess | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Watchdog/config.guess b/Watchdog/config.guess index 115f944..4e621ac 100755 --- a/Watchdog/config.guess +++ b/Watchdog/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2010-04-03' +timestamp='2010-07-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -552,7 +552,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 diff --git a/config.guess b/config.guess index 115f944..4e621ac 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2010-04-03' +timestamp='2010-07-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -552,7 +552,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000

1 0

[GIT] ppl/ppl(master): FIXMEs resolved.
by Roberto Bagnara 02 Aug '10

02 Aug '10

Module: ppl/ppl Branch: master Commit: fc8238d53a79691953a8533c79362fcfc7bc6244 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fc8238d53a79… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Aug 2 08:32:33 2010 +0200 FIXMEs resolved. --- src/Grid.defs.hh | 18 ++++++------------ src/Grid_public.cc | 23 +++++++++-------------- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/Grid.defs.hh b/src/Grid.defs.hh index 8ce547c..062d3ae 100644 --- a/src/Grid.defs.hh +++ b/src/Grid.defs.hh @@ -1564,21 +1564,18 @@ public: bool wrap_individually = true); /*! \brief - Possibly tightens \p *this by dropping some points with non-integer + Possibly tightens \p *this by dropping all points with non-integer coordinates. \param complexity - The maximal complexity of any algorithms used. - - \note - Currently there is no optimality guarantee, not even if - \p complexity is <CODE>ANY_COMPLEXITY</CODE>. + This argument is ignored as the algorithm used has polynomial + complexity. */ void drop_some_non_integer_points(Complexity_Class complexity = ANY_COMPLEXITY); /*! \brief - Possibly tightens \p *this by dropping some points with non-integer + Possibly tightens \p *this by dropping all points with non-integer coordinates for the space dimensions corresponding to \p vars. \param vars @@ -1586,11 +1583,8 @@ public: can be discarded. \param complexity - The maximal complexity of any algorithms used. - - \note - Currently there is no optimality guarantee, not even if - \p complexity is <CODE>ANY_COMPLEXITY</CODE>. + This argument is ignored as the algorithm used has polynomial + complexity. */ void drop_some_non_integer_points(const Variables_Set& vars, Complexity_Class complexity diff --git a/src/Grid_public.cc b/src/Grid_public.cc index 10c7843..e85cf9a 100644 --- a/src/Grid_public.cc +++ b/src/Grid_public.cc @@ -2852,30 +2852,21 @@ PPL::Grid::wrap_assign(const Variables_Set& vars, } } -// FIXME(0.11): Check if this is the correct interpretation of the -// specification. -// By adding integral congruences for each dimension to the congruence system, -// defining \p *this, the grid will keep only those points that have integral -// coordinates. All points in \p *this with non-integral coordinates are -// removed. void PPL::Grid::drop_some_non_integer_points(Complexity_Class) { if (marked_empty() || space_dim == 0) return; + // By adding integral congruences for each dimension to the + // congruence system, defining \p *this, the grid will keep only + // those points that have integral coordinates. All points in \p + // *this with non-integral coordinates are removed. for (dimension_type i = space_dim; i-- > 0; ) add_congruence(Variable(i) %= 0); PPL_ASSERT(OK()); } -// FIXME(0.11): Check if this is the correct interpretation of the -// specification. -// By adding the integral congruences for each dimension in vars -// to the congruence system defining \p *this, the grid will keep -// only those points that have integer coordinates for all the -// dimensions in vars. All points in \p *this with non-integral coordinates -// for the dimensions in vars are removed. void PPL::Grid::drop_some_non_integer_points(const Variables_Set& vars, Complexity_Class) { @@ -2888,6 +2879,11 @@ PPL::Grid::drop_some_non_integer_points(const Variables_Set& vars, if (marked_empty() || min_space_dim == 0) return; + // By adding the integral congruences for each dimension in vars to + // the congruence system defining \p *this, the grid will keep only + // those points that have integer coordinates for all the dimensions + // in vars. All points in \p *this with non-integral coordinates for + // the dimensions in vars are removed. for (Variables_Set::const_iterator i = vars.begin(), vars_end = vars.end(); i != vars.end(); ++i) add_congruence(Variable(*i) %= 0); @@ -2895,7 +2891,6 @@ PPL::Grid::drop_some_non_integer_points(const Variables_Set& vars, PPL_ASSERT(OK()); } - /*! \relates Parma_Polyhedra_Library::Grid */ std::ostream& PPL::IO_Operators::operator<<(std::ostream& s, const Grid& gr) {

1 0

[GIT] ppl/ppl(master): Commented out code concerning affine spaces.
by Roberto Bagnara 01 Aug '10

01 Aug '10

Module: ppl/ppl Branch: master Commit: 170fcba9094733b6fca9475ce1d57a2b095162d9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=170fcba90947… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Aug 1 23:13:47 2010 +0200 Commented out code concerning affine spaces. --- .../constraintsproduct1.cc | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/Partially_Reduced_Product/constraintsproduct1.cc b/tests/Partially_Reduced_Product/constraintsproduct1.cc index 6d592a3..91c9025 100644 --- a/tests/Partially_Reduced_Product/constraintsproduct1.cc +++ b/tests/Partially_Reduced_Product/constraintsproduct1.cc @@ -28,7 +28,9 @@ typedef NNC_Polyhedron Poly; typedef Domain_Product<Poly, Grid>::Constraints_Product PolyGrid; typedef Domain_Product<Poly, TBox>::Constraints_Product PolyBox; +#if 0 typedef Domain_Product<Affine_Space, TBox>::Constraints_Product AffBox; +#endif typedef Domain_Product<Grid, TBox>::Constraints_Product GridBox; namespace { @@ -294,6 +296,7 @@ test08() { return ok; } +#if 0 bool test09() { Variable A(0); @@ -326,6 +329,7 @@ test09() { return ok; } +#endif // space_dimension() bool @@ -348,6 +352,7 @@ test10() { return cons_ok; } +#if 0 // Example taken from SenS07 (figure 5(a) bool test11() { @@ -527,6 +532,7 @@ test12() { return ok; } +#endif } // namespace @@ -539,8 +545,8 @@ BEGIN_MAIN DO_TEST(test06); DO_TEST(test07); DO_TEST(test08); - DO_TEST(test09); +//DO_TEST(test09); DO_TEST(test10); - DO_TEST_F8(test11); - DO_TEST(test12); +//DO_TEST_F8(test11); +//DO_TEST(test12); END_MAIN

1 0

[GIT] ppl/ppl(master): Avoid variable length arrays: use a std:: vector instead.
by Enea Zaffanella 01 Aug '10

01 Aug '10

Module: ppl/ppl Branch: master Commit: 38a6cd94ccc6c445875353afd22eac46e44bbcc0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=38a6cd94ccc6… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Aug 1 23:08:32 2010 +0200 Avoid variable length arrays: use a std::vector instead. --- demos/ppl_pips/ppl_pips.cc | 53 ++++++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 9487dff..46a4fe9 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -215,14 +215,17 @@ public: pip_display_sol(out, solution, params, vars, pip.space_dimension()); } + typedef std::vector<PPL::Coefficient> Coeff_Vector; + typedef std::vector<int> Int_Vector; + bool update_pip(PPL::dimension_type num_vars, PPL::dimension_type num_params, PPL::dimension_type num_constraints, PPL::dimension_type num_ctx_rows, - const PPL::Coefficient* constraints, - const PPL::Coefficient* context, - const int constraint_type[], - const int ctx_type[], + const Coeff_Vector& constraints, + const Coeff_Vector& context, + const Int_Vector& constraint_type, + const Int_Vector& ctx_type, PPL::dimension_type bignum_column) { pip.add_space_dimensions_and_embed(num_vars, num_params); for (PPL::dimension_type k = 0, i = 0; i < num_constraints; ++i) { @@ -275,15 +278,14 @@ public: PPL_ASSERT(num_params >= 2); num_params -= 2; - PPL::Coefficient context[num_ctx_rows][num_params+1]; - int ctx_type[num_ctx_rows]; - + Coeff_Vector context(num_ctx_rows * (1+num_params)); + Int_Vector ctx_type(num_ctx_rows); for (PPL::dimension_type i = 0; i < num_ctx_rows; ++i) { getline_nocomment(in, line); std::istringstream sin(line); sin >> ctx_type[i]; for (PPL::dimension_type j = 0; j <= num_params; ++j) { - sin >> context[i][j]; + sin >> context[i * num_ctx_rows + j]; } } @@ -305,14 +307,14 @@ public: constraint_width -= 1; num_vars = constraint_width - num_params - 1; - PPL::Coefficient constraints[num_constraints][constraint_width]; - int constraint_type[num_constraints]; + Coeff_Vector constraints(num_constraints * constraint_width); + Int_Vector constraint_type(num_constraints); for (PPL::dimension_type i = 0; i < num_constraints; ++i) { getline_nocomment(in, line); std::istringstream sin(line); sin >> constraint_type[i]; for (PPL::dimension_type j = 0; j < constraint_width; ++j) { - sin >> constraints[i][j]; + sin >> constraints[i * constraint_width + j]; } } @@ -322,7 +324,7 @@ public: bool result = update_pip(num_vars, num_params, num_constraints, num_ctx_rows, - &constraints[0][0], &context[0][0], + constraints, context, constraint_type, ctx_type, bignum_column); return result; @@ -374,25 +376,25 @@ public: if (!expect(in, '(')) return false; PPL::dimension_type constraint_width = num_vars+num_params+1; - PPL::Coefficient constraints[num_constraints][constraint_width]; - int constraint_type[num_constraints]; + Coeff_Vector constraints(num_constraints * constraint_width); + Int_Vector constraint_type(num_constraints); for (PPL::dimension_type i = 0; i < num_constraints; ++i) constraint_type[i] = 1; for (PPL::dimension_type i = 0; i < num_constraints; ++i) - if (!read_vector(in, constraint_width, num_vars, constraints[i])) + if (!read_vector(in, i, constraint_width, num_vars, constraints)) return false; - PPL::Coefficient context[num_ctx_rows][num_params+1]; - int ctx_type[num_ctx_rows]; + Coeff_Vector context(num_ctx_rows * (1+num_params)); + Int_Vector ctx_type(num_ctx_rows); for (PPL::dimension_type i = 0; i < num_ctx_rows; ++i) ctx_type[i] = 1; for (PPL::dimension_type i = 0; i < num_ctx_rows; ++i) - if (!read_vector(in, num_params+1, num_params, context[i])) + if (!read_vector(in, i, num_params+1, num_params, context)) return false; bool result = update_pip(num_vars, num_params, num_constraints, num_ctx_rows, - &constraints[0][0], &context[0][0], + constraints, context, constraint_type, ctx_type, bignum_column); return result; @@ -424,9 +426,11 @@ protected: return a == c; } - static bool read_vector(std::istream& in, PPL::dimension_type size, + static bool read_vector(std::istream& in, + PPL::dimension_type row_index, + PPL::dimension_type row_size, PPL::dimension_type cst_col, - PPL::Coefficient tab[]) { + Coeff_Vector& tab) { if (!expect(in, '#')) return false; if (!expect(in, '[')) @@ -435,13 +439,14 @@ protected: if (getline(in, s, ']').bad()) return false; std::istringstream iss(s); - PPL::dimension_type k = 0; + PPL::dimension_type start_index = row_index * row_size; + PPL::dimension_type k = start_index; for (PPL::dimension_type i = 0; i < cst_col; ++i) if (!(iss >> tab[k++])) return false; - if (!(iss >> tab[size-1])) + if (!(iss >> tab[start_index + row_size - 1])) return false; - for (PPL::dimension_type i = cst_col + 1; i < size; ++i) + for (PPL::dimension_type i = cst_col + 1; i < row_size; ++i) if (!(iss >> tab[k++])) return false; return true;

1 0

[GIT] ppl/ppl(master): Commented out code concerning affine spaces.
by Roberto Bagnara 01 Aug '10

01 Aug '10

Module: ppl/ppl Branch: master Commit: 304c0dc5f4c445888e6cd17d5b60d8f90358c28c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=304c0dc5f4c4… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Aug 1 22:43:15 2010 +0200 Commented out code concerning affine spaces. --- tests/ppl_test.cc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tests/ppl_test.cc b/tests/ppl_test.cc index a115b29..7f609f3 100644 --- a/tests/ppl_test.cc +++ b/tests/ppl_test.cc @@ -352,11 +352,13 @@ print_constraints(const Polyhedron& ph, print_constraints(ph.constraints(), intro, s); } +#if 0 void print_constraints(const Affine_Space& affs, const std::string& intro, std::ostream& s) { print_constraints(affs.constraints(), intro, s); } +#endif void print_constraints(const Constraint_System& cs,

1 0

[GIT] ppl/ppl(master): Commented out code concerning affine spaces.
by Roberto Bagnara 01 Aug '10

01 Aug '10

Module: ppl/ppl Branch: master Commit: 43d231e2876628411e04c627c2e66436311b407e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=43d231e28766… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Aug 1 20:00:30 2010 +0200 Commented out code concerning affine spaces. --- tests/ppl_test.hh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tests/ppl_test.hh b/tests/ppl_test.hh index fa4bd88..449e137 100644 --- a/tests/ppl_test.hh +++ b/tests/ppl_test.hh @@ -972,10 +972,12 @@ print_constraints(const Polyhedron& ph, const std::string& intro = "", std::ostream& s = nout); +#if 0 void print_constraints(const Affine_Space& affs, const std::string& intro = "", std::ostream& s = nout); +#endif template <typename Interval> void

1 0

[GIT] ppl/ppl(master): Set aside the domain of affine spaces, for the time being.
by Roberto Bagnara 01 Aug '10

01 Aug '10

Module: ppl/ppl Branch: master Commit: 63f34f91afd96249825c7ba2371f3e973129e55e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=63f34f91afd9… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Aug 1 19:29:13 2010 +0200 Set aside the domain of affine spaces, for the time being. --- TODO | 2 +- src/Affine_Space.defs.hh | 4 ++-- src/Makefile.am | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/TODO b/TODO index 76d679e..199ef0e 100644 --- a/TODO +++ b/TODO @@ -4,7 +4,7 @@ Enhancements for PPL 0.12 or later versions - Make all the *affine*image() methods uniform as far as the specification is concerned. -- Add the domain of circular linear progressions. +- Add the domains of bounded integers and affine spaces. - Finish the domain of intervals. - Intervals are best instantiated with checked numbers with particular policies: review all the interfaced boxes, diff --git a/src/Affine_Space.defs.hh b/src/Affine_Space.defs.hh index fa42333..99f0adb 100644 --- a/src/Affine_Space.defs.hh +++ b/src/Affine_Space.defs.hh @@ -129,7 +129,7 @@ bool operator!=(const Affine_Space& x, const Affine_Space& y); Variable y(1); \endcode - FIXME(0.11): revise the contents below this point of this comment block. + FIXME: revise the contents below this point of this comment block. \par Example 1 The following code builds an affine space corresponding to the even integer @@ -686,7 +686,7 @@ public: */ bool bounds_from_below(const Linear_Expression& expr) const; - // FIXME(0.11): revise all the comment blocks below this one. + // FIXME: revise all the comment blocks below this one. /*! \brief Returns <CODE>true</CODE> if and only if \p *this is not empty and diff --git a/src/Makefile.am b/src/Makefile.am index f726e90..06e9ad3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -161,7 +161,6 @@ BHRZ03_Certificate.types.hh \ H79_Certificate.types.hh \ Grid_Certificate.types.hh \ Partial_Function.types.hh \ -Affine_Space.types.hh \ Polyhedron.types.hh \ C_Polyhedron.types.hh \ NNC_Polyhedron.types.hh \ @@ -291,8 +290,6 @@ Grid_Certificate.defs.hh \ Grid_Certificate.inlines.hh \ Partial_Function.defs.hh \ Partial_Function.inlines.hh \ -Affine_Space.defs.hh \ -Affine_Space.inlines.hh \ Polyhedron.defs.hh \ Ph_Status.inlines.hh \ Polyhedron.inlines.hh \ @@ -397,7 +394,6 @@ BHRZ03_Certificate.cc \ H79_Certificate.cc \ Grid_Certificate.cc \ Partial_Function.cc \ -Affine_Space.cc \ Polyhedron_nonpublic.cc \ Polyhedron_public.cc \ Polyhedron_chdims.cc \

1 0

[GIT] ppl/ppl(master): Implemented the constructors from generator systems.
by Roberto Bagnara 01 Aug '10

01 Aug '10

Module: ppl/ppl Branch: master Commit: 39c378347808c8a522f00b53cc8eac1123486229 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=39c378347808… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Aug 1 18:30:57 2010 +0200 Implemented the constructors from generator systems. --- src/Affine_Space.cc | 76 +++++++++++++++++++++++++++++++------------ src/Affine_Space.defs.hh | 39 +--------------------- src/Affine_Space.inlines.hh | 29 ++++++++++++---- 3 files changed, 79 insertions(+), 65 deletions(-) diff --git a/src/Affine_Space.cc b/src/Affine_Space.cc index cfd81e1..75087b7 100644 --- a/src/Affine_Space.cc +++ b/src/Affine_Space.cc @@ -23,33 +23,67 @@ site: http://www.cs.unipr.it/ppl/ . */ #include <ppl-config.h> #include "Affine_Space.defs.hh" -#if 0 -#include "Topology.hh" -#include "Scalar_Products.defs.hh" - -#include "assert.hh" -#endif #include <iostream> namespace PPL = Parma_Polyhedra_Library; -PPL::Affine_Space::Affine_Space(const Affine_Space& y, - Complexity_Class complexity) - : gr(y.gr, complexity) { -} - -PPL::Affine_Space::Affine_Space(const Constraint_System& cs) - : gr(cs) { -} - -PPL::Affine_Space::Affine_Space(Constraint_System& cs, Recycle_Input ri) - : gr(cs, ri) { +PPL::Affine_Space::Affine_Space(const Generator_System& gs) { + dimension_type space_dim = gs.space_dimension(); + // First find a point or closure point and convert it to a + // grid point and add to the (initially empty) set of grid generators. + Grid_Generator_System ggs(space_dim); + Linear_Expression point_expr; + PPL_DIRTY_TEMP_COEFFICIENT(point_divisor); + for (Generator_System::const_iterator g = gs.begin(), + gs_end = gs.end(); g != gs_end; ++g) { + if (g->is_ray()) + throw std::invalid_argument("Affine_Space::Affine_Space(gs):\n" + "gs contains rays."); + else if (g->is_point() || g->is_closure_point()) { + for (dimension_type i = space_dim; i-- > 0; ) { + const Variable v(i); + point_expr += g->coefficient(v) * v; + point_divisor = g->divisor(); + } + ggs.insert(grid_point(point_expr, point_divisor)); + goto non_empty; + } + } + // No (closure) point was found. + Grid(EMPTY).swap(gr); + return; + + non_empty: + // Add a grid line for each line. If the generator is a (closure) + // point, the grid line must have the direction given by a line + // that joins the grid point already inserted and the new point. + PPL_DIRTY_TEMP_COEFFICIENT(coeff); + PPL_DIRTY_TEMP_COEFFICIENT(g_divisor); + for (Generator_System::const_iterator g = gs.begin(), + gs_end = gs.end(); g != gs_end; ++g) { + Linear_Expression e; + if (g->is_point() || g->is_closure_point()) { + g_divisor = g->divisor(); + for (dimension_type i = space_dim; i-- > 0; ) { + const Variable v(i); + coeff = point_expr.coefficient(v) * g_divisor; + coeff -= g->coefficient(v) * point_divisor; + e += coeff * v; + } + if (e.all_homogeneous_terms_are_zero()) + continue; + } + else + for (dimension_type i = space_dim; i-- > 0; ) { + const Variable v(i); + e += g->coefficient(v) * v; + } + ggs.insert(grid_line(e)); + } + Grid(ggs).swap(gr); + PPL_ASSERT(OK()); } -PPL::Affine_Space::Affine_Space(const Polyhedron& ph, - Complexity_Class complexity) - : gr(ph, complexity) { -} PPL::Affine_Space& PPL::Affine_Space::operator=(const Affine_Space& y) { diff --git a/src/Affine_Space.defs.hh b/src/Affine_Space.defs.hh index c7bc820..fa42333 100644 --- a/src/Affine_Space.defs.hh +++ b/src/Affine_Space.defs.hh @@ -24,30 +24,20 @@ site: http://www.cs.unipr.it/ppl/ . */ #define PPL_Affine_Space_defs_hh 1 #include "Affine_Space.types.hh" -#if 0 -#include "globals.defs.hh" #include "Variable.defs.hh" #include "Variables_Set.types.hh" -#include "Linear_Expression.defs.hh" -#include "Constraint.defs.hh" +#include "Linear_Expression.types.hh" +#include "Constraint.types.hh" #include "Constraint_System.defs.hh" #include "Constraint_System.inlines.hh" #include "Congruence_System.defs.hh" #include "Congruence_System.inlines.hh" -#include "Grid_Generator_System.defs.hh" -#include "Grid_Generator_System.inlines.hh" -#include "Grid_Generator.types.hh" #include "Poly_Con_Relation.defs.hh" #include "Poly_Gen_Relation.defs.hh" -#include "Grid_Certificate.types.hh" #include "Box.types.hh" -#include "Polyhedron.defs.hh" #include "Polyhedron.types.hh" -#include "Polyhedron.inlines.hh" #include "BD_Shape.types.hh" #include "Octagonal_Shape.types.hh" -#include <vector> -#endif #include "Grid.defs.hh" #include <iosfwd> @@ -1696,31 +1686,6 @@ protected: void throw_dimension_incompatible(const char* method, const char* as_name, const Affine_Space& as) const; -#if 0 - void throw_dimension_incompatible(const char* method, - const char* e_name, - const Linear_Expression& e) const; - void throw_dimension_incompatible(const char* method, - const char* cg_name, - const Congruence& cg) const; - void throw_dimension_incompatible(const char* method, - const char* c_name, - const Constraint& c) const; - void throw_dimension_incompatible(const char* method, - const char* g_name, - const Generator& g) const; - void throw_dimension_incompatible(const char* method, - const char* cgs_name, - const Congruence_System& cgs) const; - void throw_dimension_incompatible(const char* method, - const char* cs_name, - const Constraint_System& cs) const; - void throw_dimension_incompatible(const char* method, - const char* var_name, - Variable var) const; - void throw_dimension_incompatible(const char* method, - dimension_type required_space_dim) const; -#endif // Note: it has to be a static method, because it can be called inside // constructors (before actually constructing the grid object). diff --git a/src/Affine_Space.inlines.hh b/src/Affine_Space.inlines.hh index 97a65d2..1b4f595 100644 --- a/src/Affine_Space.inlines.hh +++ b/src/Affine_Space.inlines.hh @@ -37,16 +37,31 @@ Affine_Space::Affine_Space(dimension_type num_dimensions, } inline -Affine_Space::Affine_Space(const Generator_System& /*gs*/) { - // FIXME(0.11): implement by building the grid generators. - // Throw std::invalid_argument if `gs' contains rays. - abort(); +Affine_Space::Affine_Space(const Affine_Space& y, + Complexity_Class complexity) + : gr(y.gr, complexity) { +} + +inline +Affine_Space::Affine_Space(const Constraint_System& cs) + : gr(cs) { +} + +inline +Affine_Space::Affine_Space(Constraint_System& cs, Recycle_Input ri) + : gr(cs, ri) { +} + +inline +Affine_Space::Affine_Space(const Polyhedron& ph, + Complexity_Class complexity) + : gr(ph, complexity) { } inline -Affine_Space::Affine_Space(Generator_System& /*gs*/, Recycle_Input) { - // FIXME(0.11): implement by building the grid generators. - abort(); +Affine_Space::Affine_Space(Generator_System& gs, Recycle_Input) + : gr(EMPTY) { + Affine_Space(gs).swap(*this); } template <typename U>

1 0

[GIT] ppl/ppl(master): Inclusions fixed.
by Roberto Bagnara 01 Aug '10

01 Aug '10

Module: ppl/ppl Branch: master Commit: 5e53ad77d4ca05be5707ee31cde1e42e9db130fe URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5e53ad77d4ca… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Aug 1 18:25:59 2010 +0200 Inclusions fixed. --- src/Grid.defs.hh | 4 +--- src/Grid_public.cc | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Grid.defs.hh b/src/Grid.defs.hh index c51ffd0..8ce547c 100644 --- a/src/Grid.defs.hh +++ b/src/Grid.defs.hh @@ -28,7 +28,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Variable.defs.hh" #include "Variables_Set.types.hh" #include "Linear_Expression.defs.hh" -#include "Constraint.defs.hh" +#include "Constraint.types.hh" #include "Constraint_System.defs.hh" #include "Constraint_System.inlines.hh" #include "Congruence_System.defs.hh" @@ -40,9 +40,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Poly_Gen_Relation.defs.hh" #include "Grid_Certificate.types.hh" #include "Box.types.hh" -#include "Polyhedron.defs.hh" #include "Polyhedron.types.hh" -#include "Polyhedron.inlines.hh" #include "BD_Shape.types.hh" #include "Octagonal_Shape.types.hh" #include <vector> diff --git a/src/Grid_public.cc b/src/Grid_public.cc index ac0ac43..10c7843 100644 --- a/src/Grid_public.cc +++ b/src/Grid_public.cc @@ -25,7 +25,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Grid.defs.hh" #include "Topology.hh" #include "Scalar_Products.defs.hh" - +#include "Polyhedron.defs.hh" #include "assert.hh" #include <iostream>

1 0