June 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(pip): Fixed typo.
by Abramo Bagnara 14 Jun '09

14 Jun '09

Module: ppl/ppl Branch: pip Commit: 235b8ee1963d6a1e82e38d84aa867d600cb0ae66 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=235b8ee1963d… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sun Jun 14 22:57:25 2009 +0200 Fixed typo. --- src/PIP_Tree.defs.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index a92c2c6..82a1d3a 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -151,7 +151,7 @@ private: \exception std::invalid_argument Thrown if \p cs contains strict inequalities. */ - PIP_Decision_Node(const Constraint_System& cs, Recycle_Input dummy, + PIP_Decision_Node(Constraint_System& cs, Recycle_Input dummy, PIP_Tree_Node* fcp, PIP_Tree_Node* tcp); };

1 0

[GIT] ppl/ppl(pip): Added accessors of PIP_Solution_Node. Other improvements.
by Roberto Bagnara 14 Jun '09

14 Jun '09

Module: ppl/ppl Branch: pip Commit: d3b7ee7164ee429f922621643c7fea9409d0e18a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d3b7ee7164ee… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jun 14 22:14:36 2009 +0200 Added accessors of PIP_Solution_Node. Other improvements. --- src/PIP_Tree.defs.hh | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index 3c7562c..a92c2c6 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -24,6 +24,8 @@ site: http://www.cs.unipr.it/ppl/ . */ #define PPL_PIP_Tree_defs_hh 1 #include "PIP_Tree.types.hh" +#include "Variable.defs.hh" +#include "Linear_Expression.types.hh" #include "Constraint_System.types.hh" #include "PIP_Problem.types.hh" #include "globals.defs.hh" @@ -64,7 +66,25 @@ public: //! Returns \p this. PIP_Solution_Node* as_solution(); - // get_bindings(); + /*! \brief + Returns a parametric expression of the values of variable \p v. + + The returned linear expression only involves parameters. + + \exception std::invalid_argument + Thrown if \p v is dimension-incompatible with \p *this + or if \p v is a parameter. + */ + const Linear_Expression& parametric_values(Variable v); + + //! Returns the constraints (on variables and parameters) of \p *this. + const Constraint_System& constraints(); + +private: + // Only PIP_Problem is allowed to use the constructor. + friend class PIP_Problem; + + // FIXME: constructors to be decided. }; //! A tree node representing a decision in the space of solutions. @@ -79,8 +99,8 @@ public: //! Returns \p this. PIP_Decision_Node* as_decision(); - //! Returns a const pointer to the \v (true or false) branch of \p *this. - const PIP_Tree_Node* child_node(bool v) const; + //! Returns a const pointer to the \p b (true or false) branch of \p *this. + const PIP_Tree_Node* child_node(bool b) const; //! Returns a pointer to the \v (true or false) branch of \p *this. PIP_Tree_Node* child_node(bool v);

1 0

[GIT] ppl/ppl(pip): Include "globals.defs.hh"
by Roberto Bagnara 14 Jun '09

14 Jun '09

Module: ppl/ppl Branch: pip Commit: b898fa650b74f2bafcca8a7ae98906ef5e6e1332 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b898fa650b74… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jun 14 22:01:21 2009 +0200 Include "globals.defs.hh" --- src/PIP_Tree.defs.hh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index 0769831..3c7562c 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -26,6 +26,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "PIP_Tree.types.hh" #include "Constraint_System.types.hh" #include "PIP_Problem.types.hh" +#include "globals.defs.hh" namespace Parma_Polyhedra_Library {

1 0

[GIT] ppl/ppl(pip): Include "PIP_Tree.defs.hh".
by Roberto Bagnara 14 Jun '09

14 Jun '09

