October 2011 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Moved misplaced parentheses.
by Roberto Bagnara 11 Oct '11

11 Oct '11

Module: ppl/ppl Branch: master Commit: 24649b05a7bae034f4f502997e57ad24e61e5d6f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=24649b05a7ba… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Oct 11 20:22:19 2011 +0200 Moved misplaced parentheses. --- src/CO_Tree.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/CO_Tree.inlines.hh b/src/CO_Tree.inlines.hh index dc2e53a..6e1404a 100644 --- a/src/CO_Tree.inlines.hh +++ b/src/CO_Tree.inlines.hh @@ -792,7 +792,7 @@ inline bool CO_Tree::tree_iterator::is_right_child() const { if (is_root()) return false; - return ((i & 2*offset) != 0); + return (i & (2*offset)) != 0; } inline bool

1 0

[GIT] ppl/ppl(master): Moved namespace alias declaration.
by Roberto Bagnara 11 Oct '11

11 Oct '11

Module: ppl/ppl Branch: master Commit: 13ed500e5e8dd3edf9e0b73be9f9dd3f8af72366 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=13ed500e5e8d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Oct 11 20:21:16 2011 +0200 Moved namespace alias declaration. --- Watchdog/src/Watchdog.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Watchdog/src/Watchdog.cc b/Watchdog/src/Watchdog.cc index 510f659..3f6ae6f 100644 --- a/Watchdog/src/Watchdog.cc +++ b/Watchdog/src/Watchdog.cc @@ -25,8 +25,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Watchdog.defs.hh" -namespace PWL = Parma_Watchdog_Library; - #if PWL_HAVE_DECL_SETITIMER && PWL_HAVE_DECL_SIGACTION #include <csignal> @@ -62,6 +60,8 @@ namespace PWL = Parma_Watchdog_Library; using std::cerr; using std::endl; +namespace PWL = Parma_Watchdog_Library; + // Pass this to getitimer(). itimerval PWL::Watchdog::current_timer_status;

1 0

[GIT] ppl/ppl(master): Reorganized the generation of Prolog interface manuals to avoid duplication .
by Enea Zaffanella 10 Oct '11

10 Oct '11

Module: ppl/ppl Branch: master Commit: 557e9ea1f7d737333b6f5025e03497818223f2f5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=557e9ea1f7d7… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Oct 10 16:03:28 2011 +0200 Reorganized the generation of Prolog interface manuals to avoid duplication. --- doc/Makefile.am | 37 +- interfaces/Prolog/.gitignore | 2 +- interfaces/Prolog/Makefile.am | 25 +- interfaces/Prolog/Prolog_configured_interface.dox | 63 + interfaces/Prolog/Prolog_interface.dox | 2073 +------------------- interfaces/Prolog/Prolog_interface_compilation.dox | 51 + ...olog_sysdep_dox => Prolog_interface_sysdep.dox} | 76 +- ..._sysindep_dox => Prolog_interface_sysindep.dox} | 391 ++++- .../Prolog/Prolog_interface_sysindep_domains.dox | 914 +++++++++ .../Prolog/ppl_interface_generator_prolog_dox.m4 | 90 +- 10 files changed, 1467 insertions(+), 2255 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=557e9ea1…

1 0

[GIT] ppl/ppl(master): Make sure we find <gmpxx.hh> when compiling instchk. hh to check for valid instantiations.
by Roberto Bagnara 10 Oct '11

10 Oct '11

Module: ppl/ppl Branch: master Commit: 35e22bca8e1be85f428f9e40bb283b01f8d0b787 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=35e22bca8e1b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Oct 10 12:22:45 2011 +0200 Make sure we find <gmpxx.hh> when compiling instchk.hh to check for valid instantiations. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index eb56f66..dc7e000 100644 --- a/configure.ac +++ b/configure.ac @@ -1319,7 +1319,7 @@ xno | xnone) required_instantiations=`echo "${enableval}" | sed -e 's/[[ ]][[ ]]*/ /g' -e 's/[[ ]]*$[[@<>,]]$/\1/g' -e 's/$[[@<>,]]$[[ ]]*/\1/g' -e 's/>>/> >/g' -e 's/^[[ ]]//g' -e 's/[[ ]]$//g'` # Check the specified instantiations for validity. ac_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I${srcdir}" + CPPFLAGS="$CPPFLAGS -I${srcdir} ${gmp_include_options}" old_IFS="${IFS}" IFS=@ set -- ${required_instantiations}

