February 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Warnings avoided.
by Roberto Bagnara 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: 6c5b321e17513b2492e821619ddae38c1ff0115d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6c5b321e1751… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 16 21:35:26 2010 +0100 Warnings avoided. --- interfaces/C/ppl_c_implementation_common.cc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index e297492..92bf0a6 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -23,6 +23,7 @@ site: http://www.cs.unipr.it/ppl/ . */ /* Interface for Coefficient. */ #include "ppl_c_implementation_common.defs.hh" +#include "compiler.hh" namespace Parma_Polyhedra_Library { @@ -252,6 +253,7 @@ CATCH_ALL int ppl_set_timeout(unsigned time) try { #ifndef PPL_WATCHDOG_LIBRARY_ENABLED + used(time); const char* what = "PPL C interface error:\n" "ppl_set_timeout: the PPL Watchdog library is not enabled."; throw std::runtime_error(what); @@ -282,6 +284,7 @@ CATCH_ALL int ppl_set_deterministic_timeout(unsigned weight) try { #ifndef PPL_WATCHDOG_LIBRARY_ENABLED + used(weight); const char* what = "PPL C interface error:\n" "ppl_set_deterministic_timeout: the PPL Watchdog library is not enabled."; throw std::runtime_error(what);

1 0

[GIT] ppl/ppl(master): Corrected several problems.
by Roberto Bagnara 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: bad1f4e90af2d1368fee383f08c59316182de8dc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bad1f4e90af2… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 16 20:38:32 2010 +0100 Corrected several problems. --- Watchdog/tests/pwl_test.cc | 29 ++++++++++++++--------------- tests/ppl_test.cc | 33 ++++++++++++++++----------------- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/Watchdog/tests/pwl_test.cc b/Watchdog/tests/pwl_test.cc index f4b828c..4100e5b 100644 --- a/Watchdog/tests/pwl_test.cc +++ b/Watchdog/tests/pwl_test.cc @@ -112,7 +112,7 @@ fpe_sigaction(int sig, siginfo_t* sip, void*) { std::cerr << "FE_INVALID "; #endif std::cerr << std::endl; -#endif +#endif // defined(PWL_HAVE_FENV_H) } exit(1); } @@ -129,30 +129,29 @@ fpe_handler(int sig) { std::cerr << "SIGFPE caught" << std::endl; #if defined(PWL_HAVE_FENV_H) - std::cerr << "Inquire with fetestexcept(): "; + std::cerr << "Inquire with fetestexcept(): "; #ifdef FE_INEXACT - if (fetestexcept(FE_INEXACT)) - std::cerr << "FE_INEXACT "; + if (fetestexcept(FE_INEXACT)) + std::cerr << "FE_INEXACT "; #endif #ifdef FE_DIVBYZERO - if (fetestexcept(FE_DIVBYZERO)) - std::cerr << "FE_DIVBYZERO "; + if (fetestexcept(FE_DIVBYZERO)) + std::cerr << "FE_DIVBYZERO "; #endif #ifdef FE_UNDERFLOW - if (fetestexcept(FE_UNDERFLOW)) - std::cerr << "FE_UNDERFLOW "; + if (fetestexcept(FE_UNDERFLOW)) + std::cerr << "FE_UNDERFLOW "; #endif #ifdef FE_OVERFLOW - if (fetestexcept(FE_OVERFLOW)) - std::cerr << "FE_OVERFLOW "; + if (fetestexcept(FE_OVERFLOW)) + std::cerr << "FE_OVERFLOW "; #endif #if FE_INVALID - if (fetestexcept(FE_INVALID)) - std::cerr << "FE_INVALID "; + if (fetestexcept(FE_INVALID)) + std::cerr << "FE_INVALID "; #endif - std::cerr << std::endl; -#endif - } + std::cerr << std::endl; +#endif // defined(PWL_HAVE_FENV_H) exit(1); } diff --git a/tests/ppl_test.cc b/tests/ppl_test.cc index c0ac87f..9ec9f23 100644 --- a/tests/ppl_test.cc +++ b/tests/ppl_test.cc @@ -89,7 +89,7 @@ fpe_sigaction(int sig, siginfo_t* sip, void*) { else { std::cerr << "SIGFPE caught (unknown si_code " << sip->si_code << ")" << std::endl; -#if defined(PWL_HAVE_FENV_H) +#if defined(PPL_HAVE_FENV_H) std::cerr << "Inquire with fetestexcept(): "; #ifdef FE_INEXACT if (fetestexcept(FE_INEXACT)) @@ -112,7 +112,7 @@ fpe_sigaction(int sig, siginfo_t* sip, void*) { std::cerr << "FE_INVALID "; #endif std::cerr << std::endl; -#endif +#endif // defined(PPL_HAVE_FENV_H) } exit(1); } @@ -128,31 +128,30 @@ fpe_handler(int sig) { } std::cerr << "SIGFPE caught" << std::endl; -#if defined(PWL_HAVE_FENV_H) - std::cerr << "Inquire with fetestexcept(): "; +#if defined(PPL_HAVE_FENV_H) + std::cerr << "Inquire with fetestexcept(): "; #ifdef FE_INEXACT - if (fetestexcept(FE_INEXACT)) - std::cerr << "FE_INEXACT "; + if (fetestexcept(FE_INEXACT)) + std::cerr << "FE_INEXACT "; #endif #ifdef FE_DIVBYZERO - if (fetestexcept(FE_DIVBYZERO)) - std::cerr << "FE_DIVBYZERO "; + if (fetestexcept(FE_DIVBYZERO)) + std::cerr << "FE_DIVBYZERO "; #endif #ifdef FE_UNDERFLOW - if (fetestexcept(FE_UNDERFLOW)) - std::cerr << "FE_UNDERFLOW "; + if (fetestexcept(FE_UNDERFLOW)) + std::cerr << "FE_UNDERFLOW "; #endif #ifdef FE_OVERFLOW - if (fetestexcept(FE_OVERFLOW)) - std::cerr << "FE_OVERFLOW "; + if (fetestexcept(FE_OVERFLOW)) + std::cerr << "FE_OVERFLOW "; #endif #if FE_INVALID - if (fetestexcept(FE_INVALID)) - std::cerr << "FE_INVALID "; + if (fetestexcept(FE_INVALID)) + std::cerr << "FE_INVALID "; #endif - std::cerr << std::endl; -#endif - } + std::cerr << std::endl; +#endif // defined(PPL_HAVE_FENV_H) exit(1); }

1 0

[GIT] ppl/ppl(master): Enable test12.
by Enea Zaffanella 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: 9857bc5b9ae3a4e4af7fe024d4ed9657103a845c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9857bc5b9ae3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Feb 16 20:06:43 2010 +0100 Enable test12. --- tests/Octagonal_Shape/upperboundifexact1.cc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tests/Octagonal_Shape/upperboundifexact1.cc b/tests/Octagonal_Shape/upperboundifexact1.cc index 16d2163..70a10a2 100644 --- a/tests/Octagonal_Shape/upperboundifexact1.cc +++ b/tests/Octagonal_Shape/upperboundifexact1.cc @@ -419,4 +419,5 @@ BEGIN_MAIN DO_TEST(test09); DO_TEST(test10); DO_TEST(test11); + DO_TEST(test12); END_MAIN

1 0

[GIT] ppl/ppl(master): A few improvements to PIP_Problem documentation.
by Enea Zaffanella 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: ac846ef3f2f47c8c6f6474331857211b318ad24f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ac846ef3f2f4… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Feb 16 20:05:36 2010 +0100 A few improvements to PIP_Problem documentation. --- src/PIP_Problem.cc | 14 +++--- src/PIP_Problem.defs.hh | 106 +++++++++++++++++++++++++---------------------- 2 files changed, 64 insertions(+), 56 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index c91abbb..07248d4 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -605,17 +605,17 @@ PPL::PIP_Problem::set_control_parameter(Control_Parameter_Value value) { } void -PPL::PIP_Problem::set_big_parameter_dimension(dimension_type x) { - if (parameters.count(x) == 0) +PPL::PIP_Problem::set_big_parameter_dimension(dimension_type big_dim) { + if (parameters.count(big_dim) == 0) throw std::invalid_argument("PPL::PIP_Problem::" - "set_big_parameter_dimension(x):\n" - "dimension 'x' is not a parameter."); - if (x < internal_space_dim) + "set_big_parameter_dimension(big_dim):\n" + "dimension 'big_dim' is not a parameter."); + if (big_dim < internal_space_dim) throw std::invalid_argument("PPL::PIP_Problem::" - "set_big_parameter_dimension(x):\n" + "set_big_parameter_dimension(big_dim):\n" "only newly-added parameters can be" "converted into the big parameter."); - big_parameter_dimension = x; + big_parameter_dimension = big_dim; } PPL::memory_size_type diff --git a/src/PIP_Problem.defs.hh b/src/PIP_Problem.defs.hh index e7d908b..459a309 100644 --- a/src/PIP_Problem.defs.hh +++ b/src/PIP_Problem.defs.hh @@ -51,23 +51,24 @@ operator<<(std::ostream& s, const PIP_Problem& p); //! A Parametric Integer (linear) Programming problem. /*! \ingroup PPL_CXX_interface An object of this class encodes a parametric integer (linear) - programming problem. - The PIP problem is specified by providing: + programming problem. The PIP problem is specified by providing: - the dimension of the vector space; - the subset of those dimensions of the vector space that are interpreted as integer parameters (the other space dimensions are interpreted as non-parameter integer variables); - - the feasible region, by means of a finite set of linear equality - and (strict or non-strict) inequality constraints involving both - variables and parameters; - - optionally, an initial context restricting the definition domain for - the parameters, by means of a finite set of linear equality and - (strict or non-strict) inequality constraints involving only - parameters; - - optionally, the dimension of a parameter to be considered arbitrarily - big; such a parameter is called the “big parameter”. - - All variables and parameters are considered non-negative integers. + - a finite set of linear equality and (strict or non-strict) + inequality constraints involving variables and/or parameters; + these constraints are used to define: + - the feasible region, if they involve one or more + problem variable (and maybe some parameters); + - the initial context, if they only involve the + parameters; + - optionally, the so-called big parameter, + i.e., a problem parameter to be considered arbitrarily big. + + Note that all problem variables and problem parameters are assumed + to take non-negative integer values, so that there is no need + to specify non-negativity constraints. The class provides support for the (incremental) solution of the PIP problem based on variations of the revised simplex method and @@ -81,29 +82,31 @@ operator<<(std::ostream& s, const PIP_Problem& p); As the feasibility and the solution value of a PIP problem depend on the values of the parameters, the solution is a binary decision tree, - dividing the context parameter set into subsets. The tree nodes are: - - decision nodes, encoding one or more linear tests on the parameters; - if all the tests are true, then the solution is the node's - “true” child, otherwise the solution is the node's - “false” child; - - solution nodes, encoding the solution of the problem in the current - context subset, where each variable is defined in terms of a linear - expression of the parameters. Solution nodes also embed an optionally - not empty set of parameter constraints, meaning if all constraint tests - are true, the solution is described by the node, otherwise the problem - is empty. - - Concerning the decision nodes, it may happen that a decision node has no - “false” or “true” child. This means the - corresponding test leads to an unfeasible solution. In addition, decision - nodes with two or more linear tests cannot have a “false” - child. - - Both tree node types may also contain the definition of extra parameters - which are artificially introduced by the solver to keep the solution - values integer. Such artificial parameters are defined by the integer - division of a linear expression on the parameters by an integer - coefficient. + dividing the context parameter set into subsets. + The tree nodes are of three kinds: + - \e Decision nodes. + These are internal tree nodes encoding one or more linear tests + on the parameters; if all the tests are satisfied, then the solution + is the node's \e true child; otherwise, the solution is the node's + \e false child; + - \e Solution nodes. + These are leaf nodes in the tree, encoding the solution of the problem + in the current context subset, where each variable is defined in terms + of a linear expression of the parameters. + Solution nodes also optionally embed a set of parameter constraints: + if all these constraints are satisfied, the solution is described by + the node, otherwise the problem has no solution. + + It may happen that a decision node has no \e false or \e true child. + This means that there is no solution satisfying the corresponding + constraints. Decision nodes having two or more linear tests on the + parameters cannot have a \e false child. + + Both kinds of tree nodes may also contain the definition of extra + parameters which are artificially introduced by the solver to enforce + an integral solution. Such artificial parameters are defined by + the integer division of a linear expression on the parameters + by an integer coefficient. By exploiting the incremental nature of the solver, it is possible to reuse part of the computational work already done when solving @@ -134,12 +137,12 @@ operator<<(std::ostream& s, const PIP_Problem& p); else _|_ \endcode - The \f$\perp\f$ notation, also called “bottom”, denotes - the lexicographic minimum of an empty set, here meaning the problem is - infeasible.\n - Also notice that a new parameter is defined after the first \c else. It - is only valid inside the block where it is defined, and is used when - formulating the value of the <tt>{i,j}</tt> vector. + The \f$\perp\f$ notation, also called \e bottom, denotes the + lexicographic minimum of an empty set, here meaning the problem is + unfeasible. Notice that a new parameter is defined after + the first \c else. It is only valid inside the block where it is + defined, and it is used when formulating the value of the + <tt>{i,j}</tt> vector. \par Context restriction The above solution is correct in an unrestricted original context, @@ -271,13 +274,13 @@ operator<<(std::ostream& s, const PIP_Problem& p); FIXME: different uses of the big parameter. */ class Parma_Polyhedra_Library::PIP_Problem { - friend class PIP_Solution_Node; public: //! Builds a trivial PIP problem. /*! - A trivial PIP problem requires to minimize the objective function - \f$0\f$ on a vector space under no constraints and with no parameters: - the origin of the vector space is an optimal solution. + A trivial PIP problem requires to compute the lexicographic minimum + on a vector space under no constraints and with no parameters: + due to the implicit non-negativity constraints, the origin of the + vector space is an optimal solution. \param dim The dimension of the vector space enclosing \p *this @@ -477,8 +480,9 @@ public: CUTTING_STRATEGY, //! Pivot row strategy PIVOT_ROW_STRATEGY, - +#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS //! Number of different enumeration values. +#endif // PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS CONTROL_PARAMETER_NAME_SIZE }; @@ -496,7 +500,9 @@ public: //! Choose the row which generates the lexico-maximal pivot column PIVOT_ROW_STRATEGY_MAX_COLUMN, +#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS //! Number of different enumeration values. +#endif // PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS CONTROL_PARAMETER_VALUE_SIZE }; @@ -507,8 +513,8 @@ public: //! Sets control parameter \p value. void set_control_parameter(Control_Parameter_Value value); - //! Sets the dimension for the big parameter - void set_big_parameter_dimension(dimension_type x); + //! Sets the dimension for the big parameter to \p big_dim. + void set_big_parameter_dimension(dimension_type big_dim); /*! \brief Returns the space dimension for the big parameter. @@ -581,6 +587,8 @@ private: if not set. */ dimension_type big_parameter_dimension; + + friend class PIP_Solution_Node; }; namespace std {

1 0

[GIT] ppl/ppl(master): Make the test trivially succeed when coefficients are not large enough.
by Roberto Bagnara 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: 1789a22b13784e38555109169a7216d9c05cd4d8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1789a22b1378… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 16 15:35:38 2010 +0100 Make the test trivially succeed when coefficients are not large enough. --- interfaces/C/tests/pip_test.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/interfaces/C/tests/pip_test.c b/interfaces/C/tests/pip_test.c index 93b6233..42cd3a4 100644 --- a/interfaces/C/tests/pip_test.c +++ b/interfaces/C/tests/pip_test.c @@ -203,13 +203,21 @@ main(int argc, char **argv) { if (ppl_set_error_handler(error_handler) < 0) fatal("cannot install the custom error handler"); + mpz_init(mpc); + + /* At least 32-bit coefficients are needed. */ + if (ppl_Coefficient_max(mpc) > 0 && mpz_fits_sshort_p(mpc)) { + mpz_clear(mpc); + ppl_finalize(); + return 0; + } + for (i = 0; i < N_PARAMETERS; ++i) parameter_dim[i] = i + N_VARS; ppl_new_PIP_Problem_from_space_dimension(&pip, N_VARS+N_PARAMETERS); ppl_PIP_Problem_add_to_parameter_space_dimensions(pip, parameter_dim, N_PARAMETERS); - mpz_init(mpc); ppl_new_Coefficient(&c); for (i = 0; i < N_CONSTRAINTS; ++i) { ppl_new_Linear_Expression(&le);

1 0

[GIT] ppl/ppl(floating_point): Fixed Cast_Floating_Point_Expression.inlines .hh and added a test.
by Roberto Amadini 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: floating_point Commit: eab71496fec3819d941c5c444cb09041aea7eb0f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=eab71496fec3… Author: Roberto Amadini <r.amadini(a)virgilio.it> Date: Tue Feb 16 15:11:53 2010 +0100 Fixed Cast_Floating_Point_Expression.inlines.hh and added a test. --- src/Cast_Floating_Point_Expression.inlines.hh | 2 +- src/Makefile.am | 4 ++ .../floatingpointexpr1.cc | 35 ++++++++++++++++++++ tests/ppl_test.hh | 7 ++++ 4 files changed, 47 insertions(+), 1 deletions(-) diff --git a/src/Cast_Floating_Point_Expression.inlines.hh b/src/Cast_Floating_Point_Expression.inlines.hh index 7112467..4e65ad0 100644 --- a/src/Cast_Floating_Point_Expression.inlines.hh +++ b/src/Cast_Floating_Point_Expression.inlines.hh @@ -47,7 +47,7 @@ template <typename FP_Interval_Type, typename FP_Format> inline void Cast_Floating_Point_Expression<FP_Interval_Type, FP_Format>::swap( Cast_Floating_Point_Expression& y) { - std::swap(value, y.value); + std::swap(expr, y.expr); } } // namespace Parma_Polyhedra_Library diff --git a/src/Makefile.am b/src/Makefile.am index d919dd2..24ca746 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -354,6 +354,10 @@ Floating_Point_Expression.types.hh \ Floating_Point_Expression.defs.hh \ Floating_Point_Expression.inlines.hh \ Floating_Point_Expression.templates.hh \ +Cast_Floating_Point_Expression.types.hh \ +Cast_Floating_Point_Expression.defs.hh \ +Cast_Floating_Point_Expression.inlines.hh \ +Cast_Floating_Point_Expression.templates.hh \ Constant_Floating_Point_Expression.types.hh \ Constant_Floating_Point_Expression.defs.hh \ Constant_Floating_Point_Expression.inlines.hh \ diff --git a/tests/Floating_Point_Expression/floatingpointexpr1.cc b/tests/Floating_Point_Expression/floatingpointexpr1.cc index 58615b3..ba917b3 100644 --- a/tests/Floating_Point_Expression/floatingpointexpr1.cc +++ b/tests/Floating_Point_Expression/floatingpointexpr1.cc @@ -332,6 +332,40 @@ test09() { return ok1 && ok2 && ok3; } +// Tests linearization of cast(X + Y). +bool +test10() { + Variable X(0); + Variable Y(1); + FP_Interval_Abstract_Store as(2); + FP_Linear_Form_Abstract_Store lf_as; + FP_Linear_Form l_con_x; + FP_Linear_Form l_con_y; + FP_Linear_Form l_cast; + Con_FP_Expression* con_x = new Con_FP_Expression(1 / 3.0, 1 / 3.0); + con_x->linearize(as, lf_as, l_con_x); + Con_FP_Expression* con_y = new Con_FP_Expression(-1 / 2.0, 1 / 2.0); + con_y->linearize(as, lf_as, l_con_y); + as.affine_form_image(X, l_con_x); + as.affine_form_image(Y, l_con_y); + Var_FP_Expression* var_x = new Var_FP_Expression(0); + Var_FP_Expression* var_y = new Var_FP_Expression(1); + Sum_FP_Expression* x_sum_y = new Sum_FP_Expression(var_x, var_y); + Cast_FP_Expression cast(x_sum_y); + cast.linearize(as, lf_as, l_cast); + + // FIXME: Computed result should over-approximates the known result. + FP_Interval result; + FP_Expression::intervalize(l_cast, as, result); + nout << "*** result ***" << endl << result << endl; + FP_Linear_Form l_kr(X); + l_kr += FP_Linear_Form(Y); + FP_Interval known_result; + FP_Expression::intervalize(l_kr, as, known_result); + nout << "*** known_result ***" << endl << known_result << endl; + return result.contains(known_result); +} + } // namespace BEGIN_MAIN @@ -344,4 +378,5 @@ BEGIN_MAIN DO_TEST(test07); DO_TEST(test08); DO_TEST(test09); + DO_TEST(test10); END_MAIN diff --git a/tests/ppl_test.hh b/tests/ppl_test.hh index 930a903..06c2b8c 100644 --- a/tests/ppl_test.hh +++ b/tests/ppl_test.hh @@ -588,6 +588,13 @@ typedef Floating_Point_Expression<FP_Interval, ANALYZED_FP_FORMAT> FP_Expression; /*! \brief + The incarnation of Cast_Floating_Point_Expression under test for + analyzing floating point computations. +*/ +typedef Cast_Floating_Point_Expression<FP_Interval, + ANALYZED_FP_FORMAT> Cast_FP_Expression; + +/*! \brief The incarnation of Constant_Floating_Point_Expression under test for analyzing floating point computations. */

1 0

[GIT] ppl/ppl(master): Improved error handling. Cosmetic improvements.
by Roberto Bagnara 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: c257cba9d19ca2084198e422ddcf0fa5f1afc8e8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c257cba9d19c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 16 14:41:52 2010 +0100 Improved error handling. Cosmetic improvements. --- interfaces/C/tests/pip_test.c | 40 +++++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/interfaces/C/tests/pip_test.c b/interfaces/C/tests/pip_test.c index f2ff197..93b6233 100644 --- a/interfaces/C/tests/pip_test.c +++ b/interfaces/C/tests/pip_test.c @@ -47,6 +47,12 @@ fatal(const char* format, ...) { } static void +error_handler(enum ppl_enum_error_code code, + const char* description) { + fatal("PPL error code %d: %s", code, description); +} + +static void display_solution_i(ppl_const_PIP_Tree_Node_t node, ppl_dimension_type n_vars, ppl_dimension_type n_params, @@ -139,7 +145,7 @@ display_solution_i(ppl_const_PIP_Tree_Node_t node, } } -void +static void display_solution(ppl_const_PIP_Tree_Node_t node, ppl_dimension_type n_vars, ppl_dimension_type n_params, @@ -149,10 +155,9 @@ display_solution(ppl_const_PIP_Tree_Node_t node, vars = malloc(n_vars*sizeof(ppl_dimension_type)); dim = n_vars+n_params; - /* construct the array of variable space indices. This requires the params - array to be sorted in ascending order. - */ - for (i=0, j=0, k=0; i<dim; ++i) { + /* Construct the array of variable space indices. This requires the + params array to be sorted in ascending order. */ + for (i = 0, j = 0, k = 0; i < dim; ++i) { if (k == n_params || i < params[k]) vars[j++] = i; else @@ -165,6 +170,7 @@ display_solution(ppl_const_PIP_Tree_Node_t node, #define N_VARS 2 #define N_PARAMETERS 2 #define N_CONSTRAINTS 4 + int main(int argc, char **argv) { ppl_PIP_Problem_t pip; @@ -175,32 +181,39 @@ main(int argc, char **argv) { mpz_t mpc; int ok; + static ppl_dimension_type parameter_dim[N_PARAMETERS]; + static int coef[N_CONSTRAINTS][N_VARS+N_PARAMETERS+1] = { - { 2, 3, 0, 0, -8 }, - { 4, -1, 0, 0, -4 }, - { 0, -1, 0, 1, 0 }, - { -1, 0, 1, 0, 0 }, + { 2, 3, 0, 0, -8 }, + { 4, -1, 0, 0, -4 }, + { 0, -1, 0, 1, 0 }, + { -1, 0, 1, 0, 0 }, }; - ppl_dimension_type parameter_dim[N_PARAMETERS]; program_name = argv[0]; + if (argc != 1) { fprintf(stderr, "usage: %s\n", program_name); exit(1); } + if (ppl_initialize() < 0) fatal("cannot initialize the Parma Polyhedra Library"); - for (i=0; i<N_PARAMETERS; ++i) + if (ppl_set_error_handler(error_handler) < 0) + fatal("cannot install the custom error handler"); + + for (i = 0; i < N_PARAMETERS; ++i) parameter_dim[i] = i + N_VARS; + ppl_new_PIP_Problem_from_space_dimension(&pip, N_VARS+N_PARAMETERS); ppl_PIP_Problem_add_to_parameter_space_dimensions(pip, parameter_dim, N_PARAMETERS); mpz_init(mpc); ppl_new_Coefficient(&c); - for (i=0; i<N_CONSTRAINTS; ++i) { + for (i = 0; i < N_CONSTRAINTS; ++i) { ppl_new_Linear_Expression(&le); - for (j=0; j<N_VARS+N_PARAMETERS; ++j) { + for (j = 0; j < N_VARS+N_PARAMETERS; ++j) { mpz_set_si(mpc, coef[i][j]); ppl_assign_Coefficient_from_mpz_t(c, mpc); ppl_Linear_Expression_add_to_coefficient(le, j, c); @@ -217,6 +230,7 @@ main(int argc, char **argv) { mpz_clear(mpc); 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

[GIT] ppl/ppl(master): Added unit tests for inner class PIP_Tree_Node:: Artificial_Parameter.
by Enea Zaffanella 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: b89a40da063ca44e5e28e0fad8a1001361cc131c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b89a40da063c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Feb 16 14:38:15 2010 +0100 Added unit tests for inner class PIP_Tree_Node::Artificial_Parameter. Added operator!=() and swap() methods: the last was necessary as we were inheriting it from Linear_Expression. --- src/PIP_Tree.cc | 13 ++++++++-- src/PIP_Tree.defs.hh | 14 +++++++++-- src/PIP_Tree.inlines.hh | 6 +++++ tests/PIP_Problem/ascii_dump_load1.cc | 22 ++++++++++++++++++ tests/PIP_Problem/exceptions1.cc | 19 +++++++++++++++ tests/PIP_Problem/pipproblem2.cc | 40 +++++++++++++++++++++++++++++++++ 6 files changed, 108 insertions(+), 6 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 8a38aca..e92664f 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -291,8 +291,9 @@ PIP_Tree_Node::PIP_Tree_Node(const PIP_Tree_Node& y) } bool -operator==(const PIP_Tree_Node::Artificial_Parameter& x, - const PIP_Tree_Node::Artificial_Parameter& y) { +PIP_Tree_Node::Artificial_Parameter +::operator==(const PIP_Tree_Node::Artificial_Parameter& y) const { + const Artificial_Parameter& x = *this; if (x.space_dimension() != y.space_dimension()) return false; if (x.denominator != y.denominator) @@ -305,6 +306,12 @@ operator==(const PIP_Tree_Node::Artificial_Parameter& x, return true; } +bool +PIP_Tree_Node::Artificial_Parameter +::operator!=(const PIP_Tree_Node::Artificial_Parameter& y) const { + return !operator==(y); +} + void PIP_Tree_Node::Artificial_Parameter::ascii_dump(std::ostream& s) const { s << "artificial_parameter "; @@ -1809,7 +1816,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; - // ENEA: FIXME: why iterating downwards makes a difference? + // FIXME: why iterating downwards makes a difference? // for (dimension_type i = num_rows; i-- > 0; ) { for (dimension_type i = 0; i < num_rows; ++i) { Row& s_i = tableau.s[i]; diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index b7b8577..cfaed23 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -243,9 +243,17 @@ public: //! Returns the normalized (i.e., positive) denominator. Coefficient_traits::const_reference get_denominator() const; - //! Returns \b true if \p x and \p y are equal. - friend bool operator==(const Artificial_Parameter& x, - const Artificial_Parameter& y); + //! Swaps \p *this with \p y. + void swap(Artificial_Parameter& y); + + //! Returns \c true if and only if \p *this and \p y are equal. + /*! + Note that two artificial parameters having different space dimensions + are considered to be different. + */ + bool operator==(const Artificial_Parameter& y) const; + //! Returns \c true if and only if \p *this and \p y are different. + bool operator!=(const Artificial_Parameter& y) const; PPL_OUTPUT_DECLARATIONS diff --git a/src/PIP_Tree.inlines.hh b/src/PIP_Tree.inlines.hh index 6544e59..9c86647 100644 --- a/src/PIP_Tree.inlines.hh +++ b/src/PIP_Tree.inlines.hh @@ -145,6 +145,12 @@ PIP_Tree_Node::Artificial_Parameter::get_denominator() const { return denominator; } +inline void +PIP_Tree_Node::Artificial_Parameter::swap(Artificial_Parameter& y) { + Linear_Expression::swap(y); + std::swap(denominator, y.denominator); +} + } // namespace Parma_Polyhedra_Library #endif // !defined(PPL_PIP_Tree_inlines_hh) diff --git a/tests/PIP_Problem/ascii_dump_load1.cc b/tests/PIP_Problem/ascii_dump_load1.cc index d4c814e..d0cbceb 100644 --- a/tests/PIP_Problem/ascii_dump_load1.cc +++ b/tests/PIP_Problem/ascii_dump_load1.cc @@ -224,6 +224,27 @@ test07() { return ok; } +bool +test08() { + typedef PIP_Tree_Node::Artificial_Parameter Art_Param; + + Variable A(0); + + Art_Param ap1(3*A + 8, -5); + std::stringstream ss1; + ap1.ascii_dump(ss1); + + Art_Param ap2; + bool ok = ap2.ascii_load(ss1); + + std::stringstream ss2; + ap2.ascii_dump(ss2); + + ok &= (ap1 == ap2) && (ss1.str() == ss2.str()); + + return ok; +} + } // namespace BEGIN_MAIN @@ -234,4 +255,5 @@ BEGIN_MAIN DO_TEST(test05); DO_TEST(test06); DO_TEST(test07); + DO_TEST(test08); END_MAIN diff --git a/tests/PIP_Problem/exceptions1.cc b/tests/PIP_Problem/exceptions1.cc index 5b27b09..3f01ab1 100644 --- a/tests/PIP_Problem/exceptions1.cc +++ b/tests/PIP_Problem/exceptions1.cc @@ -258,6 +258,24 @@ test11() { return false; } +bool +test12() { + typedef PIP_Tree_Node::Artificial_Parameter Art_Param; + Variable A(0); + + try { + // Trying to set an invalid (zero) denominator. + Art_Param ap(3*A + 8, 0); + } + catch (std::invalid_argument& e) { + nout << "invalid_argument: " << e.what() << endl << endl; + return true; + } + catch (...) { + } + return false; +} + } // namespace BEGIN_MAIN @@ -272,4 +290,5 @@ BEGIN_MAIN DO_TEST(test09); DO_TEST(test10); DO_TEST(test11); + DO_TEST(test12); END_MAIN diff --git a/tests/PIP_Problem/pipproblem2.cc b/tests/PIP_Problem/pipproblem2.cc index 06ae7f7..8f476e4 100644 --- a/tests/PIP_Problem/pipproblem2.cc +++ b/tests/PIP_Problem/pipproblem2.cc @@ -244,6 +244,45 @@ test13() { return ok; } +bool +test14() { + // Some unit testing on inner class Artificial_Parameter. + typedef PIP_Tree_Node::Artificial_Parameter Art_Param; + + Variable A(0); + + Art_Param ap0; + Art_Param ap1(3*A + 8, -5); + Art_Param ap2(ap1); + + bool ok = ap0.OK() && ap1.OK() && ap2.OK(); + + ok &= (ap0 != ap1) && (ap1 == ap2); + ok &= (ap0.get_denominator() == 1) && (ap1.get_denominator() == 5); + + ap0.swap(ap2); + ok &= (ap0 == ap1) && (ap2.get_denominator() == 1); + + using namespace IO_Operators; + nout << ap1; + + ok &= (ap1.external_memory_in_bytes() < ap1.total_memory_in_bytes()); + + // Difference found in space dimension. + ok &= (ap1 != ap2); + // Difference found in denominator. + Art_Param ap3(3*A + 8, -6); + ok &= (ap1 != ap3); + // Difference found in inhomogeneous term. + Art_Param ap4(3*A + 7, -5); + ok &= (ap1 != ap4); + // Difference found in A's coefficient. + Art_Param ap5(2*A + 8, -5); + ok &= (ap1 != ap5); + + return ok; +} + } // namespace BEGIN_MAIN @@ -260,4 +299,5 @@ BEGIN_MAIN DO_TEST(test11); DO_TEST(test12); DO_TEST(test13); + DO_TEST(test14); END_MAIN

1 0

[GIT] ppl/ppl(master): Added another test for code coverage purposes.
by Enea Zaffanella 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: 5ddd5a9f223cf20b900479c09cce42685e562b51 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5ddd5a9f223c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Feb 16 12:00:43 2010 +0100 Added another test for code coverage purposes. --- tests/PIP_Problem/pipproblem2.cc | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/tests/PIP_Problem/pipproblem2.cc b/tests/PIP_Problem/pipproblem2.cc index d2ebf46..06ae7f7 100644 --- a/tests/PIP_Problem/pipproblem2.cc +++ b/tests/PIP_Problem/pipproblem2.cc @@ -220,6 +220,30 @@ test12() { return ok; } +bool +test13() { + Variable i(0); + Variable j(1); + Variable k(2); + Variable m(3); + Variable n(4); + Variables_Set params(k, n); + + Constraint_System cs; + cs.insert(i <= m); + cs.insert(j <= n); + cs.insert(2*i+j == 2*m+n-k); + + PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); + + PIP_Tree pip_tree = pip.solution(); + const PIP_Solution_Node* sol_node = pip_tree->as_solution(); + const PIP_Decision_Node* dec_node = pip_tree->as_decision(); + bool ok = (sol_node == 0 && dec_node != 0); + + return ok; +} + } // namespace BEGIN_MAIN @@ -235,4 +259,5 @@ BEGIN_MAIN DO_TEST(test10); DO_TEST(test11); DO_TEST(test12); + DO_TEST(test13); END_MAIN

1 0

[GIT] ppl/ppl(master): Got rid of unused Boolean flag PIP_Problem:: initialized.
by Enea Zaffanella 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: 632f4386677025eb9f52416657dd161f11601737 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=632f43866770… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Feb 16 09:58:05 2010 +0100 Got rid of unused Boolean flag PIP_Problem::initialized. --- src/PIP_Problem.cc | 16 ---------------- src/PIP_Problem.defs.hh | 7 ------- src/PIP_Problem.inlines.hh | 1 - src/PIP_Problem.templates.hh | 1 - 4 files changed, 0 insertions(+), 25 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index e17619a..c91abbb 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -38,7 +38,6 @@ PPL::PIP_Problem::PIP_Problem(const dimension_type dim) internal_space_dim(0), status(PARTIALLY_SATISFIABLE), current_solution(0), - initialized(false), input_cs(), first_pending_constraint(0), parameters(), @@ -58,7 +57,6 @@ PPL::PIP_Problem::PIP_Problem(const PIP_Problem &y) internal_space_dim(y.internal_space_dim), status(y.status), current_solution(0), - initialized(y.initialized), input_cs(y.input_cs), first_pending_constraint(y.first_pending_constraint), parameters(y.parameters), @@ -298,8 +296,6 @@ PPL::PIP_Problem::ascii_dump(std::ostream& s) const { s << "\nfirst_pending_constraint: " << first_pending_constraint << "\n"; - s << "\ninitialized: " << (initialized ? "YES" : "NO") << "\n"; - s << "\nstatus: "; switch (status) { case UNSATISFIABLE: @@ -403,17 +399,6 @@ PPL::PIP_Problem::ascii_load(std::istream& s) { if (!(s >> first_pending_constraint)) return false; - if (!(s >> str) || str != "initialized:") - return false; - if (!(s >> str)) - return false; - if (str == "YES") - initialized = true; - else if (str == "NO") - initialized = false; - else - return false; - if (!(s >> str) || str != "status:") return false; @@ -505,7 +490,6 @@ PPL::PIP_Problem::clear() { delete current_solution; current_solution = 0; } - initialized = false; input_cs.clear(); first_pending_constraint = 0; parameters.clear(); diff --git a/src/PIP_Problem.defs.hh b/src/PIP_Problem.defs.hh index e12fb0e..e7d908b 100644 --- a/src/PIP_Problem.defs.hh +++ b/src/PIP_Problem.defs.hh @@ -553,13 +553,6 @@ private: //! The current solution decision tree PIP_Tree_Node* current_solution; - /*! \brief - A Boolean encoding whether or not internal data structures have - already been properly sized and populated: useful to allow for - deeper checks in method OK(). - */ - bool initialized; - //! The sequence of constraints describing the feasible region. Constraint_Sequence input_cs; diff --git a/src/PIP_Problem.inlines.hh b/src/PIP_Problem.inlines.hh index fc67f13..d09b3c3 100644 --- a/src/PIP_Problem.inlines.hh +++ b/src/PIP_Problem.inlines.hh @@ -56,7 +56,6 @@ PIP_Problem::swap(PIP_Problem& y) { std::swap(internal_space_dim, y.internal_space_dim); std::swap(status, y.status); std::swap(current_solution, y.current_solution); - std::swap(initialized, y.initialized); std::swap(input_cs, y.input_cs); std::swap(first_pending_constraint, y.first_pending_constraint); std::swap(parameters, y.parameters); diff --git a/src/PIP_Problem.templates.hh b/src/PIP_Problem.templates.hh index 3197e87..9faa49d 100644 --- a/src/PIP_Problem.templates.hh +++ b/src/PIP_Problem.templates.hh @@ -36,7 +36,6 @@ PIP_Problem::PIP_Problem(dimension_type dim, internal_space_dim(0), status(PARTIALLY_SATISFIABLE), current_solution(0), - initialized(false), input_cs(), first_pending_constraint(0), parameters(p_vars),

1 0