Module: ppl/ppl Branch: pip Commit: b690470bc18cd1a98dbea3e51ba0dbee25e805b8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b690470bc18c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jun 14 22:01:02 2009 +0200 Include "PIP_Tree.defs.hh". --- src/PIP_Problem.defs.hh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/PIP_Problem.defs.hh b/src/PIP_Problem.defs.hh index 6dbb414..ab8e26d 100644 --- a/src/PIP_Problem.defs.hh +++ b/src/PIP_Problem.defs.hh @@ -30,6 +30,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Constraint_System.types.hh" #include "Generator.defs.hh" #include "Variables_Set.defs.hh" +#include "PIP_Tree.defs.hh" #include <vector> #include <deque> #include <iosfwd>

1 0

[GIT] ppl/ppl(pip): Added constructors and comments.
by Roberto Bagnara 14 Jun '09

14 Jun '09

Module: ppl/ppl Branch: pip Commit: 272d5fda28d4d7c665eaba0ec36ba9871878f91f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=272d5fda28d4… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jun 14 21:57:44 2009 +0200 Added constructors and comments. --- src/Makefile.am | 2 + src/PIP_Problem.defs.hh | 2 +- src/PIP_Problem.inlines.hh | 43 +++++++++++++++++++++++++++++++++++++ src/PIP_Tree.cc | 6 +---- src/PIP_Tree.defs.hh | 51 ++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 96 insertions(+), 8 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 28ff582..8371865 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -272,7 +272,9 @@ MIP_Problem.defs.hh \ MIP_Problem.inlines.hh \ MIP_Problem.templates.hh \ PIP_Tree.defs.hh \ +PIP_Tree.inlines.hh \ PIP_Problem.defs.hh \ +PIP_Problem.inlines.hh \ Poly_Con_Relation.defs.hh \ Poly_Con_Relation.inlines.hh \ Poly_Gen_Relation.defs.hh \ diff --git a/src/PIP_Problem.defs.hh b/src/PIP_Problem.defs.hh index b7cfbbc..6dbb414 100644 --- a/src/PIP_Problem.defs.hh +++ b/src/PIP_Problem.defs.hh @@ -311,7 +311,7 @@ void swap(Parma_Polyhedra_Library::PIP_Problem& x, } // namespace std -//#include "PIP_Problem.inlines.hh" +#include "PIP_Problem.inlines.hh" //#include "PIP_Problem.templates.hh" #endif // !defined(PPL_PIP_Problem_defs_hh) diff --git a/src/PIP_Problem.inlines.hh b/src/PIP_Problem.inlines.hh new file mode 100644 index 0000000..97dc2a0 --- /dev/null +++ b/src/PIP_Problem.inlines.hh @@ -0,0 +1,43 @@ +/* PIP_Problem class implementation: inline functions. + 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/ . */ + +#ifndef PPL_PIP_Problem_inlines_hh +#define PPL_PIP_Problem_inlines_hh 1 + +namespace Parma_Polyhedra_Library { + +} // namespace Parma_Polyhedra_Library + +namespace std { + +#if 0 +/*! \relates Parma_Polyhedra_Library::PIP_Problem */ +inline void +swap(Parma_Polyhedra_Library::PIP_Problem& x, + Parma_Polyhedra_Library::PIP_Problem& y) { + x.swap(y); +} +#endif + +} // namespace std + +#endif // !defined(PPL_PIP_Problem_inlines_hh) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index ebd1042..dc87f7a 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -25,12 +25,9 @@ site: http://www.cs.unipr.it/ppl/ . */ namespace Parma_Polyhedra_Library { -PIP_Tree_Node::~PIP_Tree_Node() { -} - PIP_Decision_Node::~PIP_Decision_Node() { - delete false_child; delete true_child; + delete false_child; } const PIP_Solution_Node* @@ -74,4 +71,3 @@ PIP_Decision_Node::as_decision() { } } // namespace Parma_Polyhedra_Library - diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index c13fd80..0769831 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -24,6 +24,8 @@ site: http://www.cs.unipr.it/ppl/ . */ #define PPL_PIP_Tree_defs_hh 1 #include "PIP_Tree.types.hh" +#include "Constraint_System.types.hh" +#include "PIP_Problem.types.hh" namespace Parma_Polyhedra_Library { @@ -82,15 +84,60 @@ public: //! Returns a pointer to the \v (true or false) branch of \p *this. PIP_Tree_Node* child_node(bool v); - // Constraint_System* get_constraints(); + //! Returns the system of constraints controlling \p *this. + const Constraint_System& constraints(); private: - PIP_Tree_Node* false_child; + //! Pointer to the "true" child of \p *this. PIP_Tree_Node* true_child; + + //! Pointer to the "false" child of \p *this. + PIP_Tree_Node* false_child; + + // Only PIP_Problem is allowed to use the constructor. + friend class PIP_Problem; + + /*! \brief + Constructs if \p cs then \p tcp \p else \p fcp. + + Constructs a decision node controlled by \p cs (which is copied), + with "true" child \p tcp and "false" child \p fcp. + + \param cs + The system of constraints controlling the node. + + \exception std::invalid_argument + Thrown if \p cs contains strict inequalities. + */ + PIP_Decision_Node(const Constraint_System& cs, + PIP_Tree_Node* fcp, PIP_Tree_Node* tcp); + + /*! \brief + Constructs if \p cs then \p tcp \p else \p fcp. + + Constructs a decision node controlled by \p cs (which is recycled), + with "true" child \p tcp and "false" child \p fcp. + + \param cs + The system of constraints controlling the node. It is not + declared <CODE>const</CODE> because its data-structures may be + recycled to build the polyhedron. + + \param dummy + A dummy tag to syntactically differentiate this one + from the other constructors. + + \exception std::invalid_argument + Thrown if \p cs contains strict inequalities. + */ + PIP_Decision_Node(const Constraint_System& cs, Recycle_Input dummy, + PIP_Tree_Node* fcp, PIP_Tree_Node* tcp); }; typedef const PIP_Tree_Node* PIP_Tree; } // namespace Parma_Polyhedra_Library +#include "PIP_Tree.inlines.hh" + #endif // !defined(PPL_PIP_Tree_defs_hh)

