February 2010 - PPL-devel - BUGSENG Mailman

SWI-Prolog test failing (only!) on powerpc
by Michael Tautschnig 19 Feb '10

19 Feb '10

Hi all, I recently uploaded a new Debian package of ppl that had some minor packaging fixes; unfortunately, this time the build of the powerpc version fails with an error in the SWI-Prolog test suite: --- ./../tests/expected_pgt 2009-04-18 05:03:19.000000000 +0000 +++ obtained_pgt 2010-02-07 14:08:37.000000000 +0000 @@ -1 +1,2 @@ +test for ppl_Octagonal_Shape_double_bounds_from_below failed. OK make[1]: *** [ppl_prolog_generated_test] Error 1 make[1]: Leaving directory `/home/mt/ppl-0.10.2/interfaces/Prolog/SWI' make: *** [check-am] Error 2 The full build log is available at [1]. I was able to reproduce this error on a powerpc system, but I have no idea how to debug this. The earlier builds used SWI-Prolog version 5.6.64, whereas this time 5.8.2 was used. I saw some fix related to 5.8 (9784b8165b6cb1dea5eb6d20b4cebca7ecc780fd) in git, but applying that did not have any effect on this problem. Furthermore, it seems to be fine on all other architectures. Is there any other patch that I should have added? Thanks, Michael [1] https://buildd.debian.org/fetch.cgi?pkg=ppl&arch=powerpc&ver=0.10.2-4&stamp…

2 3

[GIT] ppl/ppl(master): Prefer denominator() to get_denominator().
by Enea Zaffanella 18 Feb '10

18 Feb '10

Module: ppl/ppl Branch: master Commit: 1cec252d369a5d53a8cd53fadd0c01adbace9d60 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1cec252d369a… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 18 23:45:41 2010 +0100 Prefer denominator() to get_denominator(). In pipproblem1 test02(), add a lenghty check of the expected solution. --- interfaces/C/ppl_c_header.h | 6 +- interfaces/C/ppl_c_implementation_common.cc | 8 +- src/PIP_Tree.cc | 76 ++++++++++--------- src/PIP_Tree.defs.hh | 8 +- src/PIP_Tree.inlines.hh | 30 ++++---- tests/PIP_Problem/pipproblem1.cc | 107 ++++++++++++++++++++++++++- tests/PIP_Problem/pipproblem2.cc | 4 +- 7 files changed, 173 insertions(+), 66 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=1cec252d…

1 0

[GIT] ppl/ppl(master): Simplified C interface to Artificial_Parameter.
by Enea Zaffanella 18 Feb '10

18 Feb '10

Module: ppl/ppl Branch: master Commit: e0bd48ed51aee3986fe5c9dc43a903f07bea3be7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e0bd48ed51ae… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 18 22:15:57 2010 +0100 Simplified C interface to Artificial_Parameter. --- interfaces/C/ppl_c_header.h | 12 ++++++------ interfaces/C/ppl_c_implementation_common.cc | 27 ++++++++++++--------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 7ba3a38..f026e8f 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -3034,26 +3034,26 @@ PPL_PROTO((ppl_const_PIP_Decision_Node_t pip_dec, int ppl_Artificial_Parameter_get_Linear_Expression PPL_PROTO((ppl_const_Artificial_Parameter_t ap, - ppl_const_Linear_Expression_t* le)); + ppl_Linear_Expression_t le)); /*! \relates ppl_Artificial_Parameter_tag \brief - Copies into \p coef the coefficient of variable \p var in + Copies into \p n the coefficient of variable \p var in the artificial parameter \p ap. */ int -ppl_Artificial_Parameter_get_coefficient +ppl_Artificial_Parameter_coefficient PPL_PROTO((ppl_const_Artificial_Parameter_t ap, ppl_dimension_type var, - ppl_const_Coefficient_t* coef)); + ppl_Coefficient_t n)); /*! \relates ppl_Artificial_Parameter_tag \brief - Copies into \p coef the inhomogeneous term of the artificial + Copies into \p n the inhomogeneous term of the artificial parameter \p ap. */ int ppl_Artificial_Parameter_get_inhomogeneous_term PPL_PROTO((ppl_const_Artificial_Parameter_t ap, - ppl_const_Coefficient_t* coef)); + ppl_Coefficient_t n)); /*! \relates ppl_Artificial_Parameter_tag \brief Writes to \p coeff the denominator in artificial parameter \p ap. diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index 6a03cc4..f4d0859 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -2472,34 +2472,31 @@ CATCH_ALL int ppl_Artificial_Parameter_get_Linear_Expression (ppl_const_Artificial_Parameter_t ap, - ppl_const_Linear_Expression_t* le) try { + ppl_Linear_Expression_t le) try { const Artificial_Parameter& sap = *to_const(ap); - const Linear_Expression& lle = static_cast<const Linear_Expression&>(sap); - *le = to_const(&lle); + Linear_Expression& lle = *to_nonconst(le); + lle = sap; return 0; } CATCH_ALL int -ppl_Artificial_Parameter_get_coefficient(ppl_const_Artificial_Parameter_t ap, - ppl_dimension_type var, - ppl_const_Coefficient_t* coef) try { +ppl_Artificial_Parameter_coefficient(ppl_const_Artificial_Parameter_t ap, + ppl_dimension_type var, + ppl_Coefficient_t n) try { const Artificial_Parameter& sap = *to_const(ap); - const Linear_Expression& lle = static_cast<const Linear_Expression&>(sap); - const Coefficient& ncoef = lle.coefficient(Variable(var)); - *coef = to_const(&ncoef); + Coefficient& nn = *to_nonconst(n); + nn = sap.coefficient(Variable(var)); return 0; } CATCH_ALL int -ppl_Artificial_Parameter_get_inhomogeneous_term -(ppl_const_Artificial_Parameter_t ap, - ppl_const_Coefficient_t* coef) try { +ppl_Artificial_Parameter_inhomogeneous_term +(ppl_const_Artificial_Parameter_t ap, ppl_Coefficient_t n) try { const Artificial_Parameter& sap = *to_const(ap); - const Linear_Expression& lle = static_cast<const Linear_Expression&>(sap); - const Coefficient& icoef = lle.inhomogeneous_term(); - *coef = to_const(&icoef); + Coefficient& nn = *to_nonconst(n); + nn = sap.inhomogeneous_term(); return 0; } CATCH_ALL

1 0

[GIT] ppl/ppl(master): Removed two PIP_Problem enum values that need not be interfaced.
by Enea Zaffanella 18 Feb '10

18 Feb '10

Module: ppl/ppl Branch: master Commit: d994c6364d6dcb3114e2236aeb9da689c8e63742 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d994c6364d6d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 18 21:54:53 2010 +0100 Removed two PIP_Problem enum values that need not be interfaced. --- interfaces/C/ppl_c_header.h | 10 ---------- interfaces/C/ppl_c_implementation_common.cc | 6 ------ 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index d49703b..7ba3a38 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -2388,16 +2388,6 @@ extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_FIRST; */ extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_MAX_COLUMN; -/*! \relates ppl_PIP_Problem_tag \brief - Code of PIP problem's "name size" control parameter name. -*/ -extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_NAME_SIZE; - -/*! \relates ppl_PIP_Problem_tag \brief - Code of PIP problem's "value size" control parameter name. -*/ -extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_VALUE_SIZE; - /*@}*/ /* Symbolic Constants */ /*! \brief \name Constructors, Assignment and Destructor */ diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index 47e5259..6a03cc4 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -171,8 +171,6 @@ int PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_ALL; int PPL_PIP_PROBLEM_CONTROL_PARAMETER_NAME_PIVOT_ROW_STRATEGY; int PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_FIRST; int PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_MAX_COLUMN; -int PPL_PIP_PROBLEM_CONTROL_PARAMETER_NAME_SIZE; -int PPL_PIP_PROBLEM_CONTROL_PARAMETER_VALUE_SIZE; int PPL_OPTIMIZATION_MODE_MINIMIZATION; int PPL_OPTIMIZATION_MODE_MAXIMIZATION; @@ -233,10 +231,6 @@ ppl_initialize(void) try { = PIP_Problem::PIVOT_ROW_STRATEGY_FIRST; PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_MAX_COLUMN = PIP_Problem::PIVOT_ROW_STRATEGY_MAX_COLUMN; - PPL_PIP_PROBLEM_CONTROL_PARAMETER_NAME_SIZE - = PIP_Problem::CONTROL_PARAMETER_NAME_SIZE; - PPL_PIP_PROBLEM_CONTROL_PARAMETER_VALUE_SIZE - = PIP_Problem::CONTROL_PARAMETER_VALUE_SIZE; PPL_OPTIMIZATION_MODE_MINIMIZATION = MINIMIZATION; PPL_OPTIMIZATION_MODE_MAXIMIZATION = MAXIMIZATION;

1 0

[GIT] ppl/ppl(master): Avoid parameter name hiding; mark unreachable code.
by Enea Zaffanella 18 Feb '10

18 Feb '10

Module: ppl/ppl Branch: master Commit: d274e1f6b47b8a76e0499984669d2f8ea150e36f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d274e1f6b47b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 18 21:49:54 2010 +0100 Avoid parameter name hiding; mark unreachable code. --- src/PIP_Tree.cc | 3 ++- src/PIP_Tree.inlines.hh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 8ef8d21..d904d9e 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -2206,7 +2206,8 @@ PIP_Solution_Node::solve(const PIP_Problem& problem, } // Main loop of the simplex algorithm - return this; + // This point should be unreachable. + throw std::runtime_error("PPL internal error"); } void diff --git a/src/PIP_Tree.inlines.hh b/src/PIP_Tree.inlines.hh index 9c86647..36f736c 100644 --- a/src/PIP_Tree.inlines.hh +++ b/src/PIP_Tree.inlines.hh @@ -127,8 +127,8 @@ PIP_Tree_Node::Artificial_Parameter // Normalize if needed. if (denominator < 0) { neg_assign(denominator); - Linear_Expression& expr = *this; - expr *= -1; + Linear_Expression& e = *this; + e *= -1; } PPL_ASSERT(OK()); }

1 0

[GIT] ppl/ppl(master): Added some missing C interface methods and enum values for the new PIP classes .
by Patricia Hill 18 Feb '10

18 Feb '10

Module: ppl/ppl Branch: master Commit: 215cc5a900c2e8bd49b1477ccc220eb09b6b59cf URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=215cc5a900c2… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Feb 18 20:22:54 2010 +0000 Added some missing C interface methods and enum values for the new PIP classes. --- interfaces/C/ppl_c_header.h | 44 +++++++++++++++++++++++ interfaces/C/ppl_c_implementation_common.cc | 51 +++++++++++++++++++++++++++ interfaces/C/tests/pip_test.c | 17 ++++++++- 3 files changed, 111 insertions(+), 1 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 7cce12c..d49703b 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -2388,6 +2388,16 @@ extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_FIRST; */ extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_MAX_COLUMN; +/*! \relates ppl_PIP_Problem_tag \brief + Code of PIP problem's "name size" control parameter name. +*/ +extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_NAME_SIZE; + +/*! \relates ppl_PIP_Problem_tag \brief + Code of PIP problem's "value size" control parameter name. +*/ +extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_VALUE_SIZE; + /*@}*/ /* Symbolic Constants */ /*! \brief \name Constructors, Assignment and Destructor */ @@ -2702,6 +2712,21 @@ ppl_assign_PIP_Problem_from_PIP_Problem PPL_PROTO((ppl_PIP_Problem_t dst, ppl_const_PIP_Problem_t src)); /*! \relates ppl_PIP_Problem_tag \brief + Builds a PIP problem having space dimension \p d from the sequence + of constraints in the range \f$[\mathrm{first}, \mathrm{last})\f$; + the \p n dimensions whose indices occur in \p ds are interpreted as + parameters. +*/ +int +ppl_new_PIP_Problem_from_constraints +PPL_PROTO((ppl_PIP_Problem_t* ppip, + ppl_dimension_type d, + ppl_Constraint_System_const_iterator_t first, + ppl_Constraint_System_const_iterator_t last, + size_t n, + ppl_dimension_type ds[])); + +/*! \relates ppl_PIP_Problem_tag \brief Invalidates the handle \p pip: this makes sure the corresponding resources will eventually be released. */ @@ -3022,6 +3047,25 @@ PPL_PROTO((ppl_const_Artificial_Parameter_t ap, ppl_const_Linear_Expression_t* le)); /*! \relates ppl_Artificial_Parameter_tag \brief + Copies into \p coef the coefficient of variable \p var in + the artificial parameter \p ap. +*/ +int +ppl_Artificial_Parameter_get_coefficient +PPL_PROTO((ppl_const_Artificial_Parameter_t ap, + ppl_dimension_type var, + ppl_const_Coefficient_t* coef)); + +/*! \relates ppl_Artificial_Parameter_tag \brief + Copies into \p coef the inhomogeneous term of the artificial + parameter \p ap. +*/ +int +ppl_Artificial_Parameter_get_inhomogeneous_term +PPL_PROTO((ppl_const_Artificial_Parameter_t ap, + ppl_const_Coefficient_t* coef)); + +/*! \relates ppl_Artificial_Parameter_tag \brief Writes to \p coeff the denominator in artificial parameter \p ap. */ int diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index 2d0598e..47e5259 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -168,8 +168,11 @@ int PPL_PIP_PROBLEM_CONTROL_PARAMETER_NAME_CUTTING_STRATEGY; int PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_FIRST; int PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_DEEPEST; int PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_ALL; +int PPL_PIP_PROBLEM_CONTROL_PARAMETER_NAME_PIVOT_ROW_STRATEGY; int PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_FIRST; int PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_MAX_COLUMN; +int PPL_PIP_PROBLEM_CONTROL_PARAMETER_NAME_SIZE; +int PPL_PIP_PROBLEM_CONTROL_PARAMETER_VALUE_SIZE; int PPL_OPTIMIZATION_MODE_MINIMIZATION; int PPL_OPTIMIZATION_MODE_MAXIMIZATION; @@ -224,10 +227,16 @@ ppl_initialize(void) try { = PIP_Problem::CUTTING_STRATEGY_DEEPEST; PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_ALL = PIP_Problem::CUTTING_STRATEGY_ALL; + PPL_PIP_PROBLEM_CONTROL_PARAMETER_NAME_PIVOT_ROW_STRATEGY + = PIP_Problem::PIVOT_ROW_STRATEGY; PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_FIRST = PIP_Problem::PIVOT_ROW_STRATEGY_FIRST; PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_MAX_COLUMN = PIP_Problem::PIVOT_ROW_STRATEGY_MAX_COLUMN; + PPL_PIP_PROBLEM_CONTROL_PARAMETER_NAME_SIZE + = PIP_Problem::CONTROL_PARAMETER_NAME_SIZE; + PPL_PIP_PROBLEM_CONTROL_PARAMETER_VALUE_SIZE + = PIP_Problem::CONTROL_PARAMETER_VALUE_SIZE; PPL_OPTIMIZATION_MODE_MINIMIZATION = MINIMIZATION; PPL_OPTIMIZATION_MODE_MAXIMIZATION = MAXIMIZATION; @@ -2148,6 +2157,23 @@ ppl_new_PIP_Problem_from_PIP_Problem(ppl_PIP_Problem_t* dpip, CATCH_ALL int +ppl_new_PIP_Problem_from_constraints +(ppl_PIP_Problem_t* ppip, + ppl_dimension_type d, + ppl_Constraint_System_const_iterator_t first, + ppl_Constraint_System_const_iterator_t last, + size_t n, + ppl_dimension_type ds[]) try { + Variables_Set p_vars; + for (ppl_dimension_type i = n; i-- > 0; ) + p_vars.insert(ds[i]); + *ppip = to_nonconst(new PIP_Problem(d, *to_const(first), + *to_const(last), p_vars)); + return 0; +} +CATCH_ALL + +int ppl_assign_PIP_Problem_from_PIP_Problem(ppl_PIP_Problem_t dst, ppl_const_PIP_Problem_t src) try { const PIP_Problem& ssrc = *to_const(src); @@ -2461,6 +2487,31 @@ ppl_Artificial_Parameter_get_Linear_Expression CATCH_ALL int +ppl_Artificial_Parameter_get_coefficient(ppl_const_Artificial_Parameter_t ap, + ppl_dimension_type var, + ppl_const_Coefficient_t* coef) try { + const Artificial_Parameter& sap = *to_const(ap); + const Linear_Expression& lle = static_cast<const Linear_Expression&>(sap); + const Coefficient& ncoef = lle.coefficient(Variable(var)); + *coef = to_const(&ncoef); + return 0; +} +CATCH_ALL + +int +ppl_Artificial_Parameter_get_inhomogeneous_term +(ppl_const_Artificial_Parameter_t ap, + ppl_const_Coefficient_t* coef) try { + const Artificial_Parameter& sap = *to_const(ap); + const Linear_Expression& lle = static_cast<const Linear_Expression&>(sap); + const Coefficient& icoef = lle.inhomogeneous_term(); + *coef = to_const(&icoef); + return 0; +} +CATCH_ALL + + +int ppl_Artificial_Parameter_get_denominator(ppl_const_Artificial_Parameter_t ap, ppl_const_Coefficient_t* coef) try { const Artificial_Parameter& sap = *to_const(ap); diff --git a/interfaces/C/tests/pip_test.c b/interfaces/C/tests/pip_test.c index ff0f533..71f0a68 100644 --- a/interfaces/C/tests/pip_test.c +++ b/interfaces/C/tests/pip_test.c @@ -232,7 +232,6 @@ main(int argc, char **argv) { ppl_Linear_Expression_add_to_inhomogeneous(le, c); ppl_new_Constraint(&ct, le, PPL_CONSTRAINT_TYPE_GREATER_OR_EQUAL); ppl_PIP_Problem_add_constraint(pip, ct); - ppl_delete_Constraint(ct); ppl_delete_Linear_Expression(le); } ppl_delete_Coefficient(c); @@ -240,13 +239,29 @@ main(int argc, char **argv) { ppl_PIP_Problem_total_memory_in_bytes(pip, &sz); ppl_PIP_Problem_external_memory_in_bytes(pip, &sz); + ok = (ppl_PIP_Problem_solve(pip) == PPL_PIP_PROBLEM_STATUS_OPTIMIZED); if (ok) { ppl_dimension_type dim; ppl_const_PIP_Tree_Node_t solution; + ppl_PIP_Problem_t pip0; + ppl_Constraint_System_t constraints; + ppl_Constraint_System_const_iterator_t begin, end; + ppl_PIP_Problem_space_dimension(pip, &dim); ppl_PIP_Problem_solution(pip, &solution); display_solution(solution, N_VARS, N_PARAMETERS, parameter_dim); + ppl_new_Constraint_System_const_iterator(&begin); + ppl_new_Constraint_System_const_iterator(&end); + ppl_new_Constraint_System_from_Constraint(&constraints, ct); + ppl_Constraint_System_begin(constraints, begin); + ppl_Constraint_System_end(constraints, end); + ppl_new_PIP_Problem_from_constraints(&pip0, N_VARS+N_PARAMETERS, + begin, end, N_PARAMETERS, + parameter_dim); + ok = ppl_PIP_Problem_OK(pip0); + ppl_delete_Constraint(ct); + ppl_delete_Constraint_System(constraints); } ppl_delete_PIP_Problem(pip);

1 0

[GIT] ppl/ppl(floating_point): Changed linearize method interface for Floating Point Expressions.
by Roberto Amadini 18 Feb '10

18 Feb '10

Module: ppl/ppl Branch: floating_point Commit: b8ac7e594ab0bd3e876529339039bc04b9c85b62 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b8ac7e594ab0… Author: Roberto Amadini <r.amadini(a)virgilio.it> Date: Thu Feb 18 17:33:36 2010 +0100 Changed linearize method interface for Floating Point Expressions. Now, it has a bool return type which indicates if the linearization succeeded (or not). Thus, Linearization_Failed exception class has been removed. --- src/Cast_Floating_Point_Expression.defs.hh | 5 +- src/Cast_Floating_Point_Expression.templates.hh | 7 +- src/Constant_Floating_Point_Expression.defs.hh | 6 +- src/Constant_Floating_Point_Expression.inlines.hh | 4 +- src/Difference_Floating_Point_Expression.defs.hh | 17 ++-- ...fference_Floating_Point_Expression.templates.hh | 11 ++- src/Division_Floating_Point_Expression.defs.hh | 15 ++-- ...Division_Floating_Point_Expression.templates.hh | 14 ++- src/Floating_Point_Expression.defs.hh | 15 +-- ...ultiplication_Floating_Point_Expression.defs.hh | 19 ++-- ...lication_Floating_Point_Expression.templates.hh | 24 ++--- src/Opposite_Floating_Point_Expression.defs.hh | 11 +- src/Opposite_Floating_Point_Expression.inlines.hh | 8 +- src/Sum_Floating_Point_Expression.defs.hh | 11 +- src/Sum_Floating_Point_Expression.templates.hh | 11 ++- src/Variable_Floating_Point_Expression.defs.hh | 5 +- src/Variable_Floating_Point_Expression.inlines.hh | 12 ++- tests/Floating_Point_Expression/digitalfilters1.cc | 107 ++++++++++---------- .../floatingpointexpr1.cc | 50 +++------- 19 files changed, 172 insertions(+), 180 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=b8ac7e59…

1 0

[GIT] ppl/ppl(master): Corrected bug in th ehandling of trivially satisfiable PIP problems.
by Enea Zaffanella 18 Feb '10

18 Feb '10

Module: ppl/ppl Branch: master Commit: 0e480f958e85f6d0c50b57835aaaa8f4ba9026ab URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0e480f958e85… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 18 16:07:39 2010 +0100 Corrected bug in th ehandling of trivially satisfiable PIP problems. Test 16 in pipproblem1.cc (currently disabled) shows a bug in the handling of trivially unfeasible PIP problems. --- src/PIP_Problem.cc | 32 ++++++------- src/PIP_Tree.cc | 33 ++++++++------ tests/PIP_Problem/pipproblem1.cc | 91 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+), 31 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index f24043f..aa34943 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -109,23 +109,19 @@ PPL::PIP_Problem::solve() const { case PARTIALLY_SATISFIABLE: { PIP_Problem& x = const_cast<PIP_Problem&>(*this); + // Allocate PIP solution tree root, if needed. if (current_solution == 0) x.current_solution = new PIP_Solution_Node(); - if (input_cs.empty()) { - // No constraints: solution = {0}. - x.status = OPTIMIZED; - return OPTIMIZED_PIP_PROBLEM; - } // Properly resize context matrix. - const dimension_type num_params = parameters.size() + 1; - const dimension_type num_cols = initial_context.num_columns(); - if (num_cols < num_params) - x.initial_context.add_zero_columns(num_params - num_cols); + const dimension_type new_num_cols = parameters.size() + 1; + const dimension_type old_num_cols = initial_context.num_columns(); + if (old_num_cols < new_num_cols) + x.initial_context.add_zero_columns(new_num_cols - old_num_cols); // Computed once for all (to be used inside loop). - const Variables_Set::iterator param_begin = parameters.begin(); - const Variables_Set::iterator param_end = parameters.end(); + const Variables_Set::const_iterator param_begin = parameters.begin(); + const Variables_Set::const_iterator param_end = parameters.end(); // Go through all pending constraints. for (Constraint_Sequence::const_iterator @@ -150,12 +146,14 @@ PPL::PIP_Problem::solve() const { continue; // Translate constraint into context row. - Row row(num_params, Row::Flags()); + Row row(new_num_cols, Row::Flags()); row[0] = c.inhomogeneous_term(); - dimension_type i = 1; - for (Variables_Set::iterator - pi = param_begin; pi != param_end; ++pi, ++i) - row[i] = c.coefficient(Variable(*pi)); + { + dimension_type i = 1; + for (Variables_Set::const_iterator + pi = param_begin; pi != param_end; ++pi, ++i) + row[i] = c.coefficient(Variable(*pi)); + } // Adjust inhomogenous term if strict. if (c.is_strict_inequality()) --row[0]; @@ -163,7 +161,7 @@ PPL::PIP_Problem::solve() const { x.initial_context.add_row(row); // If it is an equality, also insert its negation. if (c.is_equality()) { - for (dimension_type i = num_params; i-- > 0; ) + for (dimension_type i = new_num_cols; i-- > 0; ) neg_assign(row[i], row[i]); x.initial_context.add_row(row); } diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 67986a1..8ef8d21 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1583,23 +1583,28 @@ void PIP_Solution_Node::update_solution(const Variables_Set& parameters) { if (solution_valid) return; - dimension_type num_vars = tableau.s.num_columns(); - const Coefficient& d = tableau.get_denominator(); + + const dimension_type num_vars = tableau.s.num_columns(); if (solution.size() != num_vars) solution.resize(num_vars); + + // Compute once for all outside loop. + const dimension_type num_params = parameters.size(); + const Variables_Set::const_reverse_iterator p_rbegin = parameters.rbegin(); + const Variables_Set::const_reverse_iterator p_rend = parameters.rend(); + + const Coefficient& den = tableau.get_denominator(); for (dimension_type i = num_vars; i-- > 0; ) { - Linear_Expression& sol = solution[i]; - if (basis[i]) { - sol = Linear_Expression(0); - } else { - Row& row = tableau.t[mapping[i]]; - sol = Linear_Expression(row[0]/d); - dimension_type k; - Variables_Set::const_iterator j; - Variables_Set::const_iterator j_end = parameters.end(); - for (j = parameters.begin(), k = 1; j != j_end; ++j, ++k) - sol += (row[k]/d) * Variable(*j); - } + Linear_Expression& sol_i = solution[i]; + sol_i = Linear_Expression(0); + if (basis[i]) + continue; + Row& row = tableau.t[mapping[i]]; + dimension_type k = num_params; + for (Variables_Set::const_reverse_iterator + pj = p_rbegin; pj != p_rend; ++pj, --k) + add_mul_assign(sol_i, row[k]/den, Variable(*pj)); + sol_i += row[0]/den; } solution_valid = true; } diff --git a/tests/PIP_Problem/pipproblem1.cc b/tests/PIP_Problem/pipproblem1.cc index 7fb57ea..a30b89b 100644 --- a/tests/PIP_Problem/pipproblem1.cc +++ b/tests/PIP_Problem/pipproblem1.cc @@ -311,6 +311,91 @@ test10() { return ok; } +bool +test11() { + // 0-dimension trivial PIP problem. + PIP_Problem pip; + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + ok &= solution->OK(); + pip.print_solution(nout); + } + return ok; +} + +bool +test12() { + // Trivial PIP problem, but with 4 parameters. + PIP_Problem pip; + pip.add_space_dimensions_and_embed(0, 4); + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + ok &= solution->OK(); + pip.print_solution(nout); + } + return ok; +} + +bool +test13() { + // Trivial PIP problem with 4 variables. + PIP_Problem pip; + pip.add_space_dimensions_and_embed(4, 0); + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + ok &= solution->OK(); + pip.print_solution(nout); + } + return ok; +} + +bool +test14() { + // Trivial PIP problem with 4 variables and 4 parameters. + PIP_Problem pip; + pip.add_space_dimensions_and_embed(4, 4); + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + ok &= solution->OK(); + pip.print_solution(nout); + } + return ok; +} + +bool +test15() { + PIP_Problem pip; + // Adding trivial satisfiable constraint. + pip.add_constraint(Linear_Expression(5) == 5); + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + ok &= solution->OK(); + pip.print_solution(nout); + } + return ok; +} + +bool +test16() { + PIP_Problem pip; + // Adding trivial unsatisfiable constraint. + pip.add_constraint(Linear_Expression(0) == 1); + bool ok = (pip.solve() == UNFEASIBLE_PIP_PROBLEM); + if (pip.solution() != 0) + pip.print_solution(nout); + return ok; +} + } // namespace BEGIN_MAIN @@ -324,4 +409,10 @@ BEGIN_MAIN DO_TEST_F8(test08); DO_TEST_F8(test09); DO_TEST_F8(test10); + DO_TEST(test11); + DO_TEST(test12); + DO_TEST(test13); + DO_TEST(test14); + DO_TEST(test15); + // DO_TEST(test16); END_MAIN

1 0

[GIT] ppl/ppl(master): Dealt with a FIXME in PIP_Solution_Node::solve().
by Enea Zaffanella 18 Feb '10

18 Feb '10

Module: ppl/ppl Branch: master Commit: ee564d807b24ca244ac691498a4bb684b12898b4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ee564d807b24… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 18 15:01:45 2010 +0100 Dealt with a FIXME in PIP_Solution_Node::solve(). --- src/PIP_Tree.cc | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 4f08797..67986a1 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1824,9 +1824,7 @@ PIP_Solution_Node::solve(const PIP_Problem& problem, // Do nothing if the j-th pivot element is zero. if (s_pivot_j == 0) continue; - // FIXME: why iterating downwards makes a difference? - // for (dimension_type i = num_rows; i-- > 0; ) { - for (dimension_type i = 0; i < num_rows; ++i) { + for (dimension_type i = num_rows; i-- > 0; ) { Row& s_i = tableau.s[i]; product = s_pivot_j * s_i[pj]; if (product % s_pivot_pj != 0) {

1 0

[GIT] ppl/ppl(master): Added total_memory_in_bytes() and external_memory_in_bytes()
by Patricia Hill 18 Feb '10

18 Feb '10

Module: ppl/ppl Branch: master Commit: 0d53ceac4d79dfb1d6ba9407c48154071481ad52 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0d53ceac4d79… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Feb 18 13:43:28 2010 +0000 Added total_memory_in_bytes() and external_memory_in_bytes() to MIP_Problem and PIP_Problem in the C interface. --- interfaces/C/ppl_c_header.h | 28 ++++++++++++++++++++++++ interfaces/C/ppl_c_implementation_common.cc | 31 +++++++++++++++++++++++++++ interfaces/C/tests/pip_test.c | 4 ++- 3 files changed, 62 insertions(+), 1 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index f21626b..7cce12c 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -2658,6 +2658,20 @@ int ppl_MIP_Problem_set_control_parameter PPL_PROTO((ppl_MIP_Problem_t mip, int value)); +/*! \relates ppl_MIP_Problem_tag \brief + Writes into \p *sz the size in bytes of the memory occupied by \p mip. +*/ +int +ppl_MIP_Problem_total_memory_in_bytes +PPL_PROTO((ppl_const_MIP_Problem_t mip, size_t* sz)); + +/*! \relates ppl_MIP_Problem_tag \brief + Writes into \p *sz the size in bytes of the memory managed by \p mip. +*/ +int +ppl_MIP_Problem_external_memory_in_bytes +PPL_PROTO((ppl_const_MIP_Problem_t mip, size_t* sz)); + /*@}*/ /* Querying/Setting Control Parameters */ @@ -2876,6 +2890,20 @@ int ppl_PIP_Problem_set_big_parameter_dimension PPL_PROTO((ppl_PIP_Problem_t pip, ppl_dimension_type d)); +/*! \relates ppl_PIP_Problem_tag \brief + Writes into \p *sz the size in bytes of the memory occupied by \p pip. +*/ +int +ppl_PIP_Problem_total_memory_in_bytes +PPL_PROTO((ppl_const_PIP_Problem_t pip, size_t* sz)); + +/*! \relates ppl_PIP_Problem_tag \brief + Writes into \p *sz the size in bytes of the memory managed by \p pip. +*/ +int +ppl_PIP_Problem_external_memory_in_bytes +PPL_PROTO((ppl_const_PIP_Problem_t pip, size_t* sz)); + /*@}*/ /* Querying/Setting Control Parameters */ diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index d6ad365..2d0598e 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -2115,6 +2115,22 @@ ppl_MIP_Problem_OK(ppl_const_MIP_Problem_t mip) try { CATCH_ALL int +ppl_MIP_Problem_total_memory_in_bytes(ppl_const_MIP_Problem_t mip, + size_t* sz) try { + *sz = to_const(mip)->total_memory_in_bytes(); + return 0; +} +CATCH_ALL + +int +ppl_MIP_Problem_external_memory_in_bytes(ppl_const_MIP_Problem_t mip, + size_t* sz) try { + *sz = to_const(mip)->external_memory_in_bytes(); + return 0; +} +CATCH_ALL + +int ppl_new_PIP_Problem_from_space_dimension(ppl_PIP_Problem_t* ppip, ppl_dimension_type d) try { *ppip = to_nonconst(new PIP_Problem(d)); @@ -2316,6 +2332,21 @@ ppl_PIP_Problem_set_big_parameter_dimension(ppl_PIP_Problem_t pip, } CATCH_ALL +int +ppl_PIP_Problem_total_memory_in_bytes(ppl_const_PIP_Problem_t pip, + size_t* sz) try { + *sz = to_const(pip)->total_memory_in_bytes(); + return 0; +} +CATCH_ALL + +int +ppl_PIP_Problem_external_memory_in_bytes(ppl_const_PIP_Problem_t pip, + size_t* sz) try { + *sz = to_const(pip)->external_memory_in_bytes(); + return 0; +} +CATCH_ALL int ppl_PIP_Tree_Node_as_solution(ppl_const_PIP_Tree_Node_t spip_tree, diff --git a/interfaces/C/tests/pip_test.c b/interfaces/C/tests/pip_test.c index 42cd3a4..ff0f533 100644 --- a/interfaces/C/tests/pip_test.c +++ b/interfaces/C/tests/pip_test.c @@ -180,6 +180,7 @@ main(int argc, char **argv) { ppl_dimension_type i, j; mpz_t mpc; int ok; + size_t sz = 0; static ppl_dimension_type parameter_dim[N_PARAMETERS]; @@ -237,8 +238,9 @@ main(int argc, char **argv) { ppl_delete_Coefficient(c); mpz_clear(mpc); + ppl_PIP_Problem_total_memory_in_bytes(pip, &sz); + ppl_PIP_Problem_external_memory_in_bytes(pip, &sz); ok = (ppl_PIP_Problem_solve(pip) == PPL_PIP_PROBLEM_STATUS_OPTIMIZED); - if (ok) { ppl_dimension_type dim; ppl_const_PIP_Tree_Node_t solution;

1 0