February 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Fixed oversight in error-handling code.
by Roberto Bagnara 22 Feb '10

22 Feb '10

Module: ppl/ppl Branch: master Commit: 537a4928e00e2b811822089da4cf12a1dd4344cf URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=537a4928e00e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 22 09:16:36 2010 +0100 Fixed oversight in error-handling code. --- interfaces/C/tests/watchdog1.c | 6 ++++-- interfaces/C/tests/weightwatch1.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/interfaces/C/tests/watchdog1.c b/interfaces/C/tests/watchdog1.c index 45a01cc..a75ed07 100644 --- a/interfaces/C/tests/watchdog1.c +++ b/interfaces/C/tests/watchdog1.c @@ -20,9 +20,10 @@ 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_c.h" +#include "ppl_c_test.h" #include <stdlib.h> #include <stdarg.h> +#include <stdio.h> static const char* program_name = 0; @@ -54,7 +55,8 @@ error_handler(enum ppl_enum_error_code code, if (code == PPL_ERROR_INTERNAL_ERROR) my_exit(0); #endif - fatal("PPL error code %d: %s", code, description); + if (check_noisy() || check_very_noisy()) + fprintf(stderr, "PPL error code %d: %s\n", code, description); } void diff --git a/interfaces/C/tests/weightwatch1.c b/interfaces/C/tests/weightwatch1.c index 7882be1..cf1bab3 100644 --- a/interfaces/C/tests/weightwatch1.c +++ b/interfaces/C/tests/weightwatch1.c @@ -20,9 +20,10 @@ 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_c.h" +#include "ppl_c_test.h" #include <stdlib.h> #include <stdarg.h> +#include <stdio.h> static const char* program_name = 0; @@ -46,7 +47,8 @@ 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); + if (check_noisy() || check_very_noisy()) + fprintf(stderr, "PPL error code %d: %s\n", code, description); } void

1 0

[GIT] ppl/ppl(master): Avoid printing unless noisy or very-noisy mode was requested.
by Roberto Bagnara 22 Feb '10

22 Feb '10

Module: ppl/ppl Branch: master Commit: 1b73c49a9febf62e96f8ee03460e789c8164ee9a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b73c49a9feb… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 22 09:16:06 2010 +0100 Avoid printing unless noisy or very-noisy mode was requested. --- interfaces/C/tests/pip_test.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/interfaces/C/tests/pip_test.c b/interfaces/C/tests/pip_test.c index 71f0a68..32fc606 100644 --- a/interfaces/C/tests/pip_test.c +++ b/interfaces/C/tests/pip_test.c @@ -21,7 +21,6 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://www.cs.unipr.it/ppl/ . */ #include "ppl_c_test.h" - #include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -62,7 +61,8 @@ display_solution_i(ppl_const_PIP_Tree_Node_t node, if (!node) { /* A null pointer indicates the polyhedron is empty. */ printf("%*s_|_\n", indent*2, ""); - } else { + } + else { ppl_dimension_type space_dimension = n_vars + n_params; ppl_dimension_type new_params; ppl_const_Constraint_System_t constraints; @@ -122,7 +122,8 @@ display_solution_i(ppl_const_PIP_Tree_Node_t node, printf("%*selse\n", indent*2, ""); ppl_PIP_Decision_Node_get_child_node(dn, 0, &child); display_solution_i(child, n_vars, n_params, vars, parameters, indent+1); - } else { + } + else { /* The node is a solution Node: display the expression of the vars. */ int notfirst = 0; ppl_const_PIP_Solution_Node_t sn; @@ -250,7 +251,8 @@ main(int argc, char **argv) { ppl_PIP_Problem_space_dimension(pip, &dim); ppl_PIP_Problem_solution(pip, &solution); - display_solution(solution, N_VARS, N_PARAMETERS, parameter_dim); + if (check_noisy() || check_very_noisy()) + 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);

1 0

[GIT] ppl/ppl(master): Be more informative in case something goes wrong.
by Roberto Bagnara 21 Feb '10

21 Feb '10