1 0

[GIT] ppl/ppl(pip): Initial draft fo rinterface improved.
by Enea Zaffanella 14 Jun '09

14 Jun '09

Module: ppl/ppl Branch: pip Commit: 1f11bf94c3f37bade4e5294d18f83ce56ee8a0b4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1f11bf94c3f3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Jun 14 21:49:51 2009 +0200 Initial draft fo rinterface improved. Removed control parameters; removed UNBOUND status; renamed a few methods; let PIP_Tree be an alias for a pointer to a _const_ PIP_Tree_Node. --- src/PIP_Problem.defs.hh | 31 ++++--------------------------- src/PIP_Problem.types.hh | 2 -- src/PIP_Tree.defs.hh | 2 +- 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/src/PIP_Problem.defs.hh b/src/PIP_Problem.defs.hh index ecd34f2..b7cfbbc 100644 --- a/src/PIP_Problem.defs.hh +++ b/src/PIP_Problem.defs.hh @@ -265,20 +265,20 @@ public: */ PIP_Problem_Status solve() const; - //! Returns a feasible point for \p *this, if it exists. + //! Returns a feasible solution for \p *this, if it exists. /*! \exception std::domain_error Thrown if the PIP problem is not satisfiable. */ - const Generator& feasible_point() const; + PIP_Tree solution() const; - //! Returns an optimal point for \p *this, if it exists. + //! Returns an optimizing solution for \p *this, if it exists. /*! \exception std::domain_error Thrown if \p *this doesn't not have an optimizing point, i.e., if the PIP problem is unbounded or not satisfiable. */ - const Generator& optimizing_point() const; + PIP_Tree optimizing_solution() const; //! Checks if all the invariants are satisfied. bool OK() const; @@ -300,29 +300,6 @@ public: //! Swaps \p *this with \p y. void swap(PIP_Problem& y); - - //! Names of PIP problems' control parameters. - enum Control_Parameter_Name { - //! The pricing rule. - PRICING - }; - - //! Possible values for PIP problem's control parameters. - enum Control_Parameter_Value { - //! Steepest edge pricing method, using floating points (default). - PRICING_STEEPEST_EDGE_FLOAT, - //! Steepest edge pricing method, using Coefficient. - PRICING_STEEPEST_EDGE_EXACT, - //! Textbook pricing method. - PRICING_TEXTBOOK - }; - - //! Returns the value of the control parameter \p name. - Control_Parameter_Value - get_control_parameter(Control_Parameter_Name name) const; - - //! Sets control parameter \p value. - void set_control_parameter(Control_Parameter_Value value); }; namespace std { diff --git a/src/PIP_Problem.types.hh b/src/PIP_Problem.types.hh index ac32824..c6033bb 100644 --- a/src/PIP_Problem.types.hh +++ b/src/PIP_Problem.types.hh @@ -19,8 +19,6 @@ namespace Parma_Polyhedra_Library { enum PIP_Problem_Status { //! The problem is unfeasible. UNFEASIBLE_PIP_PROBLEM, - //! The problem is unbounded. - UNBOUNDED_PIP_PROBLEM, //! The problem has an optimal solution. OPTIMIZED_PIP_PROBLEM }; diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index b74d0ea..c13fd80 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -89,7 +89,7 @@ private: PIP_Tree_Node* true_child; }; -typedef PIP_Tree_Node* PIP_Tree; +typedef const PIP_Tree_Node* PIP_Tree; } // namespace Parma_Polyhedra_Library

