February 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Reassign error codes so as to have backward compatibility.
by Roberto Bagnara 27 Feb '10

27 Feb '10

Module: ppl/ppl Branch: master Commit: 9005a4bc71b38b80205724ac2914731466e5b450 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9005a4bc71b3… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Feb 27 17:02:19 2010 +0100 Reassign error codes so as to have backward compatibility. --- interfaces/C/ppl_c_header.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index d508282..4043314 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -309,38 +309,38 @@ enum ppl_enum_error_code { permitted size was attempted. */ PPL_ERROR_LENGTH_ERROR = -5, /*! \hideinitializer - The client program attempted to use the PPL in a way that violates - its internal logic. This happens, for instance, when the client - attempts to use the timeout facilities on a system that does not - support them. */ - PPL_ERROR_LOGIC_ERROR = -6, - /*! \hideinitializer An arithmetic overflow occurred and the computation was consequently interrupted. This can <EM>only</EM> happen in library's incarnations using bounded integers as coefficients. */ - PPL_ARITHMETIC_OVERFLOW = -7, + PPL_ARITHMETIC_OVERFLOW = -6, /*! \hideinitializer An error occurred during a C input/output operation. A more precise indication of what went wrong is available via <CODE>errno</CODE>. */ - PPL_STDIO_ERROR = -8, + PPL_STDIO_ERROR = -7, /*! \hideinitializer An internal error that was diagnosed by the PPL itself. This indicates a bug in the PPL. */ - PPL_ERROR_INTERNAL_ERROR = -9, + PPL_ERROR_INTERNAL_ERROR = -8, /*! \hideinitializer A standard exception has been raised by the C++ run-time environment. This indicates a bug in the PPL. */ - PPL_ERROR_UNKNOWN_STANDARD_EXCEPTION = -10, + PPL_ERROR_UNKNOWN_STANDARD_EXCEPTION = -9, /*! \hideinitializer A totally unknown, totally unexpected error happened. This indicates a bug in the PPL. */ - PPL_ERROR_UNEXPECTED_ERROR = -11, + PPL_ERROR_UNEXPECTED_ERROR = -10, /*! \hideinitializer An exception has been raised by the PPL as a timeout previously set by the user has expired. */ - PPL_TIMEOUT_EXCEPTION = -12 + PPL_TIMEOUT_EXCEPTION = -11 + /*! \hideinitializer + The client program attempted to use the PPL in a way that violates + its internal logic. This happens, for instance, when the client + attempts to use the timeout facilities on a system that does not + support them. */ + PPL_ERROR_LOGIC_ERROR = -12, }; /*! \brief

1 0

[GIT] ppl/ppl(master): Increase code coverage for PIP_Tree_Node printing methods.
by Enea Zaffanella 27 Feb '10

27 Feb '10

Module: ppl/ppl Branch: master Commit: 10e2e18534c3cd348d8f1bba5e3d54f38166bce6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=10e2e18534c3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 27 10:30:09 2010 +0100 Increase code coverage for PIP_Tree_Node printing methods. --- tests/PIP_Problem/pipproblem1.cc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tests/PIP_Problem/pipproblem1.cc b/tests/PIP_Problem/pipproblem1.cc index 8ab96be..ed1783d 100644 --- a/tests/PIP_Problem/pipproblem1.cc +++ b/tests/PIP_Problem/pipproblem1.cc @@ -112,6 +112,10 @@ test02() { && c.coefficient(m) == 7 && c.inhomogeneous_term() == -12)) return false; + // Dummy print of (non-root) tree node to increase code coverage. + using namespace IO_Operators; + nout << "\nPrinting the root's true child subtree:\n"; + nout << (*t_child) << endl; } if (t_child->child_node(true) == 0 || t_child->child_node(false) == 0) return false;

1 0

[GIT] ppl/ppl(master): Force C++ linking for all the test programs.
by Roberto Bagnara 27 Feb '10

27 Feb '10

Module: ppl/ppl Branch: master Commit: c67f2c8566da2ac85d52042ce95134e47de1d2e9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c67f2c8566da… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Feb 27 08:58:00 2010 +0100 Force C++ linking for all the test programs. --- interfaces/C/tests/Makefile.am | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/interfaces/C/tests/Makefile.am b/interfaces/C/tests/Makefile.am index a4545d2..424607d 100644 --- a/interfaces/C/tests/Makefile.am +++ b/interfaces/C/tests/Makefile.am @@ -76,12 +76,17 @@ formatted_output.c \ print_to_buffer.h \ print_to_buffer.c +# Dummy C++ source to cause C++ linking. +# FIXME: why isn't enough to do this for libppl_c_tests.a? +nodist_EXTRA_formatted_output_SOURCES = \ +dummy.cc + pip_test_SOURCES = \ pip_test.c # Dummy C++ source to cause C++ linking. # FIXME: why isn't enough to do this for libppl_c_tests.a? -nodist_EXTRA_formatted_output_SOURCES = \ +nodist_EXTRA_pip_test_SOURCES = \ dummy.cc watchdog1_SRCS = watchdog1.c @@ -110,10 +115,21 @@ watchdog1_SOURCES = $(watchdog1_SRCS) watchdog1_CPPFLAGS = $(WATCHDOG_LIBRARY_CPPFLAGS) watchdog1_LDADD = $(WATCHDOG_LIBRARY_LDADD) +# Dummy C++ source to cause C++ linking. +# FIXME: why isn't enough to do this for libppl_c_tests.a? +nodist_EXTRA_watchdog1_SOURCES = \ +dummy.cc + + weightwatch1_SOURCES = $(weightwatch1_SRCS) weightwatch1_CPPFLAGS = $(WATCHDOG_LIBRARY_CPPFLAGS) weightwatch1_LDADD = $(WATCHDOG_LIBRARY_LDADD) +# Dummy C++ source to cause C++ linking. +# FIXME: why isn't enough to do this for libppl_c_tests.a? +nodist_EXTRA_weightwatch1_SOURCES = \ +dummy.cc + endif BUILD_WATCHDOG_LIBRARY TESTS = $(NORMAL_TESTS) $(WATCHDOG_TESTS)

1 0

[GIT] ppl/ppl(master): Exception handling fixed.
by Roberto Bagnara 27 Feb '10

27 Feb '10

Module: ppl/ppl Branch: master Commit: 9a89bb0a926a098a6e06a18c36881786f45d678b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9a89bb0a926a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Feb 27 07:33:22 2010 +0100 Exception handling fixed. --- tests/Polyhedron/watchdog1.cc | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tests/Polyhedron/watchdog1.cc b/tests/Polyhedron/watchdog1.cc index 5254d53..dd7271e 100644 --- a/tests/Polyhedron/watchdog1.cc +++ b/tests/Polyhedron/watchdog1.cc @@ -81,12 +81,20 @@ timed_compute_open_hypercube_generators(dimension_type dimension, nout << " s" << endl; return false; } +#if !PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED + // If Watchdog objects are not supported, an std::logic_error exception + // will be thrown: this is normal. + catch (const std::logic_error& e) { + nout << "std::logic_error exception caught: \n" << e.what() << std::endl; + exit(0); +} +#endif // !PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED catch (const std::exception& e) { - nout << "unexpected std::exception: \n" << e.what() << endl; + nout << "unexpected std::exception caught: \n" << e.what() << endl; exit(1); } catch (...) { - nout << "unexpected unknown exception" << endl; + nout << "unexpected unknown exception caught" << endl; exit(1); } // Should never get here. @@ -131,13 +139,4 @@ main() TRY { return 0; } -#if !PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED -// If Watchdog objects are not supported, an exception will be thrown: -// this is normal. -catch (const std::logic_error& e) { - nout << "std::logic_error caught (" << e.what() << ")" - << std::endl; - exit(0); -} -#endif // !PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED CATCH

1 0

[GIT] ppl/ppl(master): Throw std:: logic_error in case the client asks for watchdogs on a system not supporting them .
by Roberto Bagnara 26 Feb '10

26 Feb '10

Module: ppl/ppl Branch: master Commit: 58befe688ea3a6b02bc227b6ca2f9c34488fc237 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=58befe688ea3… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 26 22:08:11 2010 +0100 Throw std::logic_error in case the client asks for watchdogs on a system not supporting them. --- TODO | 2 ++ Watchdog/src/Watchdog.inlines.hh | 8 ++++---- Watchdog/tests/watchdog1.cc | 4 ++-- interfaces/C/ppl_c_header.h | 18 ++++++++++++------ interfaces/C/ppl_c_implementation_common.defs.hh | 1 + interfaces/C/tests/watchdog1.c | 12 +++++------- tests/Polyhedron/watchdog1.cc | 9 +++++++++ 7 files changed, 35 insertions(+), 19 deletions(-) diff --git a/TODO b/TODO index 835ea2c..ddebb7f 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,8 @@ Enhancements for PPL 0.11 ========================= +- Handle std::logic_error (now thrown in case watchdogs are not + available) in all the interfaces. - Make all the *affine*image() methods uniform as far as the specification is concerned. - Look carefully at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115 diff --git a/Watchdog/src/Watchdog.inlines.hh b/Watchdog/src/Watchdog.inlines.hh index 6591359..b7c6222 100644 --- a/Watchdog/src/Watchdog.inlines.hh +++ b/Watchdog/src/Watchdog.inlines.hh @@ -95,14 +95,14 @@ template <typename Flag_Base, typename Flag> Watchdog::Watchdog(unsigned int /* units */, const Flag_Base* volatile& /* holder */, Flag& /* flag */) { - throw std::runtime_error("PWL::Watchdog objects not supported:" - " system does not provide setitimer()"); + throw std::logic_error("PWL::Watchdog objects not supported:" + " system does not provide setitimer()"); } inline Watchdog::Watchdog(unsigned int /* units */, void (* /* function */)()) { - throw std::runtime_error("PWL::Watchdog objects not supported:" - " system does not provide setitimer()"); + throw std::logic_error("PWL::Watchdog objects not supported:" + " system does not provide setitimer()"); } inline diff --git a/Watchdog/tests/watchdog1.cc b/Watchdog/tests/watchdog1.cc index 6876c5f..c51dc6e 100644 --- a/Watchdog/tests/watchdog1.cc +++ b/Watchdog/tests/watchdog1.cc @@ -57,8 +57,8 @@ test01() { return ok; } #if !PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED - catch (std::runtime_error& e) { - nout << "runtime_error: " << e.what() << endl << endl; + catch (const std::logic_error& e) { + nout << "std::logic_error caught (" << e.what() << ")" << endl; return true; } #endif // !PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index cb2456c..d508282 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -309,32 +309,38 @@ enum ppl_enum_error_code { permitted size was attempted. */ PPL_ERROR_LENGTH_ERROR = -5, /*! \hideinitializer + The client program attempted to use the PPL in a way that violates + its internal logic. This happens, for instance, when the client + attempts to use the timeout facilities on a system that does not + support them. */ + PPL_ERROR_LOGIC_ERROR = -6, + /*! \hideinitializer An arithmetic overflow occurred and the computation was consequently interrupted. This can <EM>only</EM> happen in library's incarnations using bounded integers as coefficients. */ - PPL_ARITHMETIC_OVERFLOW = -6, + PPL_ARITHMETIC_OVERFLOW = -7, /*! \hideinitializer An error occurred during a C input/output operation. A more precise indication of what went wrong is available via <CODE>errno</CODE>. */ - PPL_STDIO_ERROR = -7, + PPL_STDIO_ERROR = -8, /*! \hideinitializer An internal error that was diagnosed by the PPL itself. This indicates a bug in the PPL. */ - PPL_ERROR_INTERNAL_ERROR = -8, + PPL_ERROR_INTERNAL_ERROR = -9, /*! \hideinitializer A standard exception has been raised by the C++ run-time environment. This indicates a bug in the PPL. */ - PPL_ERROR_UNKNOWN_STANDARD_EXCEPTION = -9, + PPL_ERROR_UNKNOWN_STANDARD_EXCEPTION = -10, /*! \hideinitializer A totally unknown, totally unexpected error happened. This indicates a bug in the PPL. */ - PPL_ERROR_UNEXPECTED_ERROR = -10, + PPL_ERROR_UNEXPECTED_ERROR = -11, /*! \hideinitializer An exception has been raised by the PPL as a timeout previously set by the user has expired. */ - PPL_TIMEOUT_EXCEPTION = -11 + PPL_TIMEOUT_EXCEPTION = -12 }; /*! \brief diff --git a/interfaces/C/ppl_c_implementation_common.defs.hh b/interfaces/C/ppl_c_implementation_common.defs.hh index 31a3044..3120dd4 100644 --- a/interfaces/C/ppl_c_implementation_common.defs.hh +++ b/interfaces/C/ppl_c_implementation_common.defs.hh @@ -139,6 +139,7 @@ CATCH_STD_EXCEPTION(bad_alloc, PPL_ERROR_OUT_OF_MEMORY) \ CATCH_STD_EXCEPTION(invalid_argument, PPL_ERROR_INVALID_ARGUMENT) \ CATCH_STD_EXCEPTION(domain_error, PPL_ERROR_DOMAIN_ERROR) \ CATCH_STD_EXCEPTION(length_error, PPL_ERROR_LENGTH_ERROR) \ +CATCH_STD_EXCEPTION(logic_error, PPL_ERROR_LOGIC_ERROR) \ CATCH_STD_EXCEPTION(overflow_error, PPL_ARITHMETIC_OVERFLOW) \ CATCH_STD_EXCEPTION(runtime_error, PPL_ERROR_INTERNAL_ERROR) \ CATCH_STD_EXCEPTION(exception, PPL_ERROR_UNKNOWN_STANDARD_EXCEPTION) \ diff --git a/interfaces/C/tests/watchdog1.c b/interfaces/C/tests/watchdog1.c index a75ed07..5f0350d 100644 --- a/interfaces/C/tests/watchdog1.c +++ b/interfaces/C/tests/watchdog1.c @@ -47,16 +47,14 @@ fatal(const char* format, ...) { static void error_handler(enum ppl_enum_error_code code, const char* description) { + if (check_noisy() || check_very_noisy()) + fprintf(stderr, "PPL error code %d: %s\n", code, 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) + /* If Watchdog objects are not supported, a logic error will occur: + this is normal. */ + if (code == PPL_ERROR_LOGIC_ERROR) my_exit(0); #endif - if (check_noisy() || check_very_noisy()) - fprintf(stderr, "PPL error code %d: %s\n", code, description); } void diff --git a/tests/Polyhedron/watchdog1.cc b/tests/Polyhedron/watchdog1.cc index 3350554..5254d53 100644 --- a/tests/Polyhedron/watchdog1.cc +++ b/tests/Polyhedron/watchdog1.cc @@ -131,4 +131,13 @@ main() TRY { return 0; } +#if !PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED +// If Watchdog objects are not supported, an exception will be thrown: +// this is normal. +catch (const std::logic_error& e) { + nout << "std::logic_error caught (" << e.what() << ")" + << std::endl; + exit(0); +} +#endif // !PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED CATCH