Module: ppl/ppl Branch: master Commit: e52d48a8ab59a5036becb3413b8f63c2d2bd1e83 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e52d48a8ab59… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 21 18:07:01 2010 +0100 Be more informative in case something goes wrong. --- tests/Polyhedron/watchdog1.cc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tests/Polyhedron/watchdog1.cc b/tests/Polyhedron/watchdog1.cc index 0548f52..3350554 100644 --- a/tests/Polyhedron/watchdog1.cc +++ b/tests/Polyhedron/watchdog1.cc @@ -81,7 +81,12 @@ timed_compute_open_hypercube_generators(dimension_type dimension, nout << " s" << endl; return false; } + catch (const std::exception& e) { + nout << "unexpected std::exception: \n" << e.what() << endl; + exit(1); + } catch (...) { + nout << "unexpected unknown exception" << endl; exit(1); } // Should never get here.

1 0

[GIT] ppl/ppl(master): Use the C++ compiler to perform the tests meant for C++.
by Roberto Bagnara 21 Feb '10

21 Feb '10

Module: ppl/ppl Branch: master Commit: 3bbfa4bc9da9558d0b538c95c00607b2928bb9d1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3bbfa4bc9da9… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 21 18:05:49 2010 +0100 Use the C++ compiler to perform the tests meant for C++. --- Watchdog/configure.ac | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Watchdog/configure.ac b/Watchdog/configure.ac index d4e2b86..278a32d 100644 --- a/Watchdog/configure.ac +++ b/Watchdog/configure.ac @@ -306,6 +306,9 @@ AM_CONDITIONAL(HAVE_PERL, test x"$PERL" != xno) AC_LANG(C) AC_C_CONST +# Use C++ for the remaining checks. +AC_LANG(C++) + enableval=no AC_MSG_CHECKING([whether tests should be run under Valgrind]) AC_ARG_ENABLE(valgrind-tests,

1 0

[GIT] ppl/ppl(master): sigaction() is also needed, in addition to setitimer () in order to support Watchdog objects.
by Roberto Bagnara 21 Feb '10

21 Feb '10