1 0

[GIT] ppl/ppl(pip): More comments added. Some fields renamed.
by Roberto Bagnara 14 Jun '09

14 Jun '09

Module: ppl/ppl Branch: pip Commit: d9871d90f57430a5a934d3aeba752513755aa9a1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d9871d90f574… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jun 14 21:25:06 2009 +0200 More comments added. Some fields renamed. --- src/PIP_Tree.cc | 7 +++++-- src/PIP_Tree.defs.hh | 25 +++++++++++++++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index aaecb31..ebd1042 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -25,9 +25,12 @@ site: http://www.cs.unipr.it/ppl/ . */ namespace Parma_Polyhedra_Library { +PIP_Tree_Node::~PIP_Tree_Node() { +} + PIP_Decision_Node::~PIP_Decision_Node() { - delete if_false; - delete if_true; + delete false_child; + delete true_child; } const PIP_Solution_Node* diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index 20847bd..b74d0ea 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -52,10 +52,13 @@ public: //! A tree node representing part of the space of solutions. class PIP_Solution_Node : public PIP_Tree_Node { public: - //! Returns \p *this. + //! Destructor. + ~PIP_Solution_Node(); + + //! Returns \p this. const PIP_Solution_Node* as_solution() const; - //! Returns \p *this. + //! Returns \p this. PIP_Solution_Node* as_solution(); // get_bindings(); @@ -64,16 +67,26 @@ public: //! A tree node representing a decision in the space of solutions. class PIP_Decision_Node : public PIP_Tree_Node { public: + //! Destructor. ~PIP_Decision_Node(); + + //! Returns \p this. const PIP_Decision_Node* as_decision() const; + + //! Returns \p this. PIP_Decision_Node* as_decision(); - const PIP_Tree_Node* if_node(bool v) const; - PIP_Tree_Node* if_node(bool v); + + //! Returns a const pointer to the \v (true or false) branch of \p *this. + const PIP_Tree_Node* child_node(bool v) const; + + //! Returns a pointer to the \v (true or false) branch of \p *this. + PIP_Tree_Node* child_node(bool v); + // Constraint_System* get_constraints(); private: - PIP_Tree_Node* if_false; - PIP_Tree_Node* if_true; + PIP_Tree_Node* false_child; + PIP_Tree_Node* true_child; }; typedef PIP_Tree_Node* PIP_Tree;

