- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Renamed some variables so that declarations in an outer scope are not hidden .
by Patricia Hill 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 97cc40667310524111a674be5ad3e8e9e4ec8c90 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=97cc40667310… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Feb 20 20:58:18 2012 +0000 Renamed some variables so that declarations in an outer scope are not hidden. --- src/Grid.templates.hh | 8 ++++---- src/PIP_Problem.cc | 6 +++--- src/checked_float.inlines.hh | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Grid.templates.hh b/src/Grid.templates.hh index 94d756f..03d01ae 100644 --- a/src/Grid.templates.hh +++ b/src/Grid.templates.hh @@ -270,7 +270,7 @@ Grid::reduce_reduced(M& sys, const dimension_type pivot_index, const dimension_type start, const dimension_type end, - const Dimension_Kinds& dim_kinds, + const Dimension_Kinds& sys_dim_kinds, const bool generators) { R& pivot = sys[pivot_index]; @@ -281,7 +281,7 @@ Grid::reduce_reduced(M& sys, PPL_DIRTY_TEMP_COEFFICIENT(pivot_dim_half); pivot_dim_half = (pivot_dim + 1) / 2; - Dimension_Kind row_kind = dim_kinds[dim]; + Dimension_Kind row_kind = sys_dim_kinds[dim]; Dimension_Kind line_or_equality, virtual_kind; int jump; if (generators) { @@ -301,13 +301,13 @@ Grid::reduce_reduced(M& sys, row_index-- > 0; kinds_index += jump) { // Move over any virtual rows. - while (dim_kinds[kinds_index] == virtual_kind) + while (sys_dim_kinds[kinds_index] == virtual_kind) kinds_index += jump; // row_kind CONGRUENCE is included as PARAMETER if (row_kind == line_or_equality || (row_kind == PARAMETER - && dim_kinds[kinds_index] == PARAMETER)) { + && sys_dim_kinds[kinds_index] == PARAMETER)) { R& row = sys[row_index]; const Coefficient& row_dim = row[dim]; diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index bfe1c2c..ae9ccb3 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -177,10 +177,10 @@ PPL::PIP_Problem::solve() const { for (Variables_Set::const_iterator pi = param_begin; pi != param_end; ++pi, ++i) { if (*pi < c_space_dim) { - Coefficient_traits::const_reference x + Coefficient_traits::const_reference coeff_pi = c.coefficient(Variable(*pi)); - if (x != 0) - itr = row.insert(itr, i, x); + if (coeff_pi != 0) + itr = row.insert(itr, i, coeff_pi); } else break; } diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 6c2b97a..755e96a 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -154,10 +154,10 @@ classify_float(const T v, bool nan, bool inf, bool sign) { return V_NAN; if (inf) { if (Policy::has_infinity) { - int sign = f.u.binary.inf_sign(); - if (sign < 0) + int sign_inf = f.u.binary.inf_sign(); + if (sign_inf < 0) return V_EQ_MINUS_INFINITY; - if (sign > 0) + if (sign_inf > 0) return V_EQ_PLUS_INFINITY; } else

1 0

[GIT] ppl/ppl(master): Spurious line removed.
by Roberto Bagnara 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 3ded8bb10d824721a1bb6ed083de18d2350be36f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3ded8bb10d82… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 20 18:57:50 2012 +0100 Spurious line removed. --- devtools/good_ids | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/devtools/good_ids b/devtools/good_ids index 5fdc170..c16db34 100644 --- a/devtools/good_ids +++ b/devtools/good_ids @@ -14,7 +14,6 @@ PPL_PACKAGE_BUGREPORT RLIMIT_AS RLIMIT_CPU RUSAGE_SELF -Rule B.PROGVCBL: SA_ONESHOT SA_RESETHAND SCHAR_MAX

1 0

[GIT] ppl/ppl(master): Added/fixed some copyright notices.
by Roberto Bagnara 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 2603585b9999c9288e1168cdc179014e7f865b27 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2603585b9999… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 20 18:57:17 2012 +0100 Added/fixed some copyright notices. --- README.alpha | 12 ++++++++++++ README.arm | 12 ++++++++++++ README.solaris | 12 ++++++++++++ devtools/update_ChangeLog | 12 ++++++++++++ interfaces/Java/README.java | 20 ++++++++++++++++---- interfaces/OCaml/README.ocaml | 11 +++++++++++ interfaces/Prolog/Ciao/README.ciao | 12 ++++++++++++ interfaces/Prolog/GNU/README.gprolog | 12 ++++++++++++ interfaces/Prolog/SWI/README.swiprolog | 12 ++++++++++++ interfaces/Prolog/YAP/README.yap | 12 ++++++++++++ tests/MIP_Problem/mipproblem4.cc | 1 + 11 files changed, 124 insertions(+), 4 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=2603585b…

1 0

[GIT] ppl/ppl(master): Let bitwise operators be applied to unsigned integer types.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: b4dac3bae9765441ee8be3b45a8fb495fbcdc56d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b4dac3bae976… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 17:55:33 2012 +0100 Let bitwise operators be applied to unsigned integer types. Detected by ECLAIR service utypflag. --- src/Float.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Float.inlines.hh b/src/Float.inlines.hh index fb2b78d..6d851db 100644 --- a/src/Float.inlines.hh +++ b/src/Float.inlines.hh @@ -470,7 +470,7 @@ is_less_precise_than(Floating_Point_Format f1, Floating_Point_Format f2) { inline unsigned int msb_position(unsigned long long v) { PPL_ASSERT(v != 0); - return __builtin_clzll(v) ^ (sizeof(v)*8 - 1); + return static_cast<unsigned>(__builtin_clzll(v)) ^ (sizeof(v)*8 - 1); } #else unsigned int

1 0

[GIT] ppl/ppl(master): Let bitwise operators be applied to unsigned integer types.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: c64257c541e084d8f6adce267f894384fa39d45b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c64257c541e0… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 17:29:54 2012 +0100 Let bitwise operators be applied to unsigned integer types. Detected by ECLAIR service utypflag. --- src/Linear_Row.cc | 10 +++++----- src/Linear_Row.defs.hh | 2 +- src/Linear_Row.inlines.hh | 39 ++++++++++++++++++++------------------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/Linear_Row.cc b/src/Linear_Row.cc index 9b0f52d..5a5de51 100644 --- a/src/Linear_Row.cc +++ b/src/Linear_Row.cc @@ -152,14 +152,14 @@ const char* bit_names[] = {rpi_valid, is_rpi, nnc_valid, is_nnc}; void PPL::Linear_Row::Flags::ascii_dump(std::ostream& s) const { - s << (test_bits(1 << Flags::rpi_validity_bit) ? '+' : '-') + s << (test_bits(1U << Flags::rpi_validity_bit) ? '+' : '-') << rpi_valid << ' ' - << (test_bits(1 << Flags::rpi_bit) ? '+' : '-') + << (test_bits(1U << Flags::rpi_bit) ? '+' : '-') << is_rpi << ' ' << ' ' - << (test_bits(1 << Flags::nnc_validity_bit) ? '+' : '-') + << (test_bits(1U << Flags::nnc_validity_bit) ? '+' : '-') << nnc_valid << ' ' - << (test_bits(1 << Flags::nnc_bit) ? '+' : '-') + << (test_bits(1U << Flags::nnc_bit) ? '+' : '-') << is_nnc; } @@ -176,7 +176,7 @@ PPL::Linear_Row::Flags::ascii_load(std::istream& s) { if (!(s >> str)) return false; if (str[0] == '+') - set_bits(1 << (Dense_Row::Flags::first_free_bit + bit)); + set_bits(1U << (Dense_Row::Flags::first_free_bit + bit)); else if (str[0] != '-') return false; if (str.compare(1, strlen(bit_names[bit]), bit_names[bit]) != 0) diff --git a/src/Linear_Row.defs.hh b/src/Linear_Row.defs.hh index 65c12db..b42e61f 100644 --- a/src/Linear_Row.defs.hh +++ b/src/Linear_Row.defs.hh @@ -187,7 +187,7 @@ public: private: //! Builds the type from a bit-mask. explicit Flags(base_type mask); - + //! Constructor from a Dense_Row::Flags object. explicit Flags(Dense_Row::Flags flags); diff --git a/src/Linear_Row.inlines.hh b/src/Linear_Row.inlines.hh index e3037f6..571a7e3 100644 --- a/src/Linear_Row.inlines.hh +++ b/src/Linear_Row.inlines.hh @@ -43,75 +43,76 @@ Linear_Row::Flags::Flags(Dense_Row::Flags f) inline Linear_Row::Flags::Flags(const Topology t) - : Dense_Row::Flags(t << nnc_bit) { + : Dense_Row::Flags(static_cast<unsigned>(t) << nnc_bit) { #ifndef NDEBUG - set_bits(1 << nnc_validity_bit); + set_bits(1U << nnc_validity_bit); #endif } inline Linear_Row::Flags::Flags(const Topology t, const Kind k) - : Dense_Row::Flags((k << rpi_bit) | (t << nnc_bit)) { + : Dense_Row::Flags((static_cast<unsigned>(k) << rpi_bit) + | (static_cast<unsigned>(t) << nnc_bit)) { #ifndef NDEBUG - set_bits((1 << rpi_validity_bit) - | (1 << nnc_validity_bit)); + set_bits((1U << rpi_validity_bit) | (1U << nnc_validity_bit)); #endif } inline bool Linear_Row::Flags::is_ray_or_point_or_inequality() const { - PPL_ASSERT(test_bits(1 << rpi_validity_bit)); - return test_bits(RAY_OR_POINT_OR_INEQUALITY << rpi_bit); + PPL_ASSERT(test_bits(1U << rpi_validity_bit)); + return + test_bits(static_cast<unsigned>(RAY_OR_POINT_OR_INEQUALITY) << rpi_bit); } inline void Linear_Row::Flags::set_is_ray_or_point_or_inequality() { #ifndef NDEBUG - set_bits(1 << rpi_validity_bit); + set_bits(1U << rpi_validity_bit); #endif - set_bits(RAY_OR_POINT_OR_INEQUALITY << rpi_bit); + set_bits(static_cast<unsigned>(RAY_OR_POINT_OR_INEQUALITY) << rpi_bit); } inline bool Linear_Row::Flags::is_line_or_equality() const { - PPL_ASSERT(test_bits(1 << rpi_validity_bit)); + PPL_ASSERT(test_bits(1U << rpi_validity_bit)); return !is_ray_or_point_or_inequality(); } inline void Linear_Row::Flags::set_is_line_or_equality() { #ifndef NDEBUG - set_bits(1 << rpi_validity_bit); + set_bits(1U << rpi_validity_bit); #endif - reset_bits(RAY_OR_POINT_OR_INEQUALITY << rpi_bit); + reset_bits(static_cast<unsigned>(RAY_OR_POINT_OR_INEQUALITY) << rpi_bit); } inline bool Linear_Row::Flags::is_not_necessarily_closed() const { - PPL_ASSERT(test_bits(1 << nnc_validity_bit)); - return test_bits(NOT_NECESSARILY_CLOSED << nnc_bit); + PPL_ASSERT(test_bits(1U << nnc_validity_bit)); + return test_bits(static_cast<unsigned>(NOT_NECESSARILY_CLOSED) << nnc_bit); } inline bool Linear_Row::Flags::is_necessarily_closed() const { - PPL_ASSERT(test_bits(1 << nnc_validity_bit)); + PPL_ASSERT(test_bits(1U << nnc_validity_bit)); return !is_not_necessarily_closed(); } inline void Linear_Row::Flags::set_not_necessarily_closed() { #ifndef NDEBUG - set_bits(1 << nnc_validity_bit); + set_bits(1U << nnc_validity_bit); #endif - set_bits(NOT_NECESSARILY_CLOSED << nnc_bit); + set_bits(static_cast<unsigned>(NOT_NECESSARILY_CLOSED) << nnc_bit); } inline void Linear_Row::Flags::set_necessarily_closed() { #ifndef NDEBUG - set_bits(1 << nnc_validity_bit); + set_bits(1U << nnc_validity_bit); #endif - reset_bits(NOT_NECESSARILY_CLOSED << nnc_bit); + reset_bits(static_cast<unsigned>(NOT_NECESSARILY_CLOSED) << nnc_bit); } inline Topology

1 0

[GIT] ppl/ppl(master): Exploit operator| overloading for Rounding_Dir.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: bb321df039bce4988dc316523b88546e8c2dd057 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bb321df039bc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 17:28:02 2012 +0100 Exploit operator| overloading for Rounding_Dir. --- src/Boundary.defs.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Boundary.defs.hh b/src/Boundary.defs.hh index 72d8858..58fb3cf 100644 --- a/src/Boundary.defs.hh +++ b/src/Boundary.defs.hh @@ -57,7 +57,7 @@ enum Boundary_Type { inline Rounding_Dir round_dir_check(Boundary_Type t, bool check = false) { if (check) - return static_cast<Rounding_Dir>(t | ROUND_STRICT_RELATION); + return static_cast<Rounding_Dir>(t) | ROUND_STRICT_RELATION; else return static_cast<Rounding_Dir>(t); }

1 0

[GIT] ppl/ppl(master): Let bitwise operators be applied to unsigned integer types.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 58a8be4d4b1d493d01074409b87fe34ddfa09c05 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=58a8be4d4b1d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 17:27:12 2012 +0100 Let bitwise operators be applied to unsigned integer types. Detected by ECLAIR service utypflag. --- src/Bit_Row.cc | 2 +- src/Float.defs.hh | 12 ++++++------ src/Interval.defs.hh | 3 ++- src/intervals.defs.hh | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index 47f153c..9fec973 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -140,7 +140,7 @@ PPL::Bit_Row::operator[](const unsigned long k) const { return false; mp_limb_t limb = *(vec->_mp_d + i); - return ((limb >> (k % GMP_NUMB_BITS)) & 1) != 0; + return ((limb >> (k % GMP_NUMB_BITS)) & 1U) != 0; } void diff --git a/src/Float.defs.hh b/src/Float.defs.hh index 597b2dc..1b29841 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -59,7 +59,7 @@ struct float_ieee754_half { static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 5; static const unsigned int MANTISSA_BITS = 10; - static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (EXPONENT_BITS - 1)) - 1; static const int EXPONENT_BIAS = EXPONENT_MAX; static const int EXPONENT_MIN = -EXPONENT_MAX + 1; static const int EXPONENT_MIN_DENORM = EXPONENT_MIN @@ -92,7 +92,7 @@ struct float_ieee754_single { static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 8; static const unsigned int MANTISSA_BITS = 23; - static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (EXPONENT_BITS - 1)) - 1; static const int EXPONENT_BIAS = EXPONENT_MAX; static const int EXPONENT_MIN = -EXPONENT_MAX + 1; static const int EXPONENT_MIN_DENORM = EXPONENT_MIN @@ -138,7 +138,7 @@ struct float_ieee754_double { static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 11; static const unsigned int MANTISSA_BITS = 52; - static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (EXPONENT_BITS - 1)) - 1; static const int EXPONENT_BIAS = EXPONENT_MAX; static const int EXPONENT_MIN = -EXPONENT_MAX + 1; static const int EXPONENT_MIN_DENORM = EXPONENT_MIN @@ -171,7 +171,7 @@ struct float_ibm_single { static const unsigned int EXPONENT_BITS = 7; static const unsigned int MANTISSA_BITS = 24; static const int EXPONENT_BIAS = 64; - static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (EXPONENT_BITS - 1)) - 1; static const int EXPONENT_MIN = -EXPONENT_MAX + 1; static const int EXPONENT_MIN_DENORM = EXPONENT_MIN - static_cast<int>(MANTISSA_BITS); @@ -222,7 +222,7 @@ struct float_intel_double_extended { static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 15; static const unsigned int MANTISSA_BITS = 63; - static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (EXPONENT_BITS - 1)) - 1; static const int EXPONENT_BIAS = EXPONENT_MAX; static const int EXPONENT_MIN = -EXPONENT_MAX + 1; static const int EXPONENT_MIN_DENORM = EXPONENT_MIN @@ -263,7 +263,7 @@ struct float_ieee754_quad { static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 15; static const unsigned int MANTISSA_BITS = 112; - static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (EXPONENT_BITS - 1)) - 1; static const int EXPONENT_BIAS = EXPONENT_MAX; static const int EXPONENT_MIN = -EXPONENT_MAX + 1; static const int EXPONENT_MIN_DENORM = EXPONENT_MIN diff --git a/src/Interval.defs.hh b/src/Interval.defs.hh index bd0045b..843d17e 100644 --- a/src/Interval.defs.hh +++ b/src/Interval.defs.hh @@ -41,7 +41,8 @@ enum Ternary { T_YES, T_NO, T_MAYBE }; inline I_Result combine(Result l, Result u) { - return static_cast<I_Result>(l | (u << 6)); + unsigned res = static_cast<unsigned>(l) | (static_cast<unsigned>(u) << 6); + return static_cast<I_Result>(res); } struct Interval_Base { diff --git a/src/intervals.defs.hh b/src/intervals.defs.hh index 072b406..29c1081 100644 --- a/src/intervals.defs.hh +++ b/src/intervals.defs.hh @@ -33,13 +33,13 @@ namespace Parma_Polyhedra_Library { enum I_Result { //! The resulting set may be empty - I_EMPTY = 1, + I_EMPTY = 1U, //! The resulting set may have only one value - I_SINGLETON = 2, + I_SINGLETON = 2U, //! The resulting set may have more than one value and to be not the domain universe - I_SOME = 4, + I_SOME = 4U, //! The resulting set may be the domain universe - I_UNIVERSE = 8, + I_UNIVERSE = 8U, //! The resulting set is not empty I_NOT_EMPTY = I_SINGLETON | I_SOME | I_UNIVERSE, //! The resulting set may be empty or not empty

1 0

[GIT] ppl/ppl(master): Let bitwise operators be applied to unsigned integer types.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 73a3335f0a0974c903e88c4cd4b7107fb779bbcb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=73a3335f0a09… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 17:23:49 2012 +0100 Let bitwise operators be applied to unsigned integer types. Detected by ECLAIR service utypflag. --- src/Result.defs.hh | 62 ++++++++++++++++++++++++++----------------------- src/Result.inlines.hh | 39 +++++++++++++++++++++--------- src/globals.types.hh | 6 ++-- 3 files changed, 63 insertions(+), 44 deletions(-) diff --git a/src/Result.defs.hh b/src/Result.defs.hh index e59147d..35eac7a 100644 --- a/src/Result.defs.hh +++ b/src/Result.defs.hh @@ -28,16 +28,16 @@ namespace Parma_Polyhedra_Library { enum Result_Class { //! \hideinitializer Representable number result class. - VC_NORMAL = 0 << 4, + VC_NORMAL = 0U << 4, //! \hideinitializer Negative infinity result class. - VC_MINUS_INFINITY = 1 << 4, + VC_MINUS_INFINITY = 1U << 4, //! \hideinitializer Positive infinity result class. - VC_PLUS_INFINITY = 2 << 4, + VC_PLUS_INFINITY = 2U << 4, //! \hideinitializer Not a number result class. - VC_NAN = 3 << 4, + VC_NAN = 3U << 4, VC_MASK = VC_NAN }; @@ -45,16 +45,16 @@ enum Result_Class { // This must be kept in sync with Relation_Symbol enum Result_Relation { //! \hideinitializer No values satisfies the relation. - VR_EMPTY = 0, + VR_EMPTY = 0U, //! \hideinitializer Equal. This need to be accompanied by a value. - VR_EQ = 1, + VR_EQ = 1U, //! \hideinitializer Less than. This need to be accompanied by a value. - VR_LT = 2, + VR_LT = 2U, //! \hideinitializer Greater than. This need to be accompanied by a value. - VR_GT = 4, + VR_GT = 4U, //! \hideinitializer Not equal. This need to be accompanied by a value. VR_NE = VR_LT | VR_GT, @@ -78,13 +78,13 @@ enum Result { V_EMPTY = VR_EMPTY, //! \hideinitializer The computed result is exact. - V_EQ = VR_EQ, + V_EQ = static_cast<unsigned>(VR_EQ), //! \hideinitializer The computed result is inexact and rounded up. - V_LT = VR_LT, + V_LT = static_cast<unsigned>(VR_LT), //! \hideinitializer The computed result is inexact and rounded down. - V_GT = VR_GT, + V_GT = static_cast<unsigned>(VR_GT), //! \hideinitializer The computed result is inexact. V_NE = VR_NE, @@ -99,7 +99,7 @@ enum Result { V_LGE = VR_LGE, //! \hideinitializer The exact result is a number out of finite bounds. - V_OVERFLOW = 1 << 6, + V_OVERFLOW = 1U << 6, //! \hideinitializer A negative integer overflow occurred (rounding up). V_LT_INF = V_LT | V_OVERFLOW, @@ -108,58 +108,62 @@ enum Result { V_GT_SUP = V_GT | V_OVERFLOW, //! \hideinitializer A positive integer overflow occurred (rounding up). - V_LT_PLUS_INFINITY = V_LT | VC_PLUS_INFINITY, + V_LT_PLUS_INFINITY = V_LT | static_cast<unsigned>(VC_PLUS_INFINITY), //! \hideinitializer A negative integer overflow occurred (rounding down). - V_GT_MINUS_INFINITY = V_GT | VC_MINUS_INFINITY, + V_GT_MINUS_INFINITY = V_GT | static_cast<unsigned>(VC_MINUS_INFINITY), //! \hideinitializer Negative infinity result. - V_EQ_MINUS_INFINITY = V_EQ | VC_MINUS_INFINITY, + V_EQ_MINUS_INFINITY = V_EQ | static_cast<unsigned>(VC_MINUS_INFINITY), //! \hideinitializer Positive infinity result. - V_EQ_PLUS_INFINITY = V_EQ | VC_PLUS_INFINITY, + V_EQ_PLUS_INFINITY = V_EQ | static_cast<unsigned>(VC_PLUS_INFINITY), //! \hideinitializer Not a number result. - V_NAN = VC_NAN, + V_NAN = static_cast<unsigned>(VC_NAN), //! \hideinitializer Converting from unknown string. - V_CVT_STR_UNK = V_NAN | (1 << 8), + V_CVT_STR_UNK = V_NAN | (1U << 8), //! \hideinitializer Dividing by zero. - V_DIV_ZERO = V_NAN | (2 << 8), + V_DIV_ZERO = V_NAN | (2U << 8), //! \hideinitializer Adding two infinities having opposite signs. - V_INF_ADD_INF = V_NAN | (3 << 8), + V_INF_ADD_INF = V_NAN | (3U << 8), //! \hideinitializer Dividing two infinities. - V_INF_DIV_INF = V_NAN | (4 << 8), + V_INF_DIV_INF = V_NAN | (4U << 8), //! \hideinitializer Taking the modulus of an infinity. - V_INF_MOD = V_NAN | (5 << 8), + V_INF_MOD = V_NAN | (5U << 8), //! \hideinitializer Multiplying an infinity by zero. - V_INF_MUL_ZERO = V_NAN | (6 << 8), + V_INF_MUL_ZERO = V_NAN | (6U << 8), //! \hideinitializer Subtracting two infinities having the same sign. - V_INF_SUB_INF = V_NAN | (7 << 8), + V_INF_SUB_INF = V_NAN | (7U << 8), //! \hideinitializer Computing a remainder modulo zero. - V_MOD_ZERO = V_NAN | (8 << 8), + V_MOD_ZERO = V_NAN | (8U << 8), //! \hideinitializer Taking the square root of a negative number. - V_SQRT_NEG = V_NAN | (9 << 8), + V_SQRT_NEG = V_NAN | (9U << 8), //! \hideinitializer Unknown result due to intermediate negative overflow. - V_UNKNOWN_NEG_OVERFLOW = V_NAN | (10 << 8), + V_UNKNOWN_NEG_OVERFLOW = V_NAN | (10U << 8), //! \hideinitializer Unknown result due to intermediate positive overflow. - V_UNKNOWN_POS_OVERFLOW = V_NAN | (11 << 8), + V_UNKNOWN_POS_OVERFLOW = V_NAN | (11U << 8), //! \hideinitializer The computed result is not representable. - V_UNREPRESENTABLE = 1 << 7 + V_UNREPRESENTABLE = 1U << 7 }; +Result operator&(Result x, Result y); +Result operator|(Result x, Result y); +Result operator-(Result x, Result y); + //! Extracts the value class part of \p r (representable number, unrepresentable minus/plus infinity or nan). Result_Class result_class(Result r); diff --git a/src/Result.inlines.hh b/src/Result.inlines.hh index 36e754d..5141347 100644 --- a/src/Result.inlines.hh +++ b/src/Result.inlines.hh @@ -29,21 +29,44 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { /*! \relates Parma_Polyhedra_Library::Result */ +inline Result +operator&(Result x, Result y) { + unsigned res = static_cast<unsigned>(x) & static_cast<unsigned>(y); + return static_cast<Result>(res); +} + +/*! \relates Parma_Polyhedra_Library::Result */ +inline Result +operator|(Result x, Result y) { + unsigned res = static_cast<unsigned>(x) | static_cast<unsigned>(y); + return static_cast<Result>(res); +} + +/*! \relates Parma_Polyhedra_Library::Result */ +inline Result +operator-(Result x, Result y) { + Result y_neg = static_cast<Result>(~static_cast<unsigned>(y)); + return x & y_neg; +} + +/*! \relates Parma_Polyhedra_Library::Result */ inline Result_Class result_class(Result r) { - return static_cast<Result_Class>(r & VC_MASK); + Result rc = r & static_cast<Result>(VC_MASK); + return static_cast<Result_Class>(rc); } /*! \relates Parma_Polyhedra_Library::Result */ inline Result_Relation result_relation(Result r) { - return static_cast<Result_Relation>(r & VR_MASK); + Result rc = r & static_cast<Result>(VR_MASK); + return static_cast<Result_Relation>(rc); } /*! \relates Parma_Polyhedra_Library::Result */ inline Result result_relation_class(Result r) { - return static_cast<Result>(r & (VR_MASK | VC_MASK)); + return r & (static_cast<Result>(VR_MASK) | static_cast<Result>(VC_MASK)); } inline int @@ -71,15 +94,7 @@ result_overflow(Result r) { inline bool result_representable(Result r) { - return (r & V_UNREPRESENTABLE) == 0; -} - -inline Result operator|(Result a, Result b) { - return static_cast<Result>((unsigned)a | (unsigned)b); -} - -inline Result operator-(Result a, Result b) { - return static_cast<Result>((unsigned)a & ~(unsigned)b); + return (r & V_UNREPRESENTABLE) != V_UNREPRESENTABLE; } } // namespace Parma_Polyhedra_Library diff --git a/src/globals.types.hh b/src/globals.types.hh index a74a80b..91cb692 100644 --- a/src/globals.types.hh +++ b/src/globals.types.hh @@ -39,13 +39,13 @@ enum Degenerate_Element { // This must be kept in sync with Result enum Relation_Symbol { //! \hideinitializer Equal to. - EQUAL = 1, + EQUAL = 1U, //! \hideinitializer Less than. - LESS_THAN = 2, + LESS_THAN = 2U, //! \hideinitializer Less than or equal to. LESS_OR_EQUAL = LESS_THAN | EQUAL, //! \hideinitializer Greater than. - GREATER_THAN = 4, + GREATER_THAN = 4U, //! \hideinitializer Greater than or equal to. GREATER_OR_EQUAL = GREATER_THAN | EQUAL, //! \hideinitializer Not equal to.

1 0

[GIT] ppl/ppl(master): Let bitwise operators be applied to unsigned integer types.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 803576355bab1ffbad948d7d5a75be21121765dc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=803576355bab… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 16:55:20 2012 +0100 Let bitwise operators be applied to unsigned integer types. Detected by ECLAIR service utypflag. --- src/Rounding_Dir.defs.hh | 15 +++++++++------ src/Rounding_Dir.inlines.hh | 42 +++++++++++++++++++++++++++++------------- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/src/Rounding_Dir.defs.hh b/src/Rounding_Dir.defs.hh index e1d9a1d..15c7d63 100644 --- a/src/Rounding_Dir.defs.hh +++ b/src/Rounding_Dir.defs.hh @@ -35,17 +35,17 @@ enum Rounding_Dir { /*! \hideinitializer Round toward \f$-\infty\f$. */ - ROUND_DOWN = 0, + ROUND_DOWN = 0U, /*! \hideinitializer Round toward \f$+\infty\f$. */ - ROUND_UP = 1, + ROUND_UP = 1U, /*! \hideinitializer Rounding is delegated to lower level. Result info is evaluated lazily. */ - ROUND_IGNORE = 6, + ROUND_IGNORE = 6U, ROUND_NATIVE = ROUND_IGNORE, /*! \hideinitializer @@ -53,22 +53,25 @@ enum Rounding_Dir { result is exact and representable in the destination type. Result info is evaluated lazily. */ - ROUND_NOT_NEEDED = 7, + ROUND_NOT_NEEDED = 7U, ROUND_DIRECT = ROUND_UP, ROUND_INVERSE = ROUND_DOWN, - ROUND_DIR_MASK = 7, + ROUND_DIR_MASK = 7U, /*! \hideinitializer The client code is willing to pay an extra price to know the exact relation between the exact result and the computed one. */ - ROUND_STRICT_RELATION = 8, + ROUND_STRICT_RELATION = 8U, ROUND_CHECK = ROUND_DIRECT | ROUND_STRICT_RELATION }; +Rounding_Dir operator&(Rounding_Dir x, Rounding_Dir y); +Rounding_Dir operator|(Rounding_Dir x, Rounding_Dir y); + /*! \brief Returns the inverse rounding mode of \p dir, <CODE>ROUND_IGNORE</CODE> being the inverse of itself. diff --git a/src/Rounding_Dir.inlines.hh b/src/Rounding_Dir.inlines.hh index af2de1c..12b9823 100644 --- a/src/Rounding_Dir.inlines.hh +++ b/src/Rounding_Dir.inlines.hh @@ -28,53 +28,77 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ +inline Rounding_Dir +operator&(Rounding_Dir x, Rounding_Dir y) { + unsigned res = static_cast<unsigned>(x) & static_cast<unsigned>(y); + return static_cast<Rounding_Dir>(res); +} + +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ +inline Rounding_Dir +operator|(Rounding_Dir x, Rounding_Dir y) { + unsigned res = static_cast<unsigned>(x) | static_cast<unsigned>(y); + return static_cast<Rounding_Dir>(res); +} + +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline Rounding_Dir round_dir(Rounding_Dir dir) { - return static_cast<Rounding_Dir>(dir & ROUND_DIR_MASK); + return dir & ROUND_DIR_MASK; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_down(Rounding_Dir dir) { return round_dir(dir) == ROUND_DOWN; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_up(Rounding_Dir dir) { return round_dir(dir) == ROUND_UP; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_ignore(Rounding_Dir dir) { return round_dir(dir) == ROUND_IGNORE; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_not_needed(Rounding_Dir dir) { return round_dir(dir) == ROUND_NOT_NEEDED; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_not_requested(Rounding_Dir dir) { return round_dir(dir) == ROUND_IGNORE || round_dir(dir) == ROUND_NOT_NEEDED; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_direct(Rounding_Dir dir) { return round_dir(dir) == ROUND_DIRECT; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_inverse(Rounding_Dir dir) { return round_dir(dir) == ROUND_INVERSE; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_strict_relation(Rounding_Dir dir) { - return (dir & ROUND_STRICT_RELATION) != 0; + return (dir & ROUND_STRICT_RELATION) == ROUND_STRICT_RELATION; } #if PPL_CAN_CONTROL_FPU +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline fpu_rounding_direction_type round_fpu_dir(Rounding_Dir dir) { switch (round_dir(dir)) { @@ -99,25 +123,17 @@ round_fpu_dir(Rounding_Dir dir) { /*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline Rounding_Dir inverse(Rounding_Dir dir) { - Rounding_Dir d = round_dir(dir); - switch (d) { + switch (round_dir(dir)) { case ROUND_UP: - d = ROUND_DOWN; - break; + return ROUND_DOWN | (dir & ROUND_STRICT_RELATION); case ROUND_DOWN: - d = ROUND_UP; - break; + return ROUND_UP | (dir & ROUND_STRICT_RELATION); case ROUND_IGNORE: return dir; default: PPL_UNREACHABLE; return dir; } - return static_cast<Rounding_Dir>((dir & ~ROUND_DIR_MASK) | d); -} - -inline Rounding_Dir operator|(Rounding_Dir x, Rounding_Dir y) { - return static_cast<Rounding_Dir>((unsigned)x | (unsigned)y); } } // namespace Parma_Polyhedra_Library

1 0

[GIT] ppl/ppl(master): Add the release date for PPL 0.11.2.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 6f0c06f03f3034842f06d7c99d4a56f9e08549ac URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6f0c06f03f30… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 14:23:24 2012 +0100 Add the release date for PPL 0.11.2. Mention a couple of bugs that have been corrected. --- NEWS | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index f5dd9ea..9809f66 100644 --- a/NEWS +++ b/NEWS @@ -44,8 +44,28 @@ o The input routine for PPL numeric datatypes has been extended to accept the ISO9899 (C99) hexadecimal floating constant syntax. +Bugfixes +======== + +o Corrected a precision bug in methods + + Box<ITV>::upper_bound_assign(const Box&) + Box<ITV>::upper_bound_assign_if_exact(const Box&) + + whereby, provided any argument is an empty box and under other rather + specific conditions, the computed result was correct but unnecessarily + imprecise. + +o Corrected a bug in method + + Grid::relation_with(const Constraint&) const + + whereby, under specific conditions, the method was creating invalid + Grid_Generator objects and providing an incorrect result. + + -------------------------------------------------------------------------- -NEWS for version 0.11.2 (released date to be decided) +NEWS for version 0.11.2 (released on February 27, 2011) -------------------------------------------------------------------------- Bugfixes

1 0