Module: ppl/ppl Branch: master Commit: 9b0ba93300fb829608d40e766b9f3f95c81962e1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9b0ba93300fb… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 21 12:49:16 2010 +0100 sigaction() is also needed, in addition to setitimer() in order to support Watchdog objects. We could check if signal() is available if there is request for such a feature. --- Watchdog/src/Watchdog.cc | 4 ++-- Watchdog/src/Watchdog.defs.hh | 12 ++++++------ Watchdog/src/Watchdog.inlines.hh | 6 +++--- Watchdog/src/pwl_header.hh | 3 ++- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Watchdog/src/Watchdog.cc b/Watchdog/src/Watchdog.cc index 84ccda3..93449be 100644 --- a/Watchdog/src/Watchdog.cc +++ b/Watchdog/src/Watchdog.cc @@ -26,7 +26,7 @@ site: http://www.cs.unipr.it/ppl/ . */ namespace PWL = Parma_Watchdog_Library; -#if PWL_HAVE_DECL_SETITIMER +#if PWL_HAVE_DECL_SETITIMER && PWL_HAVE_DECL_SIGACTION #include <csignal> #include <iostream> @@ -244,4 +244,4 @@ PWL::Watchdog::finalize() { unsigned int PWL::Init::count = 0; -#endif // PWL_HAVE_DECL_SETITIMER +#endif // PWL_HAVE_DECL_SETITIMER && PWL_HAVE_DECL_SIGACTION diff --git a/Watchdog/src/Watchdog.defs.hh b/Watchdog/src/Watchdog.defs.hh index 674954d..7e0f6f5 100644 --- a/Watchdog/src/Watchdog.defs.hh +++ b/Watchdog/src/Watchdog.defs.hh @@ -61,7 +61,7 @@ public: //! Destructor. ~Watchdog(); -#if PWL_HAVE_DECL_SETITIMER +#if PWL_HAVE_DECL_SETITIMER && PWL_HAVE_DECL_SIGACTION private: typedef Pending_List<Watchdog_Traits> WD_Pending_List; @@ -133,10 +133,10 @@ private: friend void PWL_handle_timeout(int signum); -#endif // PWL_HAVE_DECL_SETITIMER +#endif // PWL_HAVE_DECL_SETITIMER && PWL_HAVE_DECL_SIGACTION }; -#if PWL_HAVE_DECL_SETITIMER +#if PWL_HAVE_DECL_SETITIMER && PWL_HAVE_DECL_SIGACTION class Init { private: @@ -151,13 +151,13 @@ public: ~Init(); }; -#endif // PWL_HAVE_DECL_SETITIMER +#endif // PWL_HAVE_DECL_SETITIMER && PWL_HAVE_DECL_SIGACTION } // namespace Parma_Watchdog_Library #include "Watchdog.inlines.hh" -#if PWL_HAVE_DECL_SETITIMER +#if PWL_HAVE_DECL_SETITIMER && PWL_HAVE_DECL_SIGACTION namespace { @@ -165,7 +165,7 @@ Parma_Watchdog_Library::Init Parma_Watchdog_Library_initializer; } // namespace -#endif // PWL_HAVE_DECL_SETITIMER +#endif // PWL_HAVE_DECL_SETITIMER && PWL_HAVE_DECL_SIGACTION #endif // !defined(PWL_Watchdog_defs_hh) diff --git a/Watchdog/src/Watchdog.inlines.hh b/Watchdog/src/Watchdog.inlines.hh index 6cdd654..6591359 100644 --- a/Watchdog/src/Watchdog.inlines.hh +++ b/Watchdog/src/Watchdog.inlines.hh @@ -29,7 +29,7 @@ site: http://www.cs.unipr.it/ppl/ . */ namespace Parma_Watchdog_Library { -#if PWL_HAVE_DECL_SETITIMER +#if PWL_HAVE_DECL_SETITIMER && PWL_HAVE_DECL_SIGACTION template <typename Flag_Base, typename Flag> Watchdog::Watchdog(unsigned int units, @@ -89,7 +89,7 @@ Init::~Init() { } } -#else // !PWL_HAVE_DECL_SETITIMER +#else // !PWL_HAVE_DECL_SETITIMER !! !PWL_HAVE_DECL_SIGACTION template <typename Flag_Base, typename Flag> Watchdog::Watchdog(unsigned int /* units */, @@ -109,7 +109,7 @@ inline Watchdog::~Watchdog() { } -#endif // !PWL_HAVE_DECL_SETITIMER +#endif // !PWL_HAVE_DECL_SETITIMER !! !PWL_HAVE_DECL_SIGACTION } // namespace Parma_Watchdog_Library diff --git a/Watchdog/src/pwl_header.hh b/Watchdog/src/pwl_header.hh index 3a65df6..8df3a05 100644 --- a/Watchdog/src/pwl_header.hh +++ b/Watchdog/src/pwl_header.hh @@ -32,7 +32,8 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "pwl_include_files.hh" //! Defined to 1 if PWL::Watchdog objects are supported, to 0 otherwise. -#define PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED PWL_HAVE_DECL_SETITIMER +#define PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED \ + (PWL_HAVE_DECL_SETITIMER && PWL_HAVE_DECL_SIGACTION) #ifdef PWL_SAVE_NDEBUG # ifndef NDEBUG

1 0

[GIT] ppl/ppl(master): If setitimer() is not available, no initialization is necessary.
by Roberto Bagnara 21 Feb '10

21 Feb '10