1 0

[GIT] ppl/ppl(master): Version number bumped.
by Roberto Bagnara 26 Feb '10

26 Feb '10

Module: ppl/ppl Branch: master Commit: 768a88bdae63ec31e402defef284d43d8cf9ea8d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=768a88bdae63… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Feb 25 19:52:31 2010 +0100 Version number bumped. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 13fc9e8..9196291 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Process this file with Autoconf to produce a configure script. # Every other copy of the package version number gets its value from here. -AC_INIT([the Parma Polyhedra Library], [0.11pre11], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre12], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61)

1 0

[GIT] ppl/ppl(master): Simplified initialization of Threshold_Watcher<> static data member.
by Enea Zaffanella 26 Feb '10

26 Feb '10

Module: ppl/ppl Branch: master Commit: 3edd591a85e10eaad4c65d2bee89ddddc3af982a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3edd591a85e1… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 26 18:55:07 2010 +0100 Simplified initialization of Threshold_Watcher<> static data member. --- Watchdog/src/Threshold_Watcher.defs.hh | 8 +++++++- interfaces/C/ppl_c_implementation_common.cc | 5 ----- interfaces/Java/jni/ppl_java_common.cc | 8 -------- interfaces/OCaml/ppl_ocaml_common.cc | 5 ----- interfaces/Prolog/ppl_prolog_common.cc | 6 ------ tests/Polyhedron/weightwatch1.cc | 4 ---- 6 files changed, 7 insertions(+), 29 deletions(-) diff --git a/Watchdog/src/Threshold_Watcher.defs.hh b/Watchdog/src/Threshold_Watcher.defs.hh index 1f74935..ef3e638 100644 --- a/Watchdog/src/Threshold_Watcher.defs.hh +++ b/Watchdog/src/Threshold_Watcher.defs.hh @@ -77,7 +77,13 @@ private: //! Check threshold reaching. static void check(); -}; +}; // class Parma_Watchdog_Library::Threshold_Watcher + + +// Templatic initialization of static data member. +template <typename Traits> +typename Parma_Watchdog_Library::Threshold_Watcher<Traits>::Initialize +Parma_Watchdog_Library::Threshold_Watcher<Traits>::init; #include "Threshold_Watcher.inlines.hh" #include "Threshold_Watcher.templates.hh" diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index a6f2bf7..8884870 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -136,11 +136,6 @@ reset_deterministic_timeout() { using namespace Parma_Polyhedra_Library; using namespace Parma_Polyhedra_Library::Interfaces::C; -#ifdef PPL_WATCHDOG_LIBRARY_ENABLED -template <> Weightwatch::Initialize -Weightwatch::init = Weightwatch::Initialize(); -#endif // PPL_WATCHDOG_LIBRARY_ENABLED - unsigned int PPL_POLY_CON_RELATION_IS_DISJOINT; unsigned int PPL_POLY_CON_RELATION_STRICTLY_INTERSECTS; unsigned int PPL_POLY_CON_RELATION_IS_INCLUDED; diff --git a/interfaces/Java/jni/ppl_java_common.cc b/interfaces/Java/jni/ppl_java_common.cc index 337abb4..c32d670 100644 --- a/interfaces/Java/jni/ppl_java_common.cc +++ b/interfaces/Java/jni/ppl_java_common.cc @@ -1004,11 +1004,3 @@ build_java_congruence_system(JNIEnv* env, const Congruence_System& cgs) { } // namespace Interfaces } // namespace Parma_Polyhedra_Library - - -#ifdef PPL_WATCHDOG_LIBRARY_ENABLED -using namespace Parma_Polyhedra_Library::Interfaces::Java; - -template <> Weightwatch::Initialize -Weightwatch::init = Weightwatch::Initialize(); -#endif // PPL_WATCHDOG_LIBRARY_ENABLED diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index 9dfd493..62b67d5 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -754,11 +754,6 @@ unregistered_value_p_MIP_Problem(const MIP_Problem& ph) { using namespace Parma_Polyhedra_Library; using namespace Parma_Polyhedra_Library::Interfaces::OCaml; -#ifdef PPL_WATCHDOG_LIBRARY_ENABLED -template <> Weightwatch::Initialize -Weightwatch::init = Weightwatch::Initialize(); -#endif // PPL_WATCHDOG_LIBRARY_ENABLED - extern "C" CAMLprim value ppl_new_MIP_Problem_from_space_dimension(value d) try { diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index da8385c..94202f3 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -1410,12 +1410,6 @@ term_to_complexity_class(Prolog_term_ref t, const char* where) { using namespace Parma_Polyhedra_Library::Interfaces::Prolog; -#ifdef PPL_WATCHDOG_LIBRARY_ENABLED -template <> Weightwatch::Initialize -Weightwatch::init = Weightwatch::Initialize(); -#endif // PPL_WATCHDOG_LIBRARY_ENABLED - - extern "C" Prolog_foreign_return_type ppl_version_major(Prolog_term_ref t_v) { try { diff --git a/tests/Polyhedron/weightwatch1.cc b/tests/Polyhedron/weightwatch1.cc index 2b55ae3..30ae5cf 100644 --- a/tests/Polyhedron/weightwatch1.cc +++ b/tests/Polyhedron/weightwatch1.cc @@ -29,10 +29,6 @@ namespace { typedef Parma_Watchdog_Library::Threshold_Watcher<Weightwatch_Traits> Weightwatch; -template <> Weightwatch::Initialize -Weightwatch::init = Weightwatch::Initialize(); - - class Deterministic_Timeout : virtual public std::exception, public Parma_Polyhedra_Library::Throwable {

1 0

[GIT] ppl/ppl(master): Added printing functions for PIP tree nodes and improved documentation.
by Enea Zaffanella 26 Feb '10

26 Feb '10

Module: ppl/ppl Branch: master Commit: dc751cb13eadc3ae9099624bff0b553570e0488d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=dc751cb13ead… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 26 17:42:19 2010 +0100 Added printing functions for PIP tree nodes and improved documentation. --- interfaces/C/ppl_c_header.h | 108 +++++++++++++++------------ interfaces/C/ppl_c_implementation_common.cc | 10 ++- 2 files changed, 67 insertions(+), 51 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 95da8c5..cb2456c 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -1295,7 +1295,7 @@ ppl_new_Constraint_System_const_iterator PPL_PROTO((ppl_Constraint_System_const_iterator_t* pcit)); /*! \relates ppl_Constraint_System_const_iterator_tag \brief - Builds a const iterator that is a copy of \p cit; writes an + Builds a const iterator that is a copy of \p cit; writes a handle for the newly created const iterator at address \p pcit. */ int @@ -1600,7 +1600,7 @@ ppl_new_Generator_System_const_iterator PPL_PROTO((ppl_Generator_System_const_iterator_t* pgit)); /*! \relates ppl_Generator_System_const_iterator_tag \brief - Builds a const iterator that is a copy of \p git; writes an + Builds a const iterator that is a copy of \p git; writes a handle for the newly created const iterator at address \p pgit. */ int @@ -1887,7 +1887,7 @@ ppl_new_Congruence_System_const_iterator PPL_PROTO((ppl_Congruence_System_const_iterator_t* pcit)); /*! \relates ppl_Congruence_System_const_iterator_tag \brief - Builds a const iterator that is a copy of \p cit; writes an + Builds a const iterator that is a copy of \p cit; writes a handle for the newly created const iterator at address \p pcit. */ int @@ -2189,7 +2189,7 @@ ppl_new_Grid_Generator_System_const_iterator PPL_PROTO((ppl_Grid_Generator_System_const_iterator_t* pgit)); /*! \relates ppl_Grid_Generator_System_const_iterator_tag \brief - Builds a const iterator that is a copy of \p git; writes an + Builds a const iterator that is a copy of \p git; writes a handle for the newly created const iterator at address \p pgit. */ int @@ -2394,7 +2394,7 @@ extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_PIVOT_ROW_STRATEGY_MAX_COLUMN; /*@{*/ /*! \relates ppl_MIP_Problem_tag \brief - Builds a trivial MIP problem of dimension \p d and writes an + Builds a trivial MIP problem of dimension \p d and writes a handle to it at address \p pmip. */ int @@ -2679,7 +2679,7 @@ PPL_PROTO((ppl_const_MIP_Problem_t mip, size_t* sz)); /*@{*/ /*! \relates ppl_PIP_Problem_tag \brief - Builds a trivial PIP problem of dimension \p d and writes an + Builds a trivial PIP problem of dimension \p d and writes a handle to it at address \p ppip. */ int @@ -2730,6 +2730,10 @@ ppl_delete_PIP_Problem PPL_PROTO((ppl_const_PIP_Problem_t pip)); /*! \relates ppl_PIP_Problem_tag \brief Writes to \p m the dimension of the vector space enclosing \p pip. + + The vector space dimensions includes both the problem variables + and the problem parameters, but they do not include the artificial + parameters. */ int ppl_PIP_Problem_space_dimension @@ -2752,6 +2756,13 @@ ppl_PIP_Problem_parameter_space_dimensions PPL_PROTO((ppl_const_PIP_Problem_t pip, ppl_dimension_type ds[])); /*! \relates ppl_PIP_Problem_tag \brief + Writes into \p *pd the big parameter dimension of PIP problem \p pip. +*/ +int +ppl_PIP_Problem_get_big_parameter_dimension +PPL_PROTO((ppl_const_PIP_Problem_t pip, ppl_dimension_type* pd)); + +/*! \relates ppl_PIP_Problem_tag \brief Writes to \p m the number of constraints defining the feasible region of \p pip. */ @@ -2768,6 +2779,25 @@ ppl_PIP_Problem_constraint_at_index PPL_PROTO((ppl_const_PIP_Problem_t pip, ppl_dimension_type i, ppl_const_Constraint_t* pc)); +/*! \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)); + +/*! \relates ppl_PIP_Problem_tag \brief + Returns a positive integer if \p pip is well formed, i.e., if it + satisfies all its implementation invariants; returns 0 and perhaps + makes some noise if \p pip is broken. Useful for debugging purposes. +*/ int ppl_PIP_Problem_OK PPL_PROTO((ppl_const_PIP_Problem_t pip)); @@ -2818,6 +2848,13 @@ ppl_PIP_Problem_add_to_parameter_space_dimensions PPL_PROTO((ppl_PIP_Problem_t pip, ppl_dimension_type ds[], size_t n)); /*! \relates ppl_PIP_Problem_tag \brief + Sets the big parameter dimension of PIP problem \p pip to \p d. +*/ +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 Modifies the feasible region of the PIP problem \p pip by adding a copy of the constraint \p c. */ @@ -2835,7 +2872,7 @@ ppl_PIP_Problem_add_constraints PPL_PROTO((ppl_PIP_Problem_t pip, /*@}*/ /* Functions that May Modify the PIP_Problem */ -/*! \brief \name Computing the Solution of the PIP_Problem */ +/*! \brief \name Computing and Printing the Solution of the PIP_Problem */ /*@{*/ /*! \relates ppl_PIP_Problem_tag \brief @@ -2891,34 +2928,6 @@ int ppl_PIP_Problem_set_control_parameter PPL_PROTO((ppl_PIP_Problem_t pip, int value)); -/*! \relates ppl_PIP_Problem_tag \brief - Writes into \p *pd the big parameter dimension of PIP problem \p pip. -*/ -int -ppl_PIP_Problem_get_big_parameter_dimension -PPL_PROTO((ppl_const_PIP_Problem_t pip, ppl_dimension_type* pd)); - -/*! \relates ppl_PIP_Problem_tag \brief - Sets the big parameter dimension of PIP problem \p pip to \p d. -*/ -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 */ @@ -2984,32 +2993,33 @@ ppl_PIP_Tree_Node_end PPL_PROTO((ppl_const_PIP_Tree_Node_t pip_tree, ppl_Artificial_Parameter_Sequence_const_iterator_t pit)); -/*! \relates ppl_PIP_Tree_Node_tag \brief +/*! \relates ppl_PIP_Solution_Node_tag \brief Writes to \p le a const pointer to the parametric expression of the values - of variable \p v in solution node \p pip_sol. + of variable \p var in solution node \p pip_sol. - The linear expression assigned to \p le only involves parameters. + The linear expression assigned to \p le will only refer to + (problem or artificial) parameters. \param pip_sol - the solution tree node + The solution tree node. - \param v - the variable which is queried about + \param var + The variable which is queried about. \param le - the returned expression of variable \p v + The returned expression for variable \p var. \return PPL_ERROR_INVALID_ARGUMENT - Returned if \p v is dimension-incompatible with \p *this - or if \p v is a parameter. + Returned if \p var is dimension-incompatible with \p *this + or if \p var is a problem parameter. */ int ppl_PIP_Solution_Node_get_parametric_values PPL_PROTO((ppl_const_PIP_Solution_Node_t pip_sol, - ppl_dimension_type v, + ppl_dimension_type var, ppl_const_Linear_Expression_t* le)); -/*! \relates ppl_PIP_Tree_Node_tag \brief +/*! \relates ppl_PIP_Decision_Node_tag \brief Writes to \p pip_tree a const pointer to either the true branch (if \p b is not zero) or the false branch (if \p b is zero) of \p pip_dec. */ @@ -3020,7 +3030,7 @@ PPL_PROTO((ppl_const_PIP_Decision_Node_t pip_dec, ppl_const_PIP_Tree_Node_t* pip_tree)); /*! \relates ppl_Artificial_Parameter_tag \brief - Writes to \p le the linear expression in artificial parameter \p ap. + Copies into \p le the linear expression in artificial parameter \p ap. */ int ppl_Artificial_Parameter_get_Linear_Expression @@ -3047,7 +3057,7 @@ PPL_PROTO((ppl_const_Artificial_Parameter_t ap, ppl_Coefficient_t n)); /*! \relates ppl_Artificial_Parameter_tag \brief - Writes to \p n the denominator in artificial parameter \p ap. + Copies into \p n the denominator in artificial parameter \p ap. */ int ppl_Artificial_Parameter_denominator @@ -3066,7 +3076,7 @@ ppl_new_Artificial_Parameter_Sequence_const_iterator PPL_PROTO((ppl_Artificial_Parameter_Sequence_const_iterator_t* papit)); /*! \relates ppl_Artificial_Parameter_Sequence_const_iterator_tag \brief - Builds a const iterator that is a copy of \p apit; writes an + Builds a const iterator that is a copy of \p apit; writes a handle for the newly created const iterator at address \p papit. */ int diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index fddef49..a6f2bf7 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -2434,10 +2434,10 @@ CATCH_ALL int ppl_PIP_Solution_Node_get_parametric_values (ppl_const_PIP_Solution_Node_t pip_sol, - ppl_dimension_type v, + ppl_dimension_type var, ppl_const_Linear_Expression_t* le) try { const PIP_Solution_Node& spip_sol = *to_const(pip_sol); - const Linear_Expression& lle = spip_sol.parametric_values(Variable(v)); + const Linear_Expression& lle = spip_sol.parametric_values(Variable(var)); *le = to_const(&lle); return 0; } @@ -2632,6 +2632,12 @@ DEFINE_OUTPUT_FUNCTIONS(MIP_Problem) DEFINE_OUTPUT_FUNCTIONS(PIP_Problem) +DEFINE_OUTPUT_FUNCTIONS(PIP_Tree_Node) + +DEFINE_OUTPUT_FUNCTIONS(PIP_Decision_Node) + +DEFINE_OUTPUT_FUNCTIONS(PIP_Solution_Node) + DEFINE_OUTPUT_FUNCTIONS(Artificial_Parameter) char*

1 0

[GIT] ppl/ppl(master): Added operator<<() for class PIP_Tree_Node, printing the subtree.
by Enea Zaffanella 26 Feb '10

26 Feb '10

Module: ppl/ppl Branch: master Commit: a7fc5572e9b727d60580e0168a908457b59dc425 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a7fc5572e9b7… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 26 17:27:40 2010 +0100 Added operator<<() for class PIP_Tree_Node, printing the subtree. The output operator is based on public (non-virtual) method print(), which calls the protected (virtual) method print_tree() after properly setting up the needed arguments. --- src/PIP_Problem.cc | 16 +---------- src/PIP_Tree.cc | 23 ++++++++++++++++ src/PIP_Tree.defs.hh | 69 +++++++++++++++++++++++++++++++------------------- 3 files changed, 68 insertions(+), 40 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index 8df7d1b..a75270d 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -715,20 +715,8 @@ PPL::PIP_Problem::print_solution(std::ostream& s, unsigned indent) const { break; case OPTIMIZED: - { - PPL_ASSERT(current_solution); - PPL_ASSERT(internal_space_dim == external_space_dim); - // For convenience, map pip problem vars and params on a vector. - std::vector<bool> pip_dim_is_param(internal_space_dim); - for (Variables_Set::const_iterator p = parameters.begin(), - p_end = parameters.end(); p != p_end; ++p) - pip_dim_is_param[*p] = true; - - current_solution->print_tree(s, indent, - pip_dim_is_param, - // NOTE: first_art_dim == space_dim. - internal_space_dim); - } + PPL_ASSERT(current_solution != 0); + current_solution->print(s, indent); break; case PARTIALLY_SATISFIABLE: diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 4c6de77..6d35a82 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -276,6 +276,12 @@ row_normalize(Row& x, Coefficient& den) { namespace IO_Operators { std::ostream& +operator<<(std::ostream& os, const PIP_Tree_Node& x) { + x.print(os); + return os; +} + +std::ostream& operator<<(std::ostream& os, const PIP_Tree_Node::Artificial_Parameter& x) { const Linear_Expression& expr = static_cast<const Linear_Expression&>(x); os << "(" << expr << ") div " << x.denominator(); @@ -2458,6 +2464,23 @@ PIP_Tree_Node::indent_and_print(std::ostream& s, } void +PIP_Tree_Node::print(std::ostream& s, unsigned indent) const { + const dimension_type pip_space_dim = get_owner()->space_dimension(); + const Variables_Set& pip_params = get_owner()->parameter_space_dimensions(); + + std::vector<bool> pip_dim_is_param(pip_space_dim); + for (Variables_Set::const_iterator p = pip_params.begin(), + p_end = pip_params.end(); p != p_end; ++p) + pip_dim_is_param[*p] = true; + + dimension_type first_art_dim = pip_space_dim; + for (const PIP_Tree_Node* node = parent(); node != 0; node = node->parent()) + first_art_dim += node->art_parameter_count(); + + print_tree(s, indent, pip_dim_is_param, first_art_dim); +} + +void PIP_Tree_Node::print_tree(std::ostream& s, unsigned indent, const std::vector<bool>& pip_dim_is_param, dimension_type first_art_dim) const { diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index 87d4663..e0a733c 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -109,20 +109,8 @@ public: \param indent The amount of indentation. - - \param pip_dim_is_param - A vector of Boolean flags telling which PIP problem dimensions are - problem parameters. The size of the vector is equal to the PIP - problem internal space dimension (i.e., no artificial parameters). - - \param first_art_dim - The first space dimension corresponding to an artificial parameter - that was created in this node (if any). */ - virtual void print_tree(std::ostream& s, - unsigned indent, - const std::vector<bool>& pip_dim_is_param, - dimension_type first_art_dim) const; + void print(std::ostream& s, unsigned indent = 0) const; //! Dumps to \p s an ASCII representation of \p *this. void ascii_dump(std::ostream& s) const; @@ -218,6 +206,28 @@ protected: //! Inserts a new parametric constraint in internal Row format void add_constraint(const Row& x, const Variables_Set& parameters); + //! Prints on \p s the tree rooted in \p *this. + /*! + \param s + The output stream. + + \param indent + The amount of indentation. + + \param pip_dim_is_param + A vector of Boolean flags telling which PIP problem dimensions are + problem parameters. The size of the vector is equal to the PIP + problem internal space dimension (i.e., no artificial parameters). + + \param first_art_dim + The first space dimension corresponding to an artificial parameter + that was created in this node (if any). + */ + virtual void print_tree(std::ostream& s, + unsigned indent, + const std::vector<bool>& pip_dim_is_param, + dimension_type first_art_dim) const; + //! A helper function used when printing PIP trees. static void indent_and_print(std::ostream& s, unsigned indent, const char* str); @@ -318,12 +328,6 @@ public: //! Returns \p this. virtual const PIP_Solution_Node* as_solution() const; - //! Prints on \p s the tree rooted in \p *this. - virtual void print_tree(std::ostream& s, - unsigned indent, - const std::vector<bool>& pip_dim_is_param, - dimension_type first_art_dim) const; - /*! \brief Returns a parametric expression for the values of problem variable \p var. @@ -691,6 +695,12 @@ protected: Matrix& context, dimension_type& space_dimension); + //! Prints on \p s the tree rooted in \p *this. + virtual void print_tree(std::ostream& s, + unsigned indent, + const std::vector<bool>& pip_dim_is_param, + dimension_type first_art_dim) const; + }; // class PIP_Solution_Node @@ -715,12 +725,6 @@ public: //! Returns a pointer to the \p b (true or false) branch of \p *this. PIP_Tree_Node* child_node(bool b); - //! Prints on \p s the tree rooted in \p *this. - virtual void print_tree(std::ostream& s, - unsigned indent, - const std::vector<bool>& pip_dim_is_param, - dimension_type first_art_dim) const; - //! Dumps to \p s an ASCII representation of \p *this. void ascii_dump(std::ostream& s) const; @@ -836,10 +840,23 @@ protected: const Matrix& context, const Variables_Set& params, dimension_type space_dimension); -}; + + //! Prints on \p s the tree rooted in \p *this. + virtual void print_tree(std::ostream& s, + unsigned indent, + const std::vector<bool>& pip_dim_is_param, + dimension_type first_art_dim) const; + +}; // class PIP_Decision_Node namespace IO_Operators { +//! Output operator: prints the solution tree rooted in \p x. +/*! \relates Parma_Polyhedra_Library::PIP_Tree_Node */ +std::ostream& operator<<(std::ostream& os, const PIP_Tree_Node& x); + +//! Output operator. +/*! \relates Parma_Polyhedra_Library::PIP_Tree_Node::Artificial_Parameter */ std::ostream& operator<<(std::ostream& os, const PIP_Tree_Node::Artificial_Parameter& x);

1 0

[GIT] ppl/ppl(master): Improve definition of Matrix:: const_iterator default constructor.
by Enea Zaffanella 26 Feb '10

26 Feb '10

Module: ppl/ppl Branch: master Commit: 99c0578d19f38fc8201b6f6d2b148bfcbdeec29f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=99c0578d19f3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 26 17:24:23 2010 +0100 Improve definition of Matrix::const_iterator default constructor. --- src/Matrix.defs.hh | 3 ++- src/Matrix.inlines.hh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Matrix.defs.hh b/src/Matrix.defs.hh index e0112b6..2ee3a24 100644 --- a/src/Matrix.defs.hh +++ b/src/Matrix.defs.hh @@ -138,7 +138,8 @@ public: \p *this and \p y are different. */ bool operator!=(const const_iterator& y) const; - }; + }; // class const_iterator + //! Returns <CODE>true</CODE> if and only if \p *this has no rows. /*! diff --git a/src/Matrix.inlines.hh b/src/Matrix.inlines.hh index 6791c65..e3c7cd0 100644 --- a/src/Matrix.inlines.hh +++ b/src/Matrix.inlines.hh @@ -46,7 +46,7 @@ Matrix::total_memory_in_bytes() const { inline Matrix::const_iterator::const_iterator() - : i(Iter()) { + : i() { } inline

1 0