1 0

[GIT] ppl/ppl(pip): Added comments and more infrastructure.
by Roberto Bagnara 14 Jun '09

14 Jun '09

Module: ppl/ppl Branch: pip Commit: 298c26af185d60c224e6feed493863aeadd10eca URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=298c26af185d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jun 14 21:16:52 2009 +0200 Added comments and more infrastructure. --- src/Makefile.am | 7 ++++++- src/PIP_Problem.cc | 32 ++++++++++++++++++++++++++++++++ src/PIP_Problem.defs.hh | 4 ++-- src/PIP_Tree.cc | 9 ++++++++- src/PIP_Tree.defs.hh | 30 +++++++++++++++++++++++++----- src/PIP_Tree.types.hh | 23 +++++++++++++++++++++++ 6 files changed, 96 insertions(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 5849079..28ff582 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -152,7 +152,8 @@ Generator_System.types.hh \ Grid_Generator_System.types.hh \ Congruence_System.types.hh \ Scalar_Products.types.hh \ -MIP_Problem.types.hh \ +PIP_Tree.types.hh \ +PIP_Problem.types.hh \ Poly_Con_Relation.types.hh \ Poly_Gen_Relation.types.hh \ BHRZ03_Certificate.types.hh \ @@ -270,6 +271,8 @@ Scalar_Products.inlines.hh \ MIP_Problem.defs.hh \ MIP_Problem.inlines.hh \ MIP_Problem.templates.hh \ +PIP_Tree.defs.hh \ +PIP_Problem.defs.hh \ Poly_Con_Relation.defs.hh \ Poly_Con_Relation.inlines.hh \ Poly_Gen_Relation.defs.hh \ @@ -375,6 +378,8 @@ Linear_System.cc \ Matrix.cc \ Scalar_Products.cc \ MIP_Problem.cc \ +PIP_Tree.cc \ +PIP_Problem.cc \ Poly_Con_Relation.cc \ Poly_Gen_Relation.cc \ BHRZ03_Certificate.cc \ diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc new file mode 100644 index 0000000..069f179 --- /dev/null +++ b/src/PIP_Problem.cc @@ -0,0 +1,32 @@ +/* PIP_Problem class implementation: non-inline functions. + 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-config.h> +#include "PIP_Problem.defs.hh" + +namespace PPL = Parma_Polyhedra_Library; + +/*! \relates Parma_Polyhedra_Library::PIP_Problem */ +std::ostream& +PPL::IO_Operators::operator<<(std::ostream& s, const PIP_Problem& /*p*/) { + return s; +} diff --git a/src/PIP_Problem.defs.hh b/src/PIP_Problem.defs.hh index 63ba1d4..ecd34f2 100644 --- a/src/PIP_Problem.defs.hh +++ b/src/PIP_Problem.defs.hh @@ -334,7 +334,7 @@ void swap(Parma_Polyhedra_Library::PIP_Problem& x, } // namespace std -#include "PIP_Problem.inlines.hh" -#include "PIP_Problem.templates.hh" +//#include "PIP_Problem.inlines.hh" +//#include "PIP_Problem.templates.hh" #endif // !defined(PPL_PIP_Problem_defs_hh) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index cf6d9ae..aaecb31 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -21,7 +21,7 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://www.cs.unipr.it/ppl/ . */ #include <ppl-config.h> -#include <PIP_Tree.defs.hh> +#include "PIP_Tree.defs.hh" namespace Parma_Polyhedra_Library { @@ -34,30 +34,37 @@ const PIP_Solution_Node* PIP_Tree_Node::as_solution() const { return 0; } + PIP_Solution_Node* PIP_Tree_Node::as_solution() { return 0; } + const PIP_Decision_Node* PIP_Tree_Node::as_decision() const { return 0; } + PIP_Decision_Node* PIP_Tree_Node::as_decision() { return 0; } + const PIP_Solution_Node* PIP_Solution_Node::as_solution() const { return this; } + PIP_Solution_Node* PIP_Solution_Node::as_solution() { return this; } + const PIP_Decision_Node* PIP_Decision_Node::as_decision() const { return this; } + PIP_Decision_Node* PIP_Decision_Node::as_decision() { return this; diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index f9b1cc6..20847bd 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -23,30 +23,46 @@ site: http://www.cs.unipr.it/ppl/ . */ #ifndef PPL_PIP_Tree_defs_hh #define PPL_PIP_Tree_defs_hh 1 -namespace Parma_Polyhedra_Library { +#include "PIP_Tree.types.hh" -class PIP_Solution_Node; -class PIP_Decision_Node; +namespace Parma_Polyhedra_Library { +/*! \brief + The base class for the nodes of the trees representing the solutions + of PIP problems. +*/ class PIP_Tree_Node { public: + //! Returns \p this if \p *this is a solution node, 0 otherwise. virtual const PIP_Solution_Node* as_solution() const; + + //! Returns \p this if \p *this is a solution node, 0 otherwise. virtual PIP_Solution_Node* as_solution(); + + //! Returns \p this if \p *this is a decision node, 0 otherwise. virtual const PIP_Decision_Node* as_decision() const; + + //! Returns \p this if \p *this is a decision node, 0 otherwise. virtual PIP_Decision_Node* as_decision(); + + //! Destructor. virtual ~PIP_Tree_Node(); }; +//! A tree node representing part of the space of solutions. class PIP_Solution_Node : public PIP_Tree_Node { public: + //! Returns \p *this. const PIP_Solution_Node* as_solution() const; + + //! Returns \p *this. PIP_Solution_Node* as_solution(); + // get_bindings(); }; +//! A tree node representing a decision in the space of solutions. class PIP_Decision_Node : public PIP_Tree_Node { - PIP_Tree_Node* if_false; - PIP_Tree_Node* if_true; public: ~PIP_Decision_Node(); const PIP_Decision_Node* as_decision() const; @@ -54,6 +70,10 @@ public: const PIP_Tree_Node* if_node(bool v) const; PIP_Tree_Node* if_node(bool v); // Constraint_System* get_constraints(); + +private: + PIP_Tree_Node* if_false; + PIP_Tree_Node* if_true; }; typedef PIP_Tree_Node* PIP_Tree; diff --git a/src/PIP_Tree.types.hh b/src/PIP_Tree.types.hh new file mode 100644 index 0000000..d21cf1b --- /dev/null +++ b/src/PIP_Tree.types.hh @@ -0,0 +1,23 @@ +/* Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is free software; as a special exception the author gives +unlimited permission to copy and/or distribute it, with or without +modifications, as long as this notice is preserved. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE. */ + +#ifndef PPL_PIP_Tree_types_hh +#define PPL_PIP_Tree_types_hh 1 + +namespace Parma_Polyhedra_Library { + +class PIP_Solution_Node; +class PIP_Decision_Node; +class PIP_Tree_Node; + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_PIP_Tree_types_hh)

1 0

[GIT] ppl/ppl(pip): Added draft PIP_Tree implementation.
by Abramo Bagnara 14 Jun '09

14 Jun '09

Module: ppl/ppl Branch: pip Commit: 18458e693b80381ff7e09654424c32694b40c557 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=18458e693b80… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sun Jun 14 20:26:12 2009 +0200 Added draft PIP_Tree implementation. --- src/PIP_Tree.cc | 67 +++++++++++++++++++++++++++++++++++++++++++++++ src/PIP_Tree.defs.hh | 63 ++++++++++++++++++++++++++++++++++++++++++++ src/PIP_Tree.inlines.hh | 34 ++++++++++++++++++++++++ 3 files changed, 164 insertions(+), 0 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc new file mode 100644 index 0000000..cf6d9ae --- /dev/null +++ b/src/PIP_Tree.cc @@ -0,0 +1,67 @@ +/* PIP_Tree related class implementation: non-inline functions. + 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-config.h> +#include <PIP_Tree.defs.hh> + +namespace Parma_Polyhedra_Library { + +PIP_Decision_Node::~PIP_Decision_Node() { + delete if_false; + delete if_true; +} + +const PIP_Solution_Node* +PIP_Tree_Node::as_solution() const { + return 0; +} +PIP_Solution_Node* +PIP_Tree_Node::as_solution() { + return 0; +} +const PIP_Decision_Node* +PIP_Tree_Node::as_decision() const { + return 0; +} +PIP_Decision_Node* +PIP_Tree_Node::as_decision() { + return 0; +} +const PIP_Solution_Node* +PIP_Solution_Node::as_solution() const { + return this; +} +PIP_Solution_Node* +PIP_Solution_Node::as_solution() { + return this; +} +const PIP_Decision_Node* +PIP_Decision_Node::as_decision() const { + return this; +} +PIP_Decision_Node* +PIP_Decision_Node::as_decision() { + return this; +} + +} // namespace Parma_Polyhedra_Library + diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh new file mode 100644 index 0000000..f9b1cc6 --- /dev/null +++ b/src/PIP_Tree.defs.hh @@ -0,0 +1,63 @@ +/* PIP_Tree class declaration. + 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/ . */ + +#ifndef PPL_PIP_Tree_defs_hh +#define PPL_PIP_Tree_defs_hh 1 + +namespace Parma_Polyhedra_Library { + +class PIP_Solution_Node; +class PIP_Decision_Node; + +class PIP_Tree_Node { +public: + virtual const PIP_Solution_Node* as_solution() const; + virtual PIP_Solution_Node* as_solution(); + virtual const PIP_Decision_Node* as_decision() const; + virtual PIP_Decision_Node* as_decision(); + virtual ~PIP_Tree_Node(); +}; + +class PIP_Solution_Node : public PIP_Tree_Node { +public: + const PIP_Solution_Node* as_solution() const; + PIP_Solution_Node* as_solution(); + // get_bindings(); +}; + +class PIP_Decision_Node : public PIP_Tree_Node { + PIP_Tree_Node* if_false; + PIP_Tree_Node* if_true; +public: + ~PIP_Decision_Node(); + const PIP_Decision_Node* as_decision() const; + PIP_Decision_Node* as_decision(); + const PIP_Tree_Node* if_node(bool v) const; + PIP_Tree_Node* if_node(bool v); + // Constraint_System* get_constraints(); +}; + +typedef PIP_Tree_Node* PIP_Tree; + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_PIP_Tree_defs_hh) diff --git a/src/PIP_Tree.inlines.hh b/src/PIP_Tree.inlines.hh new file mode 100644 index 0000000..8089917 --- /dev/null +++ b/src/PIP_Tree.inlines.hh @@ -0,0 +1,34 @@ +/* PIP_Tree related class implementation: inline functions. + 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/ . */ + +#ifndef PPL_PIP_Tree_inlines_hh +#define PPL_PIP_Tree_inlines_hh 1 + +namespace Parma_Polyhedra_Library { + +inline +PIP_Tree_Node::~PIP_Tree_Node() { +} + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_PIP_Tree_inlines_hh)

1 0

[GIT] ppl/ppl(pip): Got rid of objective function and optimization mode.
by Enea Zaffanella 14 Jun '09

14 Jun '09

Module: ppl/ppl Branch: pip Commit: e7f48834cdeee4a3d74060431e7d003d6bf51c60 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e7f48834cdee… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Jun 14 19:08:18 2009 +0200 Got rid of objective function and optimization mode. --- src/PIP_Problem.defs.hh | 163 ++++++++++------------------------------------- 1 files changed, 34 insertions(+), 129 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=e7f48834…

1 0