Module: ppl/ppl Branch: master Commit: 1fa465112d1f5519310f47de08494b765c420b8f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1fa465112d1f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 21 11:16:27 2010 +0100 If setitimer() is not available, no initialization is necessary. This also works around a linking bug in Mingw. C tests improved with error-handling code. --- Watchdog/src/Watchdog.cc | 4 +- Watchdog/src/Watchdog.defs.hh | 8 ++++++ Watchdog/src/Watchdog.inlines.hh | 16 ----------- interfaces/C/tests/watchdog1.c | 51 +++++++++++++++++++++++++++++++++++- interfaces/C/tests/weightwatch1.c | 43 +++++++++++++++++++++++++++++- 5 files changed, 100 insertions(+), 22 deletions(-) diff --git a/Watchdog/src/Watchdog.cc b/Watchdog/src/Watchdog.cc index 68ed01f..84ccda3 100644 --- a/Watchdog/src/Watchdog.cc +++ b/Watchdog/src/Watchdog.cc @@ -242,6 +242,6 @@ void PWL::Watchdog::finalize() { } -#endif // PWL_HAVE_DECL_SETITIMER - unsigned int PWL::Init::count = 0; + +#endif // PWL_HAVE_DECL_SETITIMER diff --git a/Watchdog/src/Watchdog.defs.hh b/Watchdog/src/Watchdog.defs.hh index a6ec958..674954d 100644 --- a/Watchdog/src/Watchdog.defs.hh +++ b/Watchdog/src/Watchdog.defs.hh @@ -136,6 +136,8 @@ private: #endif // PWL_HAVE_DECL_SETITIMER }; +#if PWL_HAVE_DECL_SETITIMER + class Init { private: //! Count the number of objects created. @@ -149,15 +151,21 @@ public: ~Init(); }; +#endif // PWL_HAVE_DECL_SETITIMER + } // namespace Parma_Watchdog_Library #include "Watchdog.inlines.hh" +#if PWL_HAVE_DECL_SETITIMER + namespace { Parma_Watchdog_Library::Init Parma_Watchdog_Library_initializer; } // namespace +#endif // PWL_HAVE_DECL_SETITIMER + #endif // !defined(PWL_Watchdog_defs_hh) diff --git a/Watchdog/src/Watchdog.inlines.hh b/Watchdog/src/Watchdog.inlines.hh index 80258dd..6cdd654 100644 --- a/Watchdog/src/Watchdog.inlines.hh +++ b/Watchdog/src/Watchdog.inlines.hh @@ -109,22 +109,6 @@ inline Watchdog::~Watchdog() { } -inline -Init::Init() { - // Only when the first Init object is constructed... - if (count++ == 0) { - // ... the library is initialized. - } -} - -inline -Init::~Init() { - // Only when the last Init object is destroyed... - if (--count == 0) { - // ... the library is finalized. - } -} - #endif // !PWL_HAVE_DECL_SETITIMER } // namespace Parma_Watchdog_Library diff --git a/interfaces/C/tests/watchdog1.c b/interfaces/C/tests/watchdog1.c index 2fa9097..45a01cc 100644 --- a/interfaces/C/tests/watchdog1.c +++ b/interfaces/C/tests/watchdog1.c @@ -22,6 +22,40 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "ppl_c.h" #include <stdlib.h> +#include <stdarg.h> + +static const char* program_name = 0; + +static void +my_exit(int status) { + (void) ppl_finalize(); + exit(status); +} + +static void +fatal(const char* format, ...) { + va_list ap; + fprintf(stderr, "%s: ", program_name); + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); + fprintf(stderr, "\n"); + my_exit(1); +} + +static void +error_handler(enum ppl_enum_error_code code, + const char* description) { +#if !PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED + /* If Watchdog objects are not supported, an error will occur: + this is normal. + FIXME: what is not normal is the use of this error code, which + the documentation reserves for PPL bugs. */ + if (code == PPL_ERROR_INTERNAL_ERROR) + my_exit(0); +#endif + fatal("PPL error code %d: %s", code, description); +} void open_hypercube(int dimension, ppl_Polyhedron_t ph) { @@ -93,9 +127,22 @@ timed_compute_open_hypercube_generators(int hundredth_secs, } int -main() { - ppl_initialize(); +main(int argc, char **argv) { + 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"); + + if (ppl_set_error_handler(error_handler) < 0) + fatal("cannot install the custom error handler"); + timed_compute_open_hypercube_generators(200, 20); + ppl_finalize(); return 0; } diff --git a/interfaces/C/tests/weightwatch1.c b/interfaces/C/tests/weightwatch1.c index a054624..7882be1 100644 --- a/interfaces/C/tests/weightwatch1.c +++ b/interfaces/C/tests/weightwatch1.c @@ -22,6 +22,32 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "ppl_c.h" #include <stdlib.h> +#include <stdarg.h> + +static const char* program_name = 0; + +static void +my_exit(int status) { + (void) ppl_finalize(); + exit(status); +} + +static void +fatal(const char* format, ...) { + va_list ap; + fprintf(stderr, "%s: ", program_name); + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); + fprintf(stderr, "\n"); + my_exit(1); +} + +static void +error_handler(enum ppl_enum_error_code code, + const char* description) { + fatal("PPL error code %d: %s", code, description); +} void open_hypercube(int dimension, ppl_Polyhedron_t ph) { @@ -93,9 +119,22 @@ weighted_compute_open_hypercube_generators(unsigned weight, } int -main() { - ppl_initialize(); +main(int argc, char **argv) { + 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"); + + if (ppl_set_error_handler(error_handler) < 0) + fatal("cannot install the custom error handler"); + weighted_compute_open_hypercube_generators(1000, 20); + ppl_finalize(); return 0; }

