- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Avoid implicit conversion changing type signedness.
by Enea Zaffanella 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 9fd12191d4f7912e12b5f3965be1b69a52787d04 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9fd12191d4f7… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 16:55:58 2012 +0100 Avoid implicit conversion changing type signedness. Detected by ECLAIR service utypflag. --- src/Octagonal_Shape.templates.hh | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index a18e48f..84dc855 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -3403,10 +3403,12 @@ Octagonal_Shape<T>::remove_space_dimensions(const Variables_Set& vars) { // We consider each variable and we check if it has to be removed. // If it has to be removed, we pass to the next one, then we will // overwrite its representation in the matrix. + typedef typename OR_Matrix<N>::element_iterator Elem_Iter; + typedef typename std::iterator_traits<Elem_Iter>::difference_type diff_t; + dimension_type first = *vars.begin(); - dimension_type first_size = 2*first*(first + 1); - typename OR_Matrix<N>::element_iterator - iter = matrix.element_begin() + first_size; + const dimension_type first_size = 2 * first * (first + 1); + Elem_Iter iter = matrix.element_begin() + static_cast<diff_t>(first_size); for (dimension_type i = first + 1; i < space_dim; ++i) { if (vars.count(i) == 0) {

1 0

[GIT] ppl/ppl(master): Fixed C interface incongruence.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 1ff76cad0788fa1893f40f32257dcd3c732f2319 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1ff76cad0788… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 16:52:41 2012 +0100 Fixed C interface incongruence. Detected by ECLAIR service utypflag. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4 index 3bf5ce3..43d971e 100644 --- a/interfaces/C/ppl_interface_generator_c_cc_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4 @@ -758,7 +758,7 @@ m4_define(`ppl_@CLASS@_BGP99_@DISJUNCT_WIDEN@_extrapolation_assign_code', ppl_@CLASS@_BGP99_@DISJUNCT_WIDEN@_extrapolation_assign (ppl_@CLASS@_t x, ppl_const_@CLASS@_t y, - int disjuncts) try { + unsigned disjuncts) try { @CPP_CLASS@& xx = *to_nonconst(x); const @CPP_CLASS@& yy = *to_const(y); xx.BGP99_extrapolation_assign(yy,

1 0

[GIT] ppl/ppl(master): Avoid implicit conversion changing signedness.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 7cfc3f1609b01c51c1a402012bb313a95f847e61 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7cfc3f1609b0… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 16:52:21 2012 +0100 Avoid implicit conversion changing signedness. Detected by ECLAIR service utypflag. --- interfaces/C/ppl_c_implementation_common.cc | 12 ++++++------ interfaces/C/ppl_interface_generator_c_cc_code.m4 | 2 +- src/checked_float.inlines.hh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index ee8a2eb..f5a6eac 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -306,25 +306,25 @@ CATCH_ALL int ppl_version_major(void) try { - return version_major(); + return static_cast<int>(version_major()); } CATCH_ALL int ppl_version_minor(void) try { - return version_minor(); + return static_cast<int>(version_minor()); } CATCH_ALL int ppl_version_revision(void) try { - return version_revision(); + return static_cast<int>(version_revision()); } CATCH_ALL int ppl_version_beta(void) try { - return version_beta(); + return static_cast<int>(version_beta()); } CATCH_ALL @@ -1903,7 +1903,7 @@ int ppl_MIP_Problem_number_of_constraints(ppl_const_MIP_Problem_t mip, ppl_dimension_type* m) try { const MIP_Problem& mmip = *to_const(mip); - *m = mmip.constraints_end() - mmip.constraints_begin(); + *m = static_cast<ppl_dimension_type>(mmip.constraints_end() - mmip.constraints_begin()); return 0; } CATCH_ALL @@ -2188,7 +2188,7 @@ int ppl_PIP_Problem_number_of_constraints(ppl_const_PIP_Problem_t pip, ppl_dimension_type* m) try { const PIP_Problem& ppip = *to_const(pip); - *m = ppip.constraints_end() - ppip.constraints_begin(); + *m = static_cast<ppl_dimension_type>(ppip.constraints_end() - ppip.constraints_begin()); return 0; } CATCH_ALL diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4 index ec24f9c..3bf5ce3 100644 --- a/interfaces/C/ppl_interface_generator_c_cc_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4 @@ -184,7 +184,7 @@ ppl_@CLASS@_relation_with_@!RELATION_REPRESENT@ ppl_const_@!RELATION_REPRESENT@_t c) try { const @CPP_CLASS@& pph = *to_const(ph); const @!RELATION_REPRESENT@& cc = *to_const(c); - return pph.relation_with(cc).get_flags(); + return static_cast<int>(pph.relation_with(cc).get_flags()); } CATCH_ALL diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index ae6373f..79166c0 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -840,7 +840,7 @@ assign_float_mpz(T& to, const mpz_class& from, Rounding_Dir dir) { else mpz_mul_2exp(mantissa, from_z, Float<T>::Binary::MANTISSA_BITS - exponent); Float<T> f; - f.u.binary.build(sign < 0, mantissa, exponent); + f.u.binary.build(sign < 0, mantissa, static_cast<long>(exponent)); mpz_clear(mantissa); to = f.value(); if (meaningful_bits > Float<T>::Binary::MANTISSA_BITS) {

1 0

[GIT] ppl/ppl(master): Added any_iterator operator+= and operator+ overloadings for unsigned types.
by Enea Zaffanella 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 4abb9c3094dc31615447801e02e71ac6c4af1ff4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4abb9c3094dc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 16:09:55 2012 +0100 Added any_iterator operator+= and operator+ overloadings for unsigned types. --- src/OR_Matrix.defs.hh | 10 ++++++++++ src/OR_Matrix.inlines.hh | 31 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/src/OR_Matrix.defs.hh b/src/OR_Matrix.defs.hh index 0c7f137..f70dca1 100644 --- a/src/OR_Matrix.defs.hh +++ b/src/OR_Matrix.defs.hh @@ -253,6 +253,11 @@ private: //! Assignment-increment operator. any_row_iterator& operator+=(difference_type m); + //! Assignment-increment operator for \p m of unsigned type. + template <typename Unsigned> + typename Enable_If<(static_cast<Unsigned>(-1) > 0), any_row_iterator&>::type + operator+=(Unsigned m); + //! Assignment-decrement operator. any_row_iterator& operator-=(difference_type m); @@ -262,6 +267,11 @@ private: //! Returns the sum of \p *this and \p m. any_row_iterator operator+(difference_type m) const; + //! Returns the sum of \p *this and \p m, for \p m of unsigned type. + template <typename Unsigned> + typename Enable_If<(static_cast<Unsigned>(-1) > 0), any_row_iterator>::type + operator+(Unsigned m) const; + //! Returns the difference of \p *this and \p m. any_row_iterator operator-(difference_type m) const; diff --git a/src/OR_Matrix.inlines.hh b/src/OR_Matrix.inlines.hh index 448bc0b..7a20e71 100644 --- a/src/OR_Matrix.inlines.hh +++ b/src/OR_Matrix.inlines.hh @@ -257,6 +257,25 @@ OR_Matrix<T>::any_row_iterator::operator+=(const difference_type m) { template <typename T> template <typename U> +template <typename Unsigned> +inline typename +Enable_If<(static_cast<Unsigned>(-1) > 0), + typename OR_Matrix<T>::template any_row_iterator& >::type +OR_Matrix<T>::any_row_iterator::operator+=(Unsigned m) { + dimension_type increment = m + m * m / 2 + m * e; + if (e % 2 == 0 && m % 2 != 0) + ++increment; + e += m; + i += increment; + value.first += increment; +#if PPL_OR_MATRIX_EXTRA_DEBUG + value.size_ = value.size_ + m - m % 2; +#endif + return *this; +} + +template <typename T> +template <typename U> inline typename OR_Matrix<T>::template any_row_iterator& OR_Matrix<T>::any_row_iterator::operator-=(difference_type m) { return *this += -m; @@ -280,6 +299,18 @@ OR_Matrix<T>::any_row_iterator::operator+(difference_type m) const { template <typename T> template <typename U> +template <typename Unsigned> +inline typename +Enable_If<(static_cast<Unsigned>(-1) > 0), + typename OR_Matrix<T>::template any_row_iterator >::type +OR_Matrix<T>::any_row_iterator::operator+(Unsigned m) const { + any_row_iterator r = *this; + r += m; + return r; +} + +template <typename T> +template <typename U> inline typename OR_Matrix<T>::template any_row_iterator OR_Matrix<T>::any_row_iterator::operator-(const difference_type m) const { any_row_iterator r = *this;

1 0

[GIT] ppl/ppl(master): Avoid to offset iterators twice.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 96b0c536a8dcd3cf29759452003bca3172d7509c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=96b0c536a8dc… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 15:39:01 2012 +0100 Avoid to offset iterators twice. --- src/Octagonal_Shape.templates.hh | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index b029054..a18e48f 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -4429,8 +4429,8 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP(N, minus_coeff_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -4616,7 +4616,7 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w_id' can be disregarded, as they all have // a zero coefficient in `expr'. - for (Row_Iterator m_iter = m_begin, m_end = m_iter + (2*w_id) + 2; + for (Row_Iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; @@ -4700,7 +4700,7 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP(N, coeff_i); PPL_DIRTY_TEMP(N, approx_i); PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); - for (Row_Iterator m_iter = m_begin, m_end = m_iter + (2*w_id) + 2; + for (Row_Iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; @@ -4998,7 +4998,7 @@ Octagonal_Shape<T>::affine_image(const Variable var, // a zero coefficient in `sc_expr'. const Row_Iterator m_begin = matrix.row_begin(); for (Row_iterator m_iter = m_begin, - m_iter_end = m_iter + (2*w_id) + 2; m_iter != m_iter_end; ) { + m_end = m_begin + (2 * w_id + 2); m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -5931,8 +5931,8 @@ Octagonal_Shape<T> PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -6025,8 +6025,8 @@ Octagonal_Shape<T> PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); PPL_DIRTY_TEMP(N, approx_i); // Approximate the homogeneous part of `-sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -6491,8 +6491,8 @@ Octagonal_Shape<T>::bounded_affine_image(const Variable var, PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter;

1 0

[GIT] ppl/ppl(master): Avoid implicit conversion changing signedness.
by Enea Zaffanella 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: aa5200686cc9d529a5e9b23869e8c8d882174f94 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aa5200686cc9… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 15:21:04 2012 +0100 Avoid implicit conversion changing signedness. Detected by ECLAIR service utypflag. --- src/checked_float.inlines.hh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 192926e..ae6373f 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -881,7 +881,8 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { } unsigned int needed_bits = Float<T>::Binary::MANTISSA_BITS + 1; if (exponent < Float<T>::Binary::EXPONENT_MIN) - needed_bits -= Float<T>::Binary::EXPONENT_MIN - exponent; + needed_bits -= static_cast<unsigned int>(Float<T>::Binary::EXPONENT_MIN + - exponent); mpz_t mantissa; mpz_init(mantissa); long shift = static_cast<long>(needed_bits) - exponent;

1 0

[GIT] ppl/ppl(master): Removed a couple of useless explicit casts.
by Enea Zaffanella 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 76489dec6c233a03f13706fb58b3b370c20fe412 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=76489dec6c23… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 15:13:34 2012 +0100 Removed a couple of useless explicit casts. --- src/checked_float.inlines.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 03e1bc7..192926e 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -872,7 +872,7 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { else return round_gt_float<To_Policy>(to, dir); } - if (exponent > int(Float<T>::Binary::EXPONENT_MAX + 1)) { + if (exponent > Float<T>::Binary::EXPONENT_MAX + 1) { overflow: if (sign < 0) return set_neg_overflow_float<To_Policy>(to, dir); @@ -905,7 +905,7 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { } else --exponent; - if (exponent > int(Float<T>::Binary::EXPONENT_MAX)) { + if (exponent > Float<T>::Binary::EXPONENT_MAX) { mpz_clear(mantissa); goto overflow; }

1 0

[GIT] ppl/ppl(master): When working with sizes, prefer vector::resize() to vector::erase().
by Enea Zaffanella 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 8aa0c5de6606f30b40a31e74b7a8c10180af8ffe URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8aa0c5de6606… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 14:53:40 2012 +0100 When working with sizes, prefer vector::resize() to vector::erase(). Added helper function nth_iter(). --- src/Bit_Matrix.cc | 2 +- src/Bit_Matrix.inlines.hh | 2 +- src/Box.templates.hh | 2 +- src/DB_Matrix.templates.hh | 2 +- src/Dense_Matrix.cc | 2 +- src/Dense_Matrix.inlines.hh | 2 +- src/Grid_chdims.cc | 4 ++-- src/Linear_System.cc | 4 ++-- src/MIP_Problem.inlines.hh | 4 ++-- src/PIP_Problem.cc | 2 +- src/PIP_Tree.cc | 6 +++--- src/globals.defs.hh | 8 ++++++++ src/globals.inlines.hh | 14 ++++++++++++++ 13 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/Bit_Matrix.cc b/src/Bit_Matrix.cc index 96243f7..2d0f107 100644 --- a/src/Bit_Matrix.cc +++ b/src/Bit_Matrix.cc @@ -137,7 +137,7 @@ PPL::Bit_Matrix::resize(dimension_type new_n_rows, } else if (new_n_rows < old_num_rows) // Drop some rows. - rows.erase(rows.begin() + new_n_rows, rows.end()); + rows.resize(new_n_rows); PPL_ASSERT(OK()); } diff --git a/src/Bit_Matrix.inlines.hh b/src/Bit_Matrix.inlines.hh index dfd2b03..39f614f 100644 --- a/src/Bit_Matrix.inlines.hh +++ b/src/Bit_Matrix.inlines.hh @@ -63,7 +63,7 @@ Bit_Matrix::remove_trailing_rows(const dimension_type n) { // than the actual number of the rows of the matrix. PPL_ASSERT(n <= rows.size()); if (n != 0) - rows.erase(rows.end() - n, rows.end()); + rows.resize(rows.size() - n); PPL_ASSERT(OK()); } diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 66357af..d67c7d8 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -2062,7 +2062,7 @@ Box<ITV>::remove_higher_space_dimensions(const dimension_type new_dim) { return; } - seq.erase(seq.begin() + new_dim, seq.end()); + seq.resize(new_dim); PPL_ASSERT(OK()); } diff --git a/src/DB_Matrix.templates.hh b/src/DB_Matrix.templates.hh index 374c9ad..e03974d 100644 --- a/src/DB_Matrix.templates.hh +++ b/src/DB_Matrix.templates.hh @@ -178,7 +178,7 @@ DB_Matrix<T>::resize_no_copy(const dimension_type new_n_rows) { } else if (new_n_rows < old_n_rows) { // Drop some rows. - rows.erase(rows.begin() + new_n_rows, rows.end()); + rows.resize(new_n_rows); // Shrink the existing rows. for (dimension_type i = new_n_rows; i-- > 0; ) rows[i].shrink(new_n_rows); diff --git a/src/Dense_Matrix.cc b/src/Dense_Matrix.cc index f7d132a..b702765 100644 --- a/src/Dense_Matrix.cc +++ b/src/Dense_Matrix.cc @@ -294,7 +294,7 @@ PPL::Dense_Matrix::resize_no_copy(const dimension_type new_n_rows, } else if (new_n_rows < old_n_rows) { // Drop some rows. - rows.erase(rows.begin() + new_n_rows, rows.end()); + rows.resize(new_n_rows); old_n_rows = new_n_rows; } // Here we have the right number of rows. diff --git a/src/Dense_Matrix.inlines.hh b/src/Dense_Matrix.inlines.hh index c43ae82..0bac033 100644 --- a/src/Dense_Matrix.inlines.hh +++ b/src/Dense_Matrix.inlines.hh @@ -190,7 +190,7 @@ inline void Dense_Matrix::remove_trailing_rows(const dimension_type n) { PPL_ASSERT(n <= rows.size()); if (n != 0) - rows.erase(rows.end() - n, rows.end()); + rows.resize(rows.size() - n); PPL_ASSERT(OK()); } diff --git a/src/Grid_chdims.cc b/src/Grid_chdims.cc index 2b7af92..e6731c7 100644 --- a/src/Grid_chdims.cc +++ b/src/Grid_chdims.cc @@ -351,7 +351,7 @@ PPL::Grid::remove_higher_space_dimensions(const dimension_type new_dimension) { gen_sys.remove_trailing_rows(num_redundant); gen_sys.unset_pending_rows(); } - dim_kinds.erase(dim_kinds.begin() + new_dimension + 1, dim_kinds.end()); + dim_kinds.resize(new_dimension + 1); // TODO: Consider if it is worth also preserving the congruences // if they are also in minimal form. } @@ -383,7 +383,7 @@ PPL::Grid::remove_higher_space_dimensions(const dimension_type new_dimension) { // form. con_sys.remove_trailing_rows(num_redundant); } - dim_kinds.erase(dim_kinds.begin() + new_dimension + 1, dim_kinds.end()); + dim_kinds.resize(new_dimension + 1); clear_generators_up_to_date(); // Replace gen_sys with an empty system of the right dimension. // Extra 2 columns for inhomogeneous term and modulus. diff --git a/src/Linear_System.cc b/src/Linear_System.cc index 506b507..f8a3e8c 100644 --- a/src/Linear_System.cc +++ b/src/Linear_System.cc @@ -337,8 +337,8 @@ PPL::Linear_System::sort_rows(const dimension_type first_row, PPL_ASSERT(first_row >= first_pending_row() || last_row <= first_pending_row()); // First sort without removing duplicates. - std::vector<Dense_Row>::iterator first = rows.begin() + first_row; - std::vector<Dense_Row>::iterator last = rows.begin() + last_row; + std::vector<Dense_Row>::iterator first = nth_iter(rows, first_row); + std::vector<Dense_Row>::iterator last = nth_iter(rows, last_row); Implementation::swapping_sort(first, last, Row_Less_Than()); // Second, move duplicates to the end. std::vector<Dense_Row>::iterator new_last diff --git a/src/MIP_Problem.inlines.hh b/src/MIP_Problem.inlines.hh index 1d6954f..df09249 100644 --- a/src/MIP_Problem.inlines.hh +++ b/src/MIP_Problem.inlines.hh @@ -111,7 +111,7 @@ MIP_Problem::~MIP_Problem() { // NOTE: do NOT delete inherited constraints; they are owned // (and will eventually be deleted) by ancestors. for (Constraint_Sequence::const_iterator - i = input_cs.begin() + inherited_constraints, + i = nth_iter(input_cs, inherited_constraints), i_end = input_cs.end(); i != i_end; ++i) delete *i; } @@ -217,7 +217,7 @@ MIP_Problem::external_memory_in_bytes() const { // NOTE: disregard inherited constraints, as they are owned by ancestors. n += input_cs.capacity() * sizeof(Constraint*); for (Constraint_Sequence::const_iterator - i = input_cs.begin() + inherited_constraints, + i = nth_iter(input_cs, inherited_constraints), i_end = input_cs.end(); i != i_end; ++i) n += ((*i)->total_memory_in_bytes()); diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index 682120b..9c82202 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -132,7 +132,7 @@ PPL::PIP_Problem::solve() const { // Go through all pending constraints. for (Constraint_Sequence::const_iterator - cs_i = input_cs.begin() + first_pending_constraint, + cs_i = nth_iter(input_cs, first_pending_constraint), cs_end = input_cs.end(); cs_i != cs_end; ++cs_i) { const Constraint& c = *cs_i; const dimension_type c_space_dim = c.space_dimension(); diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index b7dbbb2..76b5a0d 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -2223,8 +2223,8 @@ PIP_Solution_Node::update_tableau( Need to insert the original variable id before the slack variable id's to respect variable ordering. */ - basis.insert(basis.begin() + new_var_column, true); - mapping.insert(mapping.begin() + new_var_column, new_var_column); + basis.insert(nth_iter(basis, new_var_column), true); + mapping.insert(nth_iter(mapping, new_var_column), new_var_column); // Update variable id's of slack variables. for (dimension_type j = var_row.size(); j-- > 0; ) if (var_row[j] >= new_var_column) @@ -2252,7 +2252,7 @@ PIP_Solution_Node::update_tableau( Coefficient_traits::const_reference denom = tableau.denominator(); for (Constraint_Sequence::const_iterator - c_iter = input_cs.begin() + first_pending_constraint, + c_iter = nth_iter(input_cs, first_pending_constraint), c_end = input_cs.end(); c_iter != c_end; ++c_iter) { const Constraint& constraint = *c_iter; // (Tentatively) Add new rows to s and t matrices. diff --git a/src/globals.defs.hh b/src/globals.defs.hh index 6c592ed..314194d 100644 --- a/src/globals.defs.hh +++ b/src/globals.defs.hh @@ -489,6 +489,14 @@ check_space_dimension_overflow(dimension_type dim, const char* method, const char* reason); +template <typename RA_Container> +typename RA_Container::iterator +nth_iter(RA_Container& cont, dimension_type n); + +template <typename RA_Container> +typename RA_Container::const_iterator +nth_iter(const RA_Container& cont, dimension_type n); + } // namespace Parma_Polyhedra_Library // By default, use sparse matrices both for MIP_Problem and PIP_Problem. diff --git a/src/globals.inlines.hh b/src/globals.inlines.hh index ce6c30d..09936ec 100644 --- a/src/globals.inlines.hh +++ b/src/globals.inlines.hh @@ -128,6 +128,20 @@ is_space(char c) { return isspace(c) != 0; } +template <typename RA_Container> +inline typename RA_Container::iterator +nth_iter(RA_Container& cont, dimension_type n) { + typedef typename RA_Container::difference_type diff_t; + return cont.begin() + static_cast<diff_t>(n); +} + +template <typename RA_Container> +inline typename RA_Container::const_iterator +nth_iter(const RA_Container& cont, dimension_type n) { + typedef typename RA_Container::difference_type diff_t; + return cont.begin() + static_cast<diff_t>(n); +} + } // namespace Parma_Polyhedra_Library #endif // !defined(PPL_globals_inlines_hh)

1 0

[GIT] ppl/ppl(master): Fixed implementation defined implicit cast.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 5e2ed9a48ac7e6bf2f68b5395791f4e7f4379e19 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5e2ed9a48ac7… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 14:30:27 2012 +0100 Fixed implementation defined implicit cast. Detected by ECLAIR service utypflag. --- src/OR_Matrix.inlines.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OR_Matrix.inlines.hh b/src/OR_Matrix.inlines.hh index 2bc43b5..448bc0b 100644 --- a/src/OR_Matrix.inlines.hh +++ b/src/OR_Matrix.inlines.hh @@ -243,14 +243,14 @@ template <typename T> template <typename U> inline typename OR_Matrix<T>::template any_row_iterator& OR_Matrix<T>::any_row_iterator::operator+=(const difference_type m) { - difference_type increment = m + m*m/2 + m*e; + difference_type increment = m + m * m / 2 + m * static_cast<difference_type>(e); if (e % 2 == 0 && m % 2 != 0) ++increment; - e += m; - i += increment; + e = static_cast<dimension_type>(static_cast<difference_type>(e) + m); + i = static_cast<dimension_type>(static_cast<difference_type>(i) + increment); value.first += increment; #if PPL_OR_MATRIX_EXTRA_DEBUG - value.size_ += (m - m%2); + value.size_ = static_cast<dimension_type>(static_cast<difference_type>(value.size_) + m - m % 2); #endif return *this; }

1 0

[GIT] ppl/ppl(master): Silenced a warning.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 0f2a2bf8ff3f23db8c7d4607d1abc3c963e89eca URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f2a2bf8ff3f… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 14:30:22 2012 +0100 Silenced a warning. --- src/wrap_assign.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/wrap_assign.hh b/src/wrap_assign.hh index 6294e4b..bcc9197 100644 --- a/src/wrap_assign.hh +++ b/src/wrap_assign.hh @@ -312,7 +312,7 @@ wrap_assign(PSET& pointset, Coefficient& quadrants = u_d; quadrants = last_quadrant - first_quadrant + 1; - unsigned extension; + PPL_UNINITIALIZED(unsigned, extension); Result res = assign_r(extension, quadrants, ROUND_IGNORE); if (result_overflow(res) != 0 || extension > complexity_threshold) goto set_full_range;

1 0