1 0

[GIT] ppl/ppl(master): Magic constants avoided.
by Roberto Bagnara 10 Oct '11

10 Oct '11

Module: ppl/ppl Branch: master Commit: a52e104fe997e8347139bc14cd6d1c44f40f9d08 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a52e104fe997… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Oct 9 19:33:37 2011 +0200 Magic constants avoided. Detected by ECLAIR service nomagicc. --- Watchdog/src/Time.cc | 2 +- Watchdog/src/Time.defs.hh | 6 ++++++ Watchdog/src/Time.inlines.hh | 17 +++++++++-------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Watchdog/src/Time.cc b/Watchdog/src/Time.cc index 9b52e4b..afc3aaf 100644 --- a/Watchdog/src/Time.cc +++ b/Watchdog/src/Time.cc @@ -29,5 +29,5 @@ namespace PWL = Parma_Watchdog_Library; bool PWL::Time::OK() const { - return microsecs < 1000000; + return microsecs < MUSECS_IN_SEC; } diff --git a/Watchdog/src/Time.defs.hh b/Watchdog/src/Time.defs.hh index 003d07c..3fd73fc 100644 --- a/Watchdog/src/Time.defs.hh +++ b/Watchdog/src/Time.defs.hh @@ -100,6 +100,12 @@ public: bool OK() const; private: + //! Number of microseconds in a second. + static const unsigned long MUSECS_IN_SEC = 1000000UL; + + //! Number of hundredths of a second in a second. + static const unsigned long HSECS_IN_SEC = 100UL; + //! Number of seconds. unsigned long secs; diff --git a/Watchdog/src/Time.inlines.hh b/Watchdog/src/Time.inlines.hh index cfcc814..7b005ac 100644 --- a/Watchdog/src/Time.inlines.hh +++ b/Watchdog/src/Time.inlines.hh @@ -36,8 +36,9 @@ Time::Time() inline Time::Time(unsigned long hundredths_of_a_second) - : secs(hundredths_of_a_second / 100), - microsecs((hundredths_of_a_second % 100) * 10000) { + : secs(hundredths_of_a_second / HSECS_IN_SEC), + microsecs((hundredths_of_a_second % HSECS_IN_SEC) + * (MUSECS_IN_SEC/HSECS_IN_SEC)) { assert(OK()); } @@ -45,9 +46,9 @@ inline Time::Time(unsigned long s, unsigned long m) : secs(s), microsecs(m) { - if (microsecs >= 1000000) { - secs += microsecs / 1000000; - microsecs %= 1000000; + if (microsecs >= MUSECS_IN_SEC) { + secs += microsecs / MUSECS_IN_SEC; + microsecs %= MUSECS_IN_SEC; } assert(OK()); } @@ -66,9 +67,9 @@ inline Time& Time::operator+=(const Time& y) { unsigned long r_secs = secs + y.secs; unsigned long r_microsecs = microsecs + y.microsecs; - if (r_microsecs >= 1000000) { + if (r_microsecs >= MUSECS_IN_SEC) { ++r_secs; - r_microsecs %= 1000000; + r_microsecs %= MUSECS_IN_SEC; } secs = r_secs; microsecs = r_microsecs; @@ -82,7 +83,7 @@ Time::operator-=(const Time& y) { long r_microsecs = microsecs - y.microsecs; if (r_microsecs < 0) { --r_secs; - r_microsecs += 1000000; + r_microsecs += MUSECS_IN_SEC; } if (r_secs < 0) r_secs = r_microsecs = 0;

2 3

[GIT] ppl/ppl(master): Better terminology and identifiers concerning time units.
by Roberto Bagnara 10 Oct '11

10 Oct '11

Module: ppl/ppl Branch: master Commit: 8f37574794416e4c97d012e8a51be42fe3b310aa URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8f3757479441… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Oct 10 08:39:04 2011 +0200 Better terminology and identifiers concerning time units. (Thanks to Anthony Foiani.) --- Watchdog/src/Time.cc | 2 +- Watchdog/src/Time.defs.hh | 10 +++++----- Watchdog/src/Time.inlines.hh | 19 +++++++++---------- Watchdog/src/Watchdog.cc | 6 +++--- Watchdog/src/Watchdog.defs.hh | 10 +++++----- Watchdog/src/Watchdog.inlines.hh | 20 ++++++++++---------- Watchdog/tests/watchdog1.cc | 6 +++--- demos/ppl_lpsol/ppl_lpsol.c | 10 +++++----- interfaces/C/ppl_c_header.h | 14 +++++++------- interfaces/C/ppl_c_implementation_common.cc | 6 +++--- interfaces/C/tests/watchdog1.c | 5 ++--- interfaces/Java/jni/ppl_java_globals.cc | 10 +++++----- .../Parma_Polyhedra_Library.java | 14 +++++++------- .../Java/tests/Parma_Polyhedra_Library_test2.java | 8 ++++---- interfaces/OCaml/OCaml_interface.dox | 8 ++++---- interfaces/Prolog/Prolog_interface.dox | 6 +++--- interfaces/Prolog/ppl_prolog_common.cc | 9 ++++----- interfaces/Prolog/ppl_prolog_common.defs.hh | 2 +- interfaces/Prolog/ppl_prolog_sysindep_dox | 4 ++-- interfaces/Prolog/tests/pl_check.pl | 6 +++--- tests/Polyhedron/watchdog1.cc | 5 ++--- utils/timings.cc | 18 +++++++++--------- 22 files changed, 97 insertions(+), 101 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=8f375747…

1 0

[GIT] ppl/ppl(master): Initialize all elements of Dimension_Kind.
by Patricia Hill 09 Oct '11

09 Oct '11

Module: ppl/ppl Branch: master Commit: d003cde962c61c31aaa2b27373b874bd538ff0e1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d003cde962c6… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun Oct 9 21:25:52 2011 +0100 Initialize all elements of Dimension_Kind. --- src/Grid.defs.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Grid.defs.hh b/src/Grid.defs.hh index d9aed82..a5a6249 100644 --- a/src/Grid.defs.hh +++ b/src/Grid.defs.hh @@ -1979,9 +1979,9 @@ private: dimension_type space_dim; enum Dimension_Kind { - PARAMETER, - LINE, - GEN_VIRTUAL, + PARAMETER = 0, + LINE = 1, + GEN_VIRTUAL = 2, PROPER_CONGRUENCE = PARAMETER, CON_VIRTUAL = LINE, EQUALITY = GEN_VIRTUAL

1 0

[GIT] ppl/ppl(master): Magic constants avoided.
by Roberto Bagnara 09 Oct '11

09 Oct '11

Module: ppl/ppl Branch: master Commit: 05d2137112f498fdcc29803d4e4608700790e8cc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=05d2137112f4… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Oct 9 20:58:54 2011 +0200 Magic constants avoided. Detected by ECLAIR service nomagicc. --- src/Init.cc | 2 +- src/Init.defs.hh | 8 ++++++++ src/OR_Matrix.inlines.hh | 13 +++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/Init.cc b/src/Init.cc index f7f847c..3cee7c4 100644 --- a/src/Init.cc +++ b/src/Init.cc @@ -176,7 +176,7 @@ PPL::Init::Init() { // The default is choosen to have a precision greater than most // precise IEC559 floating point (112 bits of mantissa). - set_irrational_precision(128); + set_irrational_precision(DEFAULT_IRRATIONAL_PRECISION); } } diff --git a/src/Init.defs.hh b/src/Init.defs.hh index 7a9ee4b..57d1cec 100644 --- a/src/Init.defs.hh +++ b/src/Init.defs.hh @@ -73,6 +73,14 @@ public: ~Init(); private: + /*! \brief + Default precision parameter used for irrational calculations. + + The default is choosen to have a precision greater than most + precise IEC559 floating point (112 bits of mantissa). + */ + static const unsigned DEFAULT_IRRATIONAL_PRECISION = 128U; + //! Count the number of objects created. static unsigned int count; static fpu_rounding_direction_type old_rounding_direction; diff --git a/src/OR_Matrix.inlines.hh b/src/OR_Matrix.inlines.hh index 401bb0c..fa7f284 100644 --- a/src/OR_Matrix.inlines.hh +++ b/src/OR_Matrix.inlines.hh @@ -30,8 +30,8 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "C_Polyhedron.defs.hh" #include "distances.defs.hh" #include "assert.hh" -#include <algorithm> #include "checked.defs.hh" +#include <algorithm> namespace Parma_Polyhedra_Library { @@ -405,11 +405,12 @@ OR_Matrix<T>::swap(OR_Matrix& y) { } //! Returns the integer square root of \p x. -inline unsigned long -isqrt(unsigned long x) { - unsigned long r = 0; - for (unsigned long t = 0x40000000; t; t >>= 2) { - unsigned long s = r + t; +inline dimension_type +isqrt(dimension_type x) { + dimension_type r = 0; + const dimension_type FIRST_BIT_MASK = 0x40000000U; + for (dimension_type t = FIRST_BIT_MASK; t; t >>= 2) { + dimension_type s = r + t; if (s <= x) { x -= s; r = s + t;

1 0

[GIT] ppl/ppl(master): Magic constants avoided.
by Roberto Bagnara 09 Oct '11

09 Oct '11

Module: ppl/ppl Branch: master Commit: f768b3933ef890976ed57198e99fbe90885fb533 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f768b3933ef8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Oct 9 19:45:03 2011 +0200 Magic constants avoided. Detected by ECLAIR service nomagicc. --- demos/ppl_lcdd/ppl_lcdd.cc | 17 ++++++++++------- demos/ppl_pips/ppl_pips.cc | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index 68e6f53..b48962d 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -415,13 +415,16 @@ process_options(int argc, char* argv[]) { #endif // defined(PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME) case 'R': - l = strtol(optarg, &endptr, 10); - if (*endptr || l < 0) - fatal("a non-negative integer must follow `-R'"); - else if (((unsigned long) l) > ULONG_MAX/(1024*1024)) - max_bytes_of_virtual_memory = ULONG_MAX; - else - max_bytes_of_virtual_memory = l*1024*1024; + { + const int MEGA = 1024*1024; + l = strtol(optarg, &endptr, 10); + if (*endptr || l < 0) + fatal("a non-negative integer must follow `-R'"); + else if (static_cast<unsigned long>(l) > ULONG_MAX/MEGA) + max_bytes_of_virtual_memory = ULONG_MAX; + else + max_bytes_of_virtual_memory = l*MEGA; + } break; case 'o': diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 69f2f8a..3b2c193 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -673,13 +673,16 @@ process_options(int argc, char* argv[]) { break; case 'R': - l = strtol(optarg, &endptr, 10); - if (*endptr || l < 0) - fatal("a non-negative integer must follow `-R'"); - else if (((unsigned long) l) > ULONG_MAX/(1024*1024)) - max_bytes_of_virtual_memory = ULONG_MAX; - else - max_bytes_of_virtual_memory = l*1024*1024; + { + const int MEGA = 1024*1024; + l = strtol(optarg, &endptr, 10); + if (*endptr || l < 0) + fatal("a non-negative integer must follow `-R'"); + else if (static_cast<unsigned long>(l) > ULONG_MAX/MEGA) + max_bytes_of_virtual_memory = ULONG_MAX; + else + max_bytes_of_virtual_memory = l*MEGA; + } break; case 'o':

1 0

Integer projection
by Didier Lime 06 Oct '11

06 Oct '11

Dear PPL developers, What would you think is the most sensible way to compute the convex hull of all the integer points in a given polyhedron? drop_some_non_integer_points() seems to be quite close but the description reads like it might not always compute exactly this. Thank you in advance, and also for this very nice library. Cheers, Didier -- Dr. Didier Lime Maître de Conférences IRCCyN / École Centrale de Nantes Nantes, France http://www.irccyn.ec-nantes.fr/~lime

2 3