1 0

[GIT] ppl/ppl(floating_point): Floating_Point_Expression:: absolute_error is now a symmetric interval.
by Roberto Amadini 20 Feb '10

20 Feb '10

Module: ppl/ppl Branch: floating_point Commit: 99eaa536d87db8c8a5b34ab451196d11a57aa6a1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=99eaa536d87d… Author: Roberto Amadini <r.amadini(a)virgilio.it> Date: Sat Feb 20 16:49:27 2010 +0100 Floating_Point_Expression::absolute_error is now a symmetric interval. --- src/Cast_Floating_Point_Expression.templates.hh | 5 +-- ...fference_Floating_Point_Expression.templates.hh | 5 +-- ...Division_Floating_Point_Expression.templates.hh | 5 +-- src/Floating_Point_Expression.defs.hh | 36 +++++++++++--------- src/Floating_Point_Expression.templates.hh | 31 +++++++++++++---- ...lication_Floating_Point_Expression.templates.hh | 5 +-- src/Sum_Floating_Point_Expression.templates.hh | 5 +-- .../floatingpointexpr1.cc | 28 ++++----------- 8 files changed, 57 insertions(+), 63 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=99eaa536…

1 0

[GIT] ppl/ppl(floating_point): Use build method instead of join_assign to build convex intervals.
by Roberto Amadini 20 Feb '10

20 Feb '10

