- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Make comparison against zero explicit.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: eb1e922ffe18c27b7b544781b745102730d8c2c4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=eb1e922ffe18… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 17:38:51 2012 +0100 Make comparison against zero explicit. Detected by ECLAIR service utypflag. While at it, simplified control flow by removing a use of `continue'. --- src/Congruence_System.cc | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Congruence_System.cc b/src/Congruence_System.cc index 0cdb287..1c53eb2 100644 --- a/src/Congruence_System.cc +++ b/src/Congruence_System.cc @@ -503,10 +503,9 @@ PPL::operator==(const Congruence_System& x, const Congruence_System& y) { if (x.num_columns() == y.num_columns()) { dimension_type num_rows = x.num_rows(); if (num_rows == y.num_rows()) { - while (num_rows--) { - if (x[num_rows] == y[num_rows]) - continue; - return false; + while (num_rows-- > 0) { + if (x[num_rows] != y[num_rows]) + return false; } return true; }

1 0

[GIT] ppl/ppl(master): Make comparison against zero explicit.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: e3c4d96c9830ac4233b84d178810b2dd3fcd7f9e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e3c4d96c9830… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 17:37:13 2012 +0100 Make comparison against zero explicit. Detected by ECLAIR service utypflag. --- src/Box_Status.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Box_Status.inlines.hh b/src/Box_Status.inlines.hh index acd8347..0153073 100644 --- a/src/Box_Status.inlines.hh +++ b/src/Box_Status.inlines.hh @@ -62,7 +62,7 @@ Box<ITV>::Status::test_all(flags_t mask) const { template <typename ITV> inline bool Box<ITV>::Status::test_any(flags_t mask) const { - return flags & mask; + return (flags & mask) != 0; } template <typename ITV>

1 0

[GIT] ppl/ppl(master): Make comparison against zero explicit.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: 61f5417dcdf35d4f56ba737a45eb7ebc494e2e41 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=61f5417dcdf3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 17:21:18 2012 +0100 Make comparison against zero explicit. Detected by ECLAIR service utypflag. --- src/Bit_Row.cc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index e0e6376..f9c73bd 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -141,7 +141,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; + return ((limb >> (k % GMP_NUMB_BITS)) & 1) != 0; } void @@ -169,7 +169,7 @@ PPL::compare(const Bit_Row& x, const Bit_Row& y) { const mp_limb_t diff = xl ^ yl; // First bit that is different. const mp_limb_t mask = diff & ~(diff-1); - return (xl & mask) ? 1 : -1; + return ((xl & mask) != 0) ? 1 : -1; } ++xp; ++yp; @@ -190,7 +190,7 @@ PPL::subset_or_equal(const Bit_Row& x, const Bit_Row& y) { mp_srcptr xp = x.vec->_mp_d; mp_srcptr yp = y.vec->_mp_d; while (x_size > 0) { - if (*xp & ~*yp) + if ((*xp & ~*yp) != 0) return false; ++xp; ++yp; @@ -218,7 +218,7 @@ PPL::subset_or_equal(const Bit_Row& x, const Bit_Row& y, while (x_size > 0) { xl = *xp; yl = *yp; - if (xl & ~yl) + if ((xl & ~yl) != 0) return false; strict_subset_next: ++xp; @@ -231,7 +231,7 @@ PPL::subset_or_equal(const Bit_Row& x, const Bit_Row& y, xl = *xp; yl = *yp; if (xl != yl) { - if (xl & ~yl) + if ((xl & ~yl) != 0) return false; strict_subset = true; goto strict_subset_next; @@ -259,7 +259,7 @@ PPL::strict_subset(const Bit_Row& x, const Bit_Row& y) { while (x_size > 0) { const mp_limb_t xl = *xp; const mp_limb_t yl = *yp; - if (xl & ~yl) + if ((xl & ~yl) != 0) return false; if (!different && xl != yl) different = true;

1 0

[GIT] ppl/ppl(master): Added helper function to compute the hash code from a space dimension.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: dbd30b078d19997cdfeef23663310025fd8113a0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=dbd30b078d19… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 16:34:30 2012 +0100 Added helper function to compute the hash code from a space dimension. Added missing has_code() method to class Box<ITV> and generate corresponding method in Java interface for boxes. --- ...nterface_generator_java_procedure_generators.m4 | 2 +- src/BD_Shape.inlines.hh | 2 +- src/Box.defs.hh | 8 ++++++++ src/Box.inlines.hh | 6 ++++++ src/Grid.inlines.hh | 2 +- src/Octagonal_Shape.inlines.hh | 2 +- src/Partially_Reduced_Product.inlines.hh | 2 +- src/Pointset_Ask_Tell.inlines.hh | 2 +- src/Pointset_Powerset.inlines.hh | 2 +- src/Polyhedron.inlines.hh | 2 +- src/globals.defs.hh | 4 ++++ src/globals.inlines.hh | 6 ++++++ 12 files changed, 32 insertions(+), 8 deletions(-) diff --git a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 index b86af30..b81340a 100644 --- a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 +++ b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 @@ -42,7 +42,7 @@ dnl The <name> must be exactly as written here. m4_define(`m4_procedure_list', `m4_echo_unquoted(`m4_common_procedure_list', ppl_free_@CLASS@/1 +all, -ppl_@CLASS@_hashcode/2 +all -box, +ppl_@CLASS@_hashcode/2 +all, ppl_@CLASS@_string/1 +all, ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@/1 +simple, ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@/2 +simple, diff --git a/src/BD_Shape.inlines.hh b/src/BD_Shape.inlines.hh index 2b95b2e..bb83e46 100644 --- a/src/BD_Shape.inlines.hh +++ b/src/BD_Shape.inlines.hh @@ -838,7 +838,7 @@ BD_Shape<T>::total_memory_in_bytes() const { template <typename T> inline int32_t BD_Shape<T>::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } template <typename T> diff --git a/src/Box.defs.hh b/src/Box.defs.hh index 8c1ccd5..695d7d4 100644 --- a/src/Box.defs.hh +++ b/src/Box.defs.hh @@ -1692,6 +1692,14 @@ public: //! Returns the size in bytes of the memory managed by \p *this. memory_size_type external_memory_in_bytes() const; + /*! \brief + Returns a 32-bit hash code for \p *this. + + If <CODE>x</CODE> and <CODE>y</CODE> are such that <CODE>x == y</CODE>, + then <CODE>x.hash_code() == y.hash_code()</CODE>. + */ + int32_t hash_code() const; + PPL_OUTPUT_DECLARATIONS #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS diff --git a/src/Box.inlines.hh b/src/Box.inlines.hh index b7b0f7e..b38e30f 100644 --- a/src/Box.inlines.hh +++ b/src/Box.inlines.hh @@ -133,6 +133,12 @@ Box<ITV>::max_space_dimension() { } template <typename ITV> +inline int32_t +Box<ITV>::hash_code() const { + return hash_code_from_dimension(space_dimension()); +} + +template <typename ITV> inline const ITV& Box<ITV>::operator[](const dimension_type k) const { PPL_ASSERT(k < seq.size()); diff --git a/src/Grid.inlines.hh b/src/Grid.inlines.hh index 222e42a..3500339 100644 --- a/src/Grid.inlines.hh +++ b/src/Grid.inlines.hh @@ -228,7 +228,7 @@ Grid::total_memory_in_bytes() const { inline int32_t Grid::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } inline Constraint_System diff --git a/src/Octagonal_Shape.inlines.hh b/src/Octagonal_Shape.inlines.hh index c42379e..12357e8 100644 --- a/src/Octagonal_Shape.inlines.hh +++ b/src/Octagonal_Shape.inlines.hh @@ -864,7 +864,7 @@ Octagonal_Shape<T>::total_memory_in_bytes() const { template <typename T> inline int32_t Octagonal_Shape<T>::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } template <typename T> diff --git a/src/Partially_Reduced_Product.inlines.hh b/src/Partially_Reduced_Product.inlines.hh index 8239bd2..a9e53cf 100644 --- a/src/Partially_Reduced_Product.inlines.hh +++ b/src/Partially_Reduced_Product.inlines.hh @@ -709,7 +709,7 @@ Partially_Reduced_Product<D1, D2, R>::ascii_dump(std::ostream& s) const { template <typename D1, typename D2, typename R> inline int32_t Partially_Reduced_Product<D1, D2, R>::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } /*! \relates Parma_Polyhedra_Library::Partially_Reduced_Product */ diff --git a/src/Pointset_Ask_Tell.inlines.hh b/src/Pointset_Ask_Tell.inlines.hh index 61b46fc..b4676b3 100644 --- a/src/Pointset_Ask_Tell.inlines.hh +++ b/src/Pointset_Ask_Tell.inlines.hh @@ -173,7 +173,7 @@ Pointset_Ask_Tell<PSET>::total_memory_in_bytes() const { template <typename PSET> inline int32_t Pointset_Ask_Tell<PSET>::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } template <> diff --git a/src/Pointset_Powerset.inlines.hh b/src/Pointset_Powerset.inlines.hh index 94d787b..4076cb2 100644 --- a/src/Pointset_Powerset.inlines.hh +++ b/src/Pointset_Powerset.inlines.hh @@ -275,7 +275,7 @@ Pointset_Powerset<PSET>::total_memory_in_bytes() const { template <typename PSET> inline int32_t Pointset_Powerset<PSET>::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } template <typename PSET> diff --git a/src/Polyhedron.inlines.hh b/src/Polyhedron.inlines.hh index eacb411..ff35596 100644 --- a/src/Polyhedron.inlines.hh +++ b/src/Polyhedron.inlines.hh @@ -43,7 +43,7 @@ Polyhedron::space_dimension() const { inline int32_t Polyhedron::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } inline dimension_type diff --git a/src/globals.defs.hh b/src/globals.defs.hh index 9b59ba1..e564878 100644 --- a/src/globals.defs.hh +++ b/src/globals.defs.hh @@ -42,6 +42,10 @@ namespace Parma_Polyhedra_Library { dimension_type not_a_dimension(); +//! Returns the hash code for space dimension \p dim. +int32_t +hash_code_from_dimension(dimension_type dim); + #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS /*! \brief Make sure swap() is specialized when needed. diff --git a/src/globals.inlines.hh b/src/globals.inlines.hh index 93d2ba7..9047d1c 100644 --- a/src/globals.inlines.hh +++ b/src/globals.inlines.hh @@ -34,6 +34,12 @@ not_a_dimension() { return std::numeric_limits<dimension_type>::max(); } +inline int32_t +hash_code_from_dimension(dimension_type dim) { + const dimension_type divisor = 1U << (32 - 1); + return static_cast<int32_t>(dim % divisor); +} + inline const Weightwatch_Traits::Threshold& Weightwatch_Traits::get() { return weight;

1 0

[GIT] ppl/ppl(master): Make comparison against zero explicit.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: 2f490ee5d25afea0c21e16463e27059223c734d0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2f490ee5d25a… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 15:43:49 2012 +0100 Make comparison against zero explicit. Detected by ECLAIR service utypflag. --- src/Float.inlines.hh | 12 ++++++------ src/Rounding_Dir.inlines.hh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Float.inlines.hh b/src/Float.inlines.hh index 88bb1a1..fb2b78d 100644 --- a/src/Float.inlines.hh +++ b/src/Float.inlines.hh @@ -60,7 +60,7 @@ float_ieee754_half::negate() { inline bool float_ieee754_half::sign_bit() const { - return !!(word & SGN_MASK); + return (word & SGN_MASK) != 0; } inline void @@ -121,7 +121,7 @@ float_ieee754_single::negate() { inline bool float_ieee754_single::sign_bit() const { - return !!(word & SGN_MASK); + return (word & SGN_MASK) != 0; } inline void @@ -187,7 +187,7 @@ float_ieee754_double::negate() { inline bool float_ieee754_double::sign_bit() const { - return !!(msp & MSP_SGN_MASK); + return (msp & MSP_SGN_MASK) != 0; } inline void @@ -268,7 +268,7 @@ float_ibm_single::negate() { inline bool float_ibm_single::sign_bit() const { - return !!(word & SGN_MASK); + return (word & SGN_MASK) != 0; } inline void @@ -336,7 +336,7 @@ float_intel_double_extended::negate() { inline bool float_intel_double_extended::sign_bit() const { - return !!(msp & MSP_SGN_MASK); + return (msp & MSP_SGN_MASK) != 0; } inline void @@ -416,7 +416,7 @@ float_ieee754_quad::negate() { inline bool float_ieee754_quad::sign_bit() const { - return !!(msp & MSP_SGN_MASK); + return (msp & MSP_SGN_MASK) != 0; } inline void diff --git a/src/Rounding_Dir.inlines.hh b/src/Rounding_Dir.inlines.hh index 8a4b281..af2de1c 100644 --- a/src/Rounding_Dir.inlines.hh +++ b/src/Rounding_Dir.inlines.hh @@ -70,7 +70,7 @@ round_inverse(Rounding_Dir dir) { inline bool round_strict_relation(Rounding_Dir dir) { - return dir & ROUND_STRICT_RELATION; + return (dir & ROUND_STRICT_RELATION) != 0; } #if PPL_CAN_CONTROL_FPU

1 0

[GIT] ppl/ppl(master): Prefer testing against zero.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: 0691decf11e6f384b602d762c3060af30bf43a50 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0691decf11e6… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 15:21:01 2012 +0100 Prefer testing against zero. --- src/checked_float.inlines.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index ffb5bd0..6c2b97a 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -190,14 +190,14 @@ template <typename Policy, typename T> inline bool is_minf_float(const T v) { Float<T> f(v); - return CHECK_P(Policy::has_infinity, (f.u.binary.inf_sign() == -1)); + return CHECK_P(Policy::has_infinity, (f.u.binary.inf_sign() < 0)); } template <typename Policy, typename T> inline bool is_pinf_float(const T v) { Float<T> f(v); - return CHECK_P(Policy::has_infinity, (f.u.binary.inf_sign() == 1)); + return CHECK_P(Policy::has_infinity, (f.u.binary.inf_sign() > 0)); } @@ -233,7 +233,7 @@ pred_float(T& v) { Float<T> f(v); PPL_ASSERT(!f.u.binary.is_nan()); PPL_ASSERT(f.u.binary.inf_sign() >= 0); - if (f.u.binary.zero_sign() == 1) { + if (f.u.binary.zero_sign() > 0) { f.u.binary.negate(); f.u.binary.inc(); } @@ -252,7 +252,7 @@ succ_float(T& v) { Float<T> f(v); PPL_ASSERT(!f.u.binary.is_nan()); PPL_ASSERT(f.u.binary.inf_sign() <= 0); - if (f.u.binary.zero_sign() == -1) { + if (f.u.binary.zero_sign() < 0) { f.u.binary.negate(); f.u.binary.inc(); }

1 0

[GIT] ppl/ppl(master): For clarity, renamed three-state Float method is_inf () as inf_sign().
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: 2bcc4ac88501983c95dc035d8fc7ff5dbbf76975 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2bcc4ac88501… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 14:39:43 2012 +0100 For clarity, renamed three-state Float method is_inf() as inf_sign(). Similarly, renamed is_zero() as zero_sign(). --- src/Float.defs.hh | 24 ++++++++++++------------ src/Float.inlines.hh | 24 ++++++++++++------------ src/checked_float.inlines.hh | 28 ++++++++++++++++------------ 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/src/Float.defs.hh b/src/Float.defs.hh index 81e3799..597b2dc 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -65,9 +65,9 @@ struct float_ieee754_half { static const int EXPONENT_MIN_DENORM = EXPONENT_MIN - static_cast<int>(MANTISSA_BITS); static const Floating_Point_Format floating_point_format = IEEE754_HALF; - int is_inf() const; + int inf_sign() const; bool is_nan() const; - int is_zero() const; + int zero_sign() const; bool sign_bit() const; void negate(); void dec(); @@ -98,9 +98,9 @@ struct float_ieee754_single { static const int EXPONENT_MIN_DENORM = EXPONENT_MIN - static_cast<int>(MANTISSA_BITS); static const Floating_Point_Format floating_point_format = IEEE754_SINGLE; - int is_inf() const; + int inf_sign() const; bool is_nan() const; - int is_zero() const; + int zero_sign() const; bool sign_bit() const; void negate(); void dec(); @@ -144,9 +144,9 @@ struct float_ieee754_double { static const int EXPONENT_MIN_DENORM = EXPONENT_MIN - static_cast<int>(MANTISSA_BITS); static const Floating_Point_Format floating_point_format = IEEE754_DOUBLE; - int is_inf() const; + int inf_sign() const; bool is_nan() const; - int is_zero() const; + int zero_sign() const; bool sign_bit() const; void negate(); void dec(); @@ -176,9 +176,9 @@ struct float_ibm_single { static const int EXPONENT_MIN_DENORM = EXPONENT_MIN - static_cast<int>(MANTISSA_BITS); static const Floating_Point_Format floating_point_format = IBM_SINGLE; - int is_inf() const; + int inf_sign() const; bool is_nan() const; - int is_zero() const; + int zero_sign() const; bool sign_bit() const; void negate(); void dec(); @@ -229,9 +229,9 @@ struct float_intel_double_extended { - static_cast<int>(MANTISSA_BITS); static const Floating_Point_Format floating_point_format = INTEL_DOUBLE_EXTENDED; - int is_inf() const; + int inf_sign() const; bool is_nan() const; - int is_zero() const; + int zero_sign() const; bool sign_bit() const; void negate(); void dec(); @@ -268,9 +268,9 @@ struct float_ieee754_quad { static const int EXPONENT_MIN = -EXPONENT_MAX + 1; static const int EXPONENT_MIN_DENORM = EXPONENT_MIN - static_cast<int>(MANTISSA_BITS); - int is_inf() const; + int inf_sign() const; bool is_nan() const; - int is_zero() const; + int zero_sign() const; bool sign_bit() const; void negate(); void dec(); diff --git a/src/Float.inlines.hh b/src/Float.inlines.hh index c9b0108..88bb1a1 100644 --- a/src/Float.inlines.hh +++ b/src/Float.inlines.hh @@ -31,7 +31,7 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { inline int -float_ieee754_half::is_inf() const { +float_ieee754_half::inf_sign() const { if (word == NEG_INF) return -1; if (word == POS_INF) @@ -45,7 +45,7 @@ float_ieee754_half::is_nan() const { } inline int -float_ieee754_half::is_zero() const { +float_ieee754_half::zero_sign() const { if (word == NEG_ZERO) return -1; if (word == POS_ZERO) @@ -92,7 +92,7 @@ float_ieee754_half::build(bool negative, mpz_t mantissa, int exponent) { } inline int -float_ieee754_single::is_inf() const { +float_ieee754_single::inf_sign() const { if (word == NEG_INF) return -1; if (word == POS_INF) @@ -106,7 +106,7 @@ float_ieee754_single::is_nan() const { } inline int -float_ieee754_single::is_zero() const { +float_ieee754_single::zero_sign() const { if (word == NEG_ZERO) return -1; if (word == POS_ZERO) @@ -153,7 +153,7 @@ float_ieee754_single::build(bool negative, mpz_t mantissa, int exponent) { } inline int -float_ieee754_double::is_inf() const { +float_ieee754_double::inf_sign() const { if (lsp != LSP_INF) return 0; if (msp == MSP_NEG_INF) @@ -170,7 +170,7 @@ float_ieee754_double::is_nan() const { } inline int -float_ieee754_double::is_zero() const { +float_ieee754_double::zero_sign() const { if (lsp != LSP_ZERO) return 0; if (msp == MSP_NEG_ZERO) @@ -239,7 +239,7 @@ float_ieee754_double::build(bool negative, mpz_t mantissa, int exponent) { } inline int -float_ibm_single::is_inf() const { +float_ibm_single::inf_sign() const { if (word == NEG_INF) return -1; if (word == POS_INF) @@ -253,7 +253,7 @@ float_ibm_single::is_nan() const { } inline int -float_ibm_single::is_zero() const { +float_ibm_single::zero_sign() const { if (word == NEG_ZERO) return -1; if (word == POS_ZERO) @@ -300,7 +300,7 @@ float_ibm_single::build(bool negative, mpz_t mantissa, int exponent) { } inline int -float_intel_double_extended::is_inf() const { +float_intel_double_extended::inf_sign() const { if (lsp != LSP_INF) return 0; uint32_t a = msp & MSP_NEG_INF; @@ -318,7 +318,7 @@ float_intel_double_extended::is_nan() const { } inline int -float_intel_double_extended::is_zero() const { +float_intel_double_extended::zero_sign() const { if (lsp != LSP_ZERO) return 0; uint32_t a = msp & MSP_NEG_INF; @@ -382,7 +382,7 @@ float_intel_double_extended::build(bool negative, } inline int -float_ieee754_quad::is_inf() const { +float_ieee754_quad::inf_sign() const { if (lsp != LSP_INF) return 0; if (msp == MSP_NEG_INF) @@ -399,7 +399,7 @@ float_ieee754_quad::is_nan() const { } inline int -float_ieee754_quad::is_zero() const { +float_ieee754_quad::zero_sign() const { if (lsp != LSP_ZERO) return 0; if (msp == MSP_NEG_ZERO) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 16fff99..ffb5bd0 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -153,11 +153,15 @@ classify_float(const T v, bool nan, bool inf, bool sign) { if ((nan || sign) && CHECK_P(Policy::has_nan, f.u.binary.is_nan())) return V_NAN; if (inf) { - int i = CHECK_P(Policy::has_infinity, f.u.binary.is_inf()); - if (i < 0) - return V_EQ_MINUS_INFINITY; - if (i > 0) - return V_EQ_PLUS_INFINITY; + if (Policy::has_infinity) { + int sign = f.u.binary.inf_sign(); + if (sign < 0) + return V_EQ_MINUS_INFINITY; + if (sign > 0) + return V_EQ_PLUS_INFINITY; + } + else + PPL_ASSERT(f.u.binary.inf_sign() == 0); } if (sign) { if (v < 0) @@ -180,20 +184,20 @@ template <typename Policy, typename T> inline bool is_inf_float(const T v) { Float<T> f(v); - return CHECK_P(Policy::has_infinity, (f.u.binary.is_inf() != 0)); + return CHECK_P(Policy::has_infinity, (f.u.binary.inf_sign() != 0)); } template <typename Policy, typename T> inline bool is_minf_float(const T v) { Float<T> f(v); - return CHECK_P(Policy::has_infinity, (f.u.binary.is_inf() < 0)); + return CHECK_P(Policy::has_infinity, (f.u.binary.inf_sign() == -1)); } template <typename Policy, typename T> inline bool is_pinf_float(const T v) { Float<T> f(v); - return CHECK_P(Policy::has_infinity, (f.u.binary.is_inf() > 0)); + return CHECK_P(Policy::has_infinity, (f.u.binary.inf_sign() == 1)); } @@ -228,8 +232,8 @@ inline void pred_float(T& v) { Float<T> f(v); PPL_ASSERT(!f.u.binary.is_nan()); - PPL_ASSERT(f.u.binary.is_inf() >= 0); - if (f.u.binary.is_zero() > 0) { + PPL_ASSERT(f.u.binary.inf_sign() >= 0); + if (f.u.binary.zero_sign() == 1) { f.u.binary.negate(); f.u.binary.inc(); } @@ -247,8 +251,8 @@ inline void succ_float(T& v) { Float<T> f(v); PPL_ASSERT(!f.u.binary.is_nan()); - PPL_ASSERT(f.u.binary.is_inf() <= 0); - if (f.u.binary.is_zero() < 0) { + PPL_ASSERT(f.u.binary.inf_sign() <= 0); + if (f.u.binary.zero_sign() == -1) { f.u.binary.negate(); f.u.binary.inc(); }

1 0

[GIT] ppl/ppl(master): Avoid long lines and try to improve readability.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: 90cb4b9b18069d2fb809704fcc0edce6bef20834 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=90cb4b9b1806… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 13:09:49 2012 +0100 Avoid long lines and try to improve readability. In particular, when using helper function i_constraint(), prefer passing in an already built Relation_Symbol object if its computation is nontrivial. --- src/Box.inlines.hh | 16 ++--- src/Box.templates.hh | 147 ++++++++++++++++++++++++++++-------------------- src/Interval.defs.hh | 6 +- src/intervals.defs.hh | 3 +- 4 files changed, 98 insertions(+), 74 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=90cb4b9b…

1 0

[GIT] ppl/ppl(master): Completed previous commit, fixing is_{m, p}inf_float.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: 912481ec1055d52b37ee8a64e97ad3be70cd1a7b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=912481ec1055… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 12:34:32 2012 +0100 Completed previous commit, fixing is_{m,p}inf_float. --- src/checked_float.inlines.hh | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 7c06757..16fff99 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -180,18 +180,20 @@ template <typename Policy, typename T> inline bool is_inf_float(const T v) { Float<T> f(v); - return CHECK_P(Policy::has_infinity, f.u.binary.is_inf()); + return CHECK_P(Policy::has_infinity, (f.u.binary.is_inf() != 0)); } template <typename Policy, typename T> inline bool is_minf_float(const T v) { - return is_inf_float<Policy>(v) < 0; + Float<T> f(v); + return CHECK_P(Policy::has_infinity, (f.u.binary.is_inf() < 0)); } template <typename Policy, typename T> inline bool is_pinf_float(const T v) { - return is_inf_float<Policy>(v) > 0; + Float<T> f(v); + return CHECK_P(Policy::has_infinity, (f.u.binary.is_inf() > 0)); }

1 0

[GIT] ppl/ppl(master): Let is_inf_float() return a Boolean value, rather than an integer.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: 2e81747bef37b0c49447ca598e75312691526bf8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2e81747bef37… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 08:26:47 2012 +0100 Let is_inf_float() return a Boolean value, rather than an integer. Detected by ECLAIR service utypflag. --- src/checked_float.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 77c3f13..7c06757 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -177,7 +177,7 @@ is_nan_float(const T v) { } template <typename Policy, typename T> -inline int +inline bool is_inf_float(const T v) { Float<T> f(v); return CHECK_P(Policy::has_infinity, f.u.binary.is_inf());

1 0