September 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Bit_Matrix, Sparse_Matrix: rename the {rows, columns}_erase_to_end() methods into remove_trailing_{rows, columns}(), changing the argument's meaning.
by Marco Poletti 20 Sep '10

20 Sep '10

Module: ppl/ppl Branch: master Commit: d8484a4794afafb978c01c718ea784465d835171 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d8484a4794af… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 20:20:16 2010 +0200 Bit_Matrix, Sparse_Matrix: rename the {rows,columns}_erase_to_end() methods into remove_trailing_{rows,columns}(), changing the argument's meaning. --- src/Bit_Matrix.defs.hh | 8 ++++---- src/Bit_Matrix.inlines.hh | 18 +++++++++--------- src/Linear_System.cc | 2 +- src/Polyhedron_widenings.cc | 5 +++-- src/conversion.cc | 7 ++++--- src/simplify.cc | 2 +- 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/Bit_Matrix.defs.hh b/src/Bit_Matrix.defs.hh index b7c0629..97191ce 100644 --- a/src/Bit_Matrix.defs.hh +++ b/src/Bit_Matrix.defs.hh @@ -102,11 +102,11 @@ public: */ void add_recycled_row(Bit_Row& row); - //! Erases the rows from the \p first_to_erase -th to the last one. - void rows_erase_to_end(dimension_type first_to_erase); + //! Removes the last \p n rows. + void remove_trailing_rows(dimension_type n); - //! Erases the columns from the \p first_to_erase -th to the last one. - void columns_erase_to_end(dimension_type first_to_erase); + //! Removes the last \p n columns. + void remove_trailing_columns(dimension_type n); //! Resizes the matrix copying the old contents. void resize(dimension_type new_n_rows, dimension_type new_n_columns); diff --git a/src/Bit_Matrix.inlines.hh b/src/Bit_Matrix.inlines.hh index fade705..a4d8c59 100644 --- a/src/Bit_Matrix.inlines.hh +++ b/src/Bit_Matrix.inlines.hh @@ -57,21 +57,21 @@ Bit_Matrix::~Bit_Matrix() { } inline void -Bit_Matrix::rows_erase_to_end(const dimension_type first_to_erase) { - // The first row to be erased cannot be greater +Bit_Matrix::remove_trailing_rows(const dimension_type n) { + // The number of rows to be erased cannot be greater // than the actual number of the rows of the matrix. - PPL_ASSERT(first_to_erase <= rows.size()); - if (first_to_erase < rows.size()) - rows.erase(rows.begin() + first_to_erase, rows.end()); + PPL_ASSERT(n <= rows.size()); + if (n != 0) + rows.erase(rows.end() - n, rows.end()); PPL_ASSERT(OK()); } inline void -Bit_Matrix::columns_erase_to_end(const dimension_type first_to_erase) { - // The first column to be erased cannot be greater +Bit_Matrix::remove_trailing_columns(const dimension_type n) { + // The number of columns to be erased cannot be greater // than the actual number of the columns of the matrix. - PPL_ASSERT(first_to_erase <= row_size); - row_size = first_to_erase; + PPL_ASSERT(n <= row_size); + row_size -= n; PPL_ASSERT(OK()); } diff --git a/src/Linear_System.cc b/src/Linear_System.cc index 9bc4893..3657206 100644 --- a/src/Linear_System.cc +++ b/src/Linear_System.cc @@ -530,7 +530,7 @@ PPL::Linear_System::sort_and_remove_with_sat(Bit_Matrix& sat) { sys.remove_trailing_rows(num_duplicates); sys.set_index_first_pending_row(new_first_pending_row); // ... and the corresponding rows of the saturation matrix. - sat.rows_erase_to_end(sat.num_rows() - num_duplicates); + sat.remove_trailing_rows(num_duplicates); PPL_ASSERT(sys.check_sorted()); // Now the system is sorted. sys.set_sorted(true); diff --git a/src/Polyhedron_widenings.cc b/src/Polyhedron_widenings.cc index 716886b..d8927c8 100644 --- a/src/Polyhedron_widenings.cc +++ b/src/Polyhedron_widenings.cc @@ -97,13 +97,14 @@ PPL::Polyhedron // this is needed in order to widen the polyhedron and not the // corresponding homogenized polyhedral cone. const Constraint_System& y_cs = y.con_sys; - dimension_type num_rows = y_cs.num_rows(); + const dimension_type old_num_rows = y_cs.num_rows(); + dimension_type num_rows = old_num_rows; for (dimension_type i = 0; i < num_rows; ++i) if (y_cs[i].is_tautological()) { --num_rows; std::swap(tmp_sat_g[i], tmp_sat_g[num_rows]); } - tmp_sat_g.rows_erase_to_end(num_rows); + tmp_sat_g.remove_trailing_rows(old_num_rows - num_rows); tmp_sat_g.sort_rows(); // A constraint in `con_sys' is copied to `cs_selected' diff --git a/src/conversion.cc b/src/conversion.cc index bf321e4..a7297ec 100644 --- a/src/conversion.cc +++ b/src/conversion.cc @@ -822,7 +822,7 @@ PPL::Polyhedron::conversion(Linear_System& source, if (source_num_redundant > 0) { PPL_ASSERT(source_num_redundant == source.num_rows() - source_num_rows); source.remove_trailing_rows(source_num_redundant); - sat.columns_erase_to_end(source_num_rows); + sat.remove_trailing_columns(source_num_redundant); } // If `start == 0', then `source' was sorted and remained so. // If otherwise `start > 0', then the two sub-system made by the @@ -839,11 +839,12 @@ PPL::Polyhedron::conversion(Linear_System& source, // We may have identified some redundant rays in `dest', // which have been swapped at the end of the system. if (dest_num_rows < dest.num_rows()) { - dest.remove_trailing_rows(dest.num_rows() - dest_num_rows); + const dimension_type num_removed_rows = dest.num_rows() - dest_num_rows; + dest.remove_trailing_rows(num_removed_rows); // Be careful: we might have erased some of the non-pending rows. if (dest.first_pending_row() > dest_num_rows) dest.unset_pending_rows(); - sat.rows_erase_to_end(dest_num_rows); + sat.remove_trailing_rows(num_removed_rows); } if (dest.is_sorted()) // If the non-pending generators in `dest' are still declared to be diff --git a/src/simplify.cc b/src/simplify.cc index 7d24813..330f93b 100644 --- a/src/simplify.cc +++ b/src/simplify.cc @@ -295,7 +295,7 @@ PPL::Polyhedron::simplify(Linear_System& sys, Bit_Matrix& sat) { // moved to the bottom of `sys' and the corresponding `sat' rows. sys.remove_trailing_rows(old_num_rows - num_rows); sys.unset_pending_rows(); - sat.rows_erase_to_end(num_rows); + sat.remove_trailing_rows(old_num_rows - num_rows); // At this point the first `num_lines_or_equalities' rows of 'sys' // represent the irredundant equalities, while the remaining rows // (i.e., those having indexes from `num_lines_or_equalities' to

1 0

[GIT] ppl/ppl(master): Dense_Matrix, Sparse_Matrix: rename the erase_to_end () method into remove_trailing_rows(), changing the argument's meaning.
by Marco Poletti 20 Sep '10

20 Sep '10

Module: ppl/ppl Branch: master Commit: 7c153292b94f572a5f68a6e578ef44360d64e8f7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7c153292b94f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 15:07:20 2010 +0200 Dense_Matrix, Sparse_Matrix: rename the erase_to_end() method into remove_trailing_rows(), changing the argument's meaning. --- src/Constraint_System.cc | 7 ++++--- src/Dense_Matrix.defs.hh | 7 ++----- src/Dense_Matrix.inlines.hh | 8 ++++---- src/Generator_System.cc | 7 ++++--- src/Grid_chdims.cc | 4 ++-- src/Grid_simplify.cc | 6 +++--- src/Linear_System.cc | 12 +++++++----- src/MIP_Problem.cc | 2 +- src/PIP_Tree.cc | 10 +++++----- src/Polyhedron.templates.hh | 2 +- src/Polyhedron_nonpublic.cc | 12 +++++++----- src/Polyhedron_public.cc | 13 ++++++++----- src/Sparse_Matrix.defs.hh | 11 +++++------ src/Sparse_Matrix.inlines.hh | 4 ++-- src/conversion.cc | 4 ++-- src/simplify.cc | 5 +++-- 16 files changed, 60 insertions(+), 54 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=7c153292…

1 0

[GIT] ppl/ppl(master): Grid_Generator_System: remove unused erase_to_end() private method.
by Marco Poletti 20 Sep '10

20 Sep '10

Module: ppl/ppl Branch: master Commit: f9bb908fe1ba4c45176563026327d6f28ed025c4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f9bb908fe1ba… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 15:06:06 2010 +0200 Grid_Generator_System: remove unused erase_to_end() private method. --- src/Grid_Generator_System.defs.hh | 6 ------ src/Grid_Generator_System.inlines.hh | 5 ----- 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/src/Grid_Generator_System.defs.hh b/src/Grid_Generator_System.defs.hh index 1fe1e4a..7d16b29 100644 --- a/src/Grid_Generator_System.defs.hh +++ b/src/Grid_Generator_System.defs.hh @@ -489,12 +489,6 @@ private: */ dimension_type num_columns() const; - /*! \brief - Erases from the matrix all the rows but those having an index less - than \p first_to_erase. - */ - void erase_to_end(dimension_type first_to_erase); - //! Permutes the columns of the matrix. /* \param cycles diff --git a/src/Grid_Generator_System.inlines.hh b/src/Grid_Generator_System.inlines.hh index 7e3e9fc..ece3baf 100644 --- a/src/Grid_Generator_System.inlines.hh +++ b/src/Grid_Generator_System.inlines.hh @@ -55,11 +55,6 @@ Grid_Generator_System::num_columns() const { } inline void -Grid_Generator_System::erase_to_end(dimension_type first_to_erase) { - return Generator_System::erase_to_end(first_to_erase); -} - -inline void Grid_Generator_System ::permute_columns(const std::vector<dimension_type>& cycles) { return Generator_System::permute_columns(cycles);

1 0

[GIT] ppl/ppl(MPI): Merge remote branch 'origin/sparse_matrices' into MPI
by Marco Poletti 20 Sep '10

20 Sep '10

Module: ppl/ppl Branch: MPI Commit: 9c2a7cf107a17a07e5076e25577a69260a583b6e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9c2a7cf107a1… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 09:18:34 2010 +0200 Merge remote branch 'origin/sparse_matrices' into MPI Conflicts: src/CO_Tree.templates.hh ---

1 0

[GIT] ppl/ppl(MPI): Fix comment.
by Marco Poletti 20 Sep '10

20 Sep '10

Module: ppl/ppl Branch: MPI Commit: a4cbaaa9519967dd69e60865a18eaafdd21d44a4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a4cbaaa95199… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 09:17:17 2010 +0200 Fix comment. --- src/CO_Tree.templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/CO_Tree.templates.hh b/src/CO_Tree.templates.hh index 430e387..441c523 100644 --- a/src/CO_Tree.templates.hh +++ b/src/CO_Tree.templates.hh @@ -1,5 +1,5 @@ -/* Sparse_Row class implementation: non-inline template functions. +/* CO_Tree class implementation: non-inline template functions. Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> This file is part of the Parma Polyhedra Library (PPL).

1 0

[GIT] ppl/ppl(master): Fix comment.
by Marco Poletti 20 Sep '10

20 Sep '10

Module: ppl/ppl Branch: master Commit: a4cbaaa9519967dd69e60865a18eaafdd21d44a4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a4cbaaa95199… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 09:17:17 2010 +0200 Fix comment. --- src/CO_Tree.templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/CO_Tree.templates.hh b/src/CO_Tree.templates.hh index 430e387..441c523 100644 --- a/src/CO_Tree.templates.hh +++ b/src/CO_Tree.templates.hh @@ -1,5 +1,5 @@ -/* Sparse_Row class implementation: non-inline template functions. +/* CO_Tree class implementation: non-inline template functions. Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> This file is part of the Parma Polyhedra Library (PPL).

1 0

[GIT] ppl/ppl(sparse_matrices): Fix comment.
by Marco Poletti 20 Sep '10

20 Sep '10

Module: ppl/ppl Branch: sparse_matrices Commit: a4cbaaa9519967dd69e60865a18eaafdd21d44a4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a4cbaaa95199… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 09:17:17 2010 +0200 Fix comment. --- src/CO_Tree.templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/CO_Tree.templates.hh b/src/CO_Tree.templates.hh index 430e387..441c523 100644 --- a/src/CO_Tree.templates.hh +++ b/src/CO_Tree.templates.hh @@ -1,5 +1,5 @@ -/* Sparse_Row class implementation: non-inline template functions. +/* CO_Tree class implementation: non-inline template functions. Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> This file is part of the Parma Polyhedra Library (PPL).

1 0

[GIT] ppl/ppl(MPI): New commits
by Roberto Bagnara 20 Sep '10

20 Sep '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4cc67e202275… Merge: 7bc36b69c0442ba1e221a3f071698c1a7df50912 1ac324043fc85fee09587c2a3aea3228732dd582 Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 09:16:24 2010 +0200 Merge remote branch 'origin/sparse_matrices' into MPI Conflicts: src/CO_Tree.defs.hh src/CO_Tree.templates.hh src/MIP_Problem.defs.hh src/Sparse_Row.cc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1ac324043fc8… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 08:57:39 2010 +0200 Sparse_Row: weaken the lower_bound() requirements on the argument. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=23bd68d17e27… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 08:56:47 2010 +0200 Sparse_Row: make the constructor from a Dense_Row work even when Coefficient_traits::const_reference is Coefficient. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=670621abc730… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Sep 19 16:42:03 2010 +0200 MIP_Problem: add a linear_combine() method that takes a Dense_Row and a Sparse_Row, to re-allow dense working costs with sparse matrices. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=33c81bff707a… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Sep 19 16:39:41 2010 +0200 MIP_Problem: add assertion. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e36503c4407e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Sep 19 16:39:14 2010 +0200 MIP_Problem: use working_cost_type instead of using Row directly. Remove unnecessary specialized implementation for sparse working costs. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=16f3e918c5fc… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Sep 18 19:45:16 2010 +0200 Sparse_Row, Dense_Row: rename find_create() methods into insert(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ae21af77d26c… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Sep 18 18:38:25 2010 +0200 Sparse_Row: add documentation. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=466439403713… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Sep 18 18:34:06 2010 +0200 test/Sparse_Matrix: add test for the Sparse_Row's constructor from a Dense_Row. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2fe651ae4ee6… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Sep 18 18:33:31 2010 +0200 Sparse_Row: add a constructor from a Dense_Row. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9cd84e2dc61e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Sep 18 18:33:06 2010 +0200 CO_Tree: add a constructor from a sequence of elements. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=35d00bb24afe… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Sep 18 18:32:13 2010 +0200 src/Makefile.am: remove duplicate filenames from the list. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d1c29cf37d2f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Sep 18 17:15:13 2010 +0200 Indentation fixes, mainly to avoid line wraps. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b1b240cfb51f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Sep 18 17:14:09 2010 +0200 Fix typo in comment.

1 0

[GIT] ppl/ppl(sparse_matrices): Sparse_Row: weaken the lower_bound() requirements on the argument.
by Marco Poletti 20 Sep '10

20 Sep '10

Module: ppl/ppl Branch: sparse_matrices Commit: 1ac324043fc85fee09587c2a3aea3228732dd582 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1ac324043fc8… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 08:57:39 2010 +0200 Sparse_Row: weaken the lower_bound() requirements on the argument. --- src/Sparse_Row.inlines.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Sparse_Row.inlines.hh b/src/Sparse_Row.inlines.hh index babd074..ec75549 100644 --- a/src/Sparse_Row.inlines.hh +++ b/src/Sparse_Row.inlines.hh @@ -226,7 +226,7 @@ Sparse_Row::find(const_iterator hint, dimension_type i) const { inline Sparse_Row::iterator Sparse_Row::lower_bound(dimension_type i) { - PPL_ASSERT(i < size()); + PPL_ASSERT(i <= size()); iterator itr = tree.bisect(i); @@ -243,7 +243,7 @@ Sparse_Row::lower_bound(dimension_type i) { inline Sparse_Row::iterator Sparse_Row::lower_bound(iterator hint, dimension_type i) { - PPL_ASSERT(i < size()); + PPL_ASSERT(i <= size()); iterator itr = tree.bisect_near(hint, i); @@ -260,7 +260,7 @@ Sparse_Row::lower_bound(iterator hint, dimension_type i) { inline Sparse_Row::const_iterator Sparse_Row::lower_bound(dimension_type i) const { - PPL_ASSERT(i < size()); + PPL_ASSERT(i <= size()); const_iterator itr = tree.bisect(i); @@ -277,7 +277,7 @@ Sparse_Row::lower_bound(dimension_type i) const { inline Sparse_Row::const_iterator Sparse_Row::lower_bound(const_iterator hint, dimension_type i) const { - PPL_ASSERT(i < size()); + PPL_ASSERT(i <= size()); const_iterator itr = tree.bisect_near(hint, i);

1 0

[GIT] ppl/ppl(sparse_matrices): Sparse_Row: make the constructor from a Dense_Row work even when Coefficient_traits:: const_reference is Coefficient.
by Marco Poletti 20 Sep '10

20 Sep '10

Module: ppl/ppl Branch: sparse_matrices Commit: 23bd68d17e27f4da6c7edb64556c8bc771e47b31 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=23bd68d17e27… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 20 08:56:47 2010 +0200 Sparse_Row: make the constructor from a Dense_Row work even when Coefficient_traits::const_reference is Coefficient. --- src/Sparse_Row.cc | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/src/Sparse_Row.cc b/src/Sparse_Row.cc index 19a5ab9..69af756 100644 --- a/src/Sparse_Row.cc +++ b/src/Sparse_Row.cc @@ -53,18 +53,12 @@ public: return tmp; } - const PPL::Coefficient& + PPL::Coefficient_traits::const_reference operator*() const { PPL_ASSERT(i < row.size()); return row[i]; } - const PPL::Coefficient* - operator->() const { - PPL_ASSERT(i < row.size()); - return &(*(*this)); - } - PPL::dimension_type index() const { PPL_ASSERT(i < row.size());

1 0