Module: ppl/ppl Branch: floating_point Commit: bdae3bb7bff529ab9864b997f66507f20db38719 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bdae3bb7bff5… Author: Roberto Amadini <r.amadini(a)virgilio.it> Date: Sat Feb 20 14:39:08 2010 +0100 Use build method instead of join_assign to build convex intervals. --- src/Cast_Floating_Point_Expression.templates.hh | 6 +++--- src/Constant_Floating_Point_Expression.defs.hh | 2 -- src/Constant_Floating_Point_Expression.inlines.hh | 7 +++---- ...fference_Floating_Point_Expression.templates.hh | 6 +++--- ...Division_Floating_Point_Expression.templates.hh | 6 +++--- src/Floating_Point_Expression.templates.hh | 14 ++++++++------ ...lication_Floating_Point_Expression.templates.hh | 6 +++--- src/Sum_Floating_Point_Expression.templates.hh | 6 +++--- tests/Floating_Point_Expression/digitalfilters1.cc | 6 +++--- 9 files changed, 29 insertions(+), 30 deletions(-) diff --git a/src/Cast_Floating_Point_Expression.templates.hh b/src/Cast_Floating_Point_Expression.templates.hh index 671886c..b4c5ba8 100644 --- a/src/Cast_Floating_Point_Expression.templates.hh +++ b/src/Cast_Floating_Point_Expression.templates.hh @@ -36,9 +36,9 @@ bool Cast_Floating_Point_Expression<FP_Interval_Type, FP_Format> FP_Linear_Form rel_error; relative_error(result, rel_error); result += rel_error; - FP_Interval_Type abs_error(-this->absolute_error); - // FIXME: this may be incorrect for some policies. - abs_error.join_assign(this->absolute_error); + FP_Interval_Type abs_error; + abs_error.build(i_constraint(GREATER_OR_EQUAL, -this->absolute_error), + i_constraint(LESS_OR_EQUAL, this->absolute_error)); result += abs_error; return !this->overflows(result); } diff --git a/src/Constant_Floating_Point_Expression.defs.hh b/src/Constant_Floating_Point_Expression.defs.hh index 5f27a12..5036e75 100644 --- a/src/Constant_Floating_Point_Expression.defs.hh +++ b/src/Constant_Floating_Point_Expression.defs.hh @@ -151,8 +151,6 @@ public: private: - // FIXME: this is a temporary solution: we should find a way to convert - // a floating point with an arbitrary format to an interval. FP_Interval_Type value; #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS diff --git a/src/Constant_Floating_Point_Expression.inlines.hh b/src/Constant_Floating_Point_Expression.inlines.hh index df9c051..a3bd5a9 100644 --- a/src/Constant_Floating_Point_Expression.inlines.hh +++ b/src/Constant_Floating_Point_Expression.inlines.hh @@ -37,11 +37,10 @@ template <typename FP_Interval_Type, typename FP_Format> inline Constant_Floating_Point_Expression<FP_Interval_Type, FP_Format>:: Constant_Floating_Point_Expression(const boundary_type lb, - const boundary_type ub) - : value(lb) { + const boundary_type ub) { assert(lb <= ub); - // FIXME: this may be incorrect for some policies. - value.join_assign(ub); + value.build(i_constraint(GREATER_OR_EQUAL, lb), + i_constraint(LESS_OR_EQUAL, ub)); } template <typename FP_Interval_Type, typename FP_Format> diff --git a/src/Difference_Floating_Point_Expression.templates.hh b/src/Difference_Floating_Point_Expression.templates.hh index d9cd388..4323d4e 100644 --- a/src/Difference_Floating_Point_Expression.templates.hh +++ b/src/Difference_Floating_Point_Expression.templates.hh @@ -43,9 +43,9 @@ bool Difference_Floating_Point_Expression<FP_Interval_Type, FP_Format> result -= linearized_second_operand; relative_error(linearized_second_operand, rel_error); result += rel_error; - FP_Interval_Type abs_error(-this->absolute_error); - // FIXME: this may be incorrect for some policies. - abs_error.join_assign(this->absolute_error); + FP_Interval_Type abs_error; + abs_error.build(i_constraint(GREATER_OR_EQUAL, -this->absolute_error), + i_constraint(LESS_OR_EQUAL, this->absolute_error)); result += abs_error; return !this->overflows(result); } diff --git a/src/Division_Floating_Point_Expression.templates.hh b/src/Division_Floating_Point_Expression.templates.hh index 5de000e..ac87ecb 100644 --- a/src/Division_Floating_Point_Expression.templates.hh +++ b/src/Division_Floating_Point_Expression.templates.hh @@ -51,9 +51,9 @@ bool Division_Floating_Point_Expression<FP_Interval_Type, FP_Format> result /= intervalized_second_operand; rel_error /= intervalized_second_operand; result += rel_error; - FP_Interval_Type abs_error(-this->absolute_error); - // FIXME: this may be incorrect for some policies. - abs_error.join_assign(this->absolute_error); + FP_Interval_Type abs_error; + abs_error.build(i_constraint(GREATER_OR_EQUAL, -this->absolute_error), + i_constraint(LESS_OR_EQUAL, this->absolute_error)); result += abs_error; return !this->overflows(result); } diff --git a/src/Floating_Point_Expression.templates.hh b/src/Floating_Point_Expression.templates.hh index 62d5515..d8ab3fa 100644 --- a/src/Floating_Point_Expression.templates.hh +++ b/src/Floating_Point_Expression.templates.hh @@ -33,14 +33,16 @@ template<typename FP_Interval_Type, typename FP_Format> void Floating_Point_Expression<FP_Interval_Type, FP_Format> ::relative_error(const FP_Linear_Form& lf, FP_Linear_Form& result) { - /* FIXME: here we assume that boundary_type can represent - (2)^(-FP_Format::MANTISSA_BITS) precisely. */ - FP_Interval_Type error_propagator(-pow(FP_Format::BASE, + + FP_Interval_Type error_propagator; + error_propagator.build( + i_constraint(GREATER_OR_EQUAL, -pow(FP_Format::BASE, -static_cast<typename Floating_Point_Expression<FP_Interval_Type, FP_Format> - ::boundary_type>(FP_Format::MANTISSA_BITS))); - error_propagator.join_assign(FP_Interval_Type(pow(FP_Format::BASE, + ::boundary_type>(FP_Format::MANTISSA_BITS))), + i_constraint(LESS_OR_EQUAL, pow(FP_Format::BASE, -static_cast<typename Floating_Point_Expression<FP_Interval_Type, FP_Format> - ::boundary_type>(FP_Format::MANTISSA_BITS)))); + ::boundary_type>(FP_Format::MANTISSA_BITS))) + ); // Handle the inhomogeneous term. const FP_Interval_Type* current_term = &lf.inhomogeneous_term(); diff --git a/src/Multiplication_Floating_Point_Expression.templates.hh b/src/Multiplication_Floating_Point_Expression.templates.hh index 3922983..c15fdb8 100644 --- a/src/Multiplication_Floating_Point_Expression.templates.hh +++ b/src/Multiplication_Floating_Point_Expression.templates.hh @@ -98,9 +98,9 @@ bool Multiplication_Floating_Point_Expression<FP_Interval_Type, FP_Format> result += linearized_first_operand; } - FP_Interval_Type abs_error(-this->absolute_error); - // FIXME: this may be incorrect for some policies. - abs_error.join_assign(this->absolute_error); + FP_Interval_Type abs_error; + abs_error.build(i_constraint(GREATER_OR_EQUAL, -this->absolute_error), + i_constraint(LESS_OR_EQUAL, this->absolute_error)); result += abs_error; return !this->overflows(result); } diff --git a/src/Sum_Floating_Point_Expression.templates.hh b/src/Sum_Floating_Point_Expression.templates.hh index 2c01484..6758848 100644 --- a/src/Sum_Floating_Point_Expression.templates.hh +++ b/src/Sum_Floating_Point_Expression.templates.hh @@ -43,9 +43,9 @@ bool Sum_Floating_Point_Expression<FP_Interval_Type, FP_Format> result += linearized_second_operand; relative_error(linearized_second_operand, rel_error); result += rel_error; - FP_Interval_Type abs_error(-this->absolute_error); - // FIXME: this may be incorrect for some policies. - abs_error.join_assign(this->absolute_error); + FP_Interval_Type abs_error; + abs_error.build(i_constraint(GREATER_OR_EQUAL, -this->absolute_error), + i_constraint(LESS_OR_EQUAL, this->absolute_error)); result += abs_error; return !this->overflows(result); } diff --git a/tests/Floating_Point_Expression/digitalfilters1.cc b/tests/Floating_Point_Expression/digitalfilters1.cc index 2f84d73..4a04f40 100644 --- a/tests/Floating_Point_Expression/digitalfilters1.cc +++ b/tests/Floating_Point_Expression/digitalfilters1.cc @@ -456,7 +456,7 @@ test05() { cs.insert(Y <= M); cs.insert(Y >= -M); - Con_FP_Expression con_y(0, 0); + Con_FP_Expression con_y("0"); // The constant floating point expression con_y is linearized into // the interval linear form lk. If linearization succeeded, we model // the assignment Y = 0, invoking affine_form_image method. @@ -627,7 +627,7 @@ test06() { cs.insert(Y <= N); cs.insert(Y >= -N); - Con_FP_Expression con_y(0, 0); + Con_FP_Expression con_y("0"); // The constant floating point expression con_y is linearized into // the interval linear form lk. If linearization succeeded, we model // the assignment Y = 0, invoking affine_form_image method. @@ -795,7 +795,7 @@ test07() { cs.insert(Y <= M); cs.insert(Y >= -M); - Con_FP_Expression con_y(0, 0); + Con_FP_Expression con_y("0"); // The constant floating point expression con_y is linearized into // the interval linear form lk. If linearization succeeded, we model // the assignment Y = 0, invoking affine_form_image method.

1 0

[GIT] ppl/ppl(master): Improved code coverage.
by Enea Zaffanella 20 Feb '10

20 Feb '10

Module: ppl/ppl Branch: master Commit: 5e638dd4922abc7948b004e04fbbf2a81520e2a8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5e638dd4922a… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 20 14:38:26 2010 +0100 Improved code coverage. Removed useless (and not accessible by user) Tableau::total_memory_in_bytes(). --- src/PIP_Tree.cc | 5 ----- src/PIP_Tree.defs.hh | 14 ++++++++++++-- tests/PIP_Problem/ascii_dump_load1.cc | 3 +++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index ba3d1ec..7af66eb 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -2465,11 +2465,6 @@ PIP_Solution_Node::Tableau::external_memory_in_bytes() const { } memory_size_type -PIP_Solution_Node::Tableau::total_memory_in_bytes() const { - return sizeof(*this) + external_memory_in_bytes(); -} - -memory_size_type PIP_Solution_Node::external_memory_in_bytes() const { memory_size_type n = PIP_Tree_Node::external_memory_in_bytes(); n += tableau.external_memory_in_bytes(); diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index 12b1292..5a8dfa6 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -452,12 +452,22 @@ private: //! Returns the value of the denominator. Coefficient_traits::const_reference denominator() const; + //! Dumps to \p s an ASCII representation of \p *this. void ascii_dump(std::ostream& s) const; + + /*! \brief + Loads from \p s an ASCII representation (as produced by + ascii_dump(std::ostream&) const) and sets \p *this accordingly. + Returns \c true if successful, \c false otherwise. + */ bool ascii_load(std::istream& s); - //! Returns the total size in bytes of the memory occupied by \p *this. - memory_size_type total_memory_in_bytes() const; //! Returns the size in bytes of the memory managed by \p *this. + /*! + \note + No need for a \c total_memory_in_bytes() method, since + class Tableau is a private inner class of PIP_Solution_Node. + */ memory_size_type external_memory_in_bytes() const; //! Returns \c true if and only if \p *this is well formed. diff --git a/tests/PIP_Problem/ascii_dump_load1.cc b/tests/PIP_Problem/ascii_dump_load1.cc index 5bc8041..faa6c28 100644 --- a/tests/PIP_Problem/ascii_dump_load1.cc +++ b/tests/PIP_Problem/ascii_dump_load1.cc @@ -260,7 +260,10 @@ test09() { cs.insert(i <= n); PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); + // Compute the solution tree. (void) pip.solve(); + // Printing ensures parametric solution values are generated. + pip.print_solution(nout); std::stringstream ss; pip.ascii_dump(ss);

1 0

[GIT] ppl/ppl(master): Invalidate current solution at the start of PIP_Solution_Node::solve().
by Enea Zaffanella 20 Feb '10

20 Feb '10

Module: ppl/ppl Branch: master Commit: 13a2650b7180d9f372a061c2f34c4b92f2cf0059 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=13a2650b7180… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 20 13:04:13 2010 +0100 Invalidate current solution at the start of PIP_Solution_Node::solve(). This fixes the bug in pipproblem3 test03. --- src/PIP_Tree.cc | 4 +++- tests/PIP_Problem/pipproblem3.cc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index ee05538..ba3d1ec 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1628,6 +1628,9 @@ PIP_Solution_Node::solve(const PIP_Problem& problem, const Matrix& ctx, const Variables_Set& params, dimension_type space_dim) { + // Reset current solution as invalid. + solution_valid = false; + Matrix context(ctx); Variables_Set parameters(params); update_context(parameters, context, artificial_parameters, space_dim); @@ -1923,7 +1926,6 @@ PIP_Solution_Node::solve(const PIP_Problem& problem, } // Pivoting process ended: jump to next iteration. - solution_valid = false; continue; } // if (first_negative != not_a_dim) diff --git a/tests/PIP_Problem/pipproblem3.cc b/tests/PIP_Problem/pipproblem3.cc index 03bf580..2fe66e2 100644 --- a/tests/PIP_Problem/pipproblem3.cc +++ b/tests/PIP_Problem/pipproblem3.cc @@ -154,5 +154,5 @@ test03() { BEGIN_MAIN DO_TEST_F8(test01); DO_TEST_F8(test02); - // DO_TEST_F8(test03); + DO_TEST_F8(test03); END_MAIN

1 0