- PPL-devel - BUGSENG Mailman

ppl-0.11 build fails in the testsuite on x86_64
by Matthias Klose 04 Jan '11

04 Jan '11

the ppl-0.11 build fails in the testsuite on x86_64 (on lucid 10.04 and natty 11.04), see https://bugs.launchpad.net/ubuntu/+source/ppl/+bug/697305 apparently the test did succeed for the ppl-0.11 upload to Debian experimental. GNU MP: Cannot allocate memory (size=8) /bin/bash: line 5: 16671 Aborted ${dir}$tst FAIL: memory1

1 0

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 30 Dec '10

30 Dec '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ee5feefeaf50… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Dec 30 19:19:33 2010 +0100 Linear_System.cc: put all definitions in the PPL namespace. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0d1f436dcd4f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Dec 30 19:09:44 2010 +0100 Polyhedron: add a typedef for Linear_System_Class and use it. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bbeb88aff47e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Dec 30 18:51:37 2010 +0100 Generator_System: add a typedef for Base and use it. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6697684f485e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Dec 30 18:51:22 2010 +0100 Constraint_System: add a typedef for Base and use it. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=367354e75d38… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Dec 30 17:59:10 2010 +0100 Congruence_System, Linear_System: fix some regressions. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1fed237c999c… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Dec 30 17:54:49 2010 +0100 Revert "Make Linear_System a class template. Replace uses of Linear_System with uses of Linear_System<Linear_Row>." This reverts commit 81176f32cb9621c3562e169fa365fc56f49271a7.

1 0

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 30 Dec '10

30 Dec '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=81176f32cb96… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Dec 28 14:19:36 2010 +0100 Make Linear_System a class template. Replace uses of Linear_System with uses of Linear_System<Linear_Row>. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cc3f972568a5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Dec 28 14:16:12 2010 +0100 Matrix: uncomment the PPL_OUTPUT_TEMPLATE_DEFINITIONS_ASCII_ONLY macro. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c9f5829e6316… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Dec 28 14:12:39 2010 +0100 Scalar_Products: don't include Scalar_Products.inlines.hh in Scalar_Products.defs.hh. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=045d5c552c4e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Dec 27 22:32:42 2010 +0100 Bit_Matrix: avoid inclusion of Linear_System.defs.hh. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9a27d6f027d… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Dec 27 22:00:00 2010 +0100 Generator: include Generator_System.types.hh instead of Generator_System.defs.hh. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7ceeae3517a5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Dec 27 21:54:11 2010 +0100 Generator_System: replace the const_iterator class with an external Generator_System_const_iterator class. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=78e4346df361… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Dec 27 21:07:32 2010 +0100 Constraint: include Constraint_System.types.hh instead of Constraint_System.defs.hh. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e5da404d6dab… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Dec 27 21:06:52 2010 +0100 Constraint_System: replace the const_iterator class with an external Constraint_System_const_iterator class. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=617d28681b03… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Dec 27 17:05:58 2010 +0100 Dense_Row: improve exception safety in constructors. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9a53af2aced0… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Dec 27 09:20:53 2010 +0100 Dense_Row: remove useless debugging code from the OK() method.

1 0

[GIT] ppl/ppl(master): Dense_Row: simplify the exception safety implementation by using an implementation subobject .
by Marco Poletti 30 Dec '10

30 Dec '10

Module: ppl/ppl Branch: master Commit: b86dc7a898cd584b93b0b409642e83d3abe55eee URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b86dc7a898cd… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Dec 30 14:44:10 2010 +0100 Dense_Row: simplify the exception safety implementation by using an implementation subobject. --- src/Dense_Row.cc | 142 +++++++++++++++++++-------------------- src/Dense_Row.defs.hh | 31 ++++++--- src/Dense_Row.inlines.hh | 164 ++++++++++++++++++++++----------------------- 3 files changed, 169 insertions(+), 168 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=b86dc7a8…

1 0

[GIT] ppl/ppl(master): Dense_Row: improve exception safety in constructors.
by Marco Poletti 27 Dec '10

27 Dec '10

Module: ppl/ppl Branch: master Commit: a24129e95d80cee0487b36f96e50fd3ce1fa6984 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a24129e95d80… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Dec 27 17:05:58 2010 +0100 Dense_Row: improve exception safety in constructors. --- src/Dense_Row.cc | 12 +++++-- src/Dense_Row.inlines.hh | 88 ++++++++++++++++++++++++++++++++------------- 2 files changed, 71 insertions(+), 29 deletions(-) diff --git a/src/Dense_Row.cc b/src/Dense_Row.cc index 40dcdcb..826d176 100644 --- a/src/Dense_Row.cc +++ b/src/Dense_Row.cc @@ -151,15 +151,21 @@ PPL::Dense_Row::shrink(dimension_type new_size) { PPL_ASSERT(OK()); } -PPL::Dense_Row::Dense_Row(const Sparse_Row& row) { - init(row); +PPL::Dense_Row::Dense_Row(const Sparse_Row& row) + : size_(0), capacity_(0), flags_(), vec_(0) { + try { + init(row); + } catch (...) { + PPL_ASSERT(OK()); + destroy(); + throw; + } PPL_ASSERT(size() == row.size()); PPL_ASSERT(OK()); } void PPL::Dense_Row::init(const Sparse_Row& row) { - size_ = 0; capacity_ = row.size(); flags_ = row.flags(); vec_ = static_cast<Coefficient*>( diff --git a/src/Dense_Row.inlines.hh b/src/Dense_Row.inlines.hh index 284e9ae..859ec84 100644 --- a/src/Dense_Row.inlines.hh +++ b/src/Dense_Row.inlines.hh @@ -78,7 +78,13 @@ Dense_Row::Dense_Row(const dimension_type sz, const dimension_type capacity, const Flags f) : size_(0), capacity_(0), flags_(f), vec_(0) { - resize(sz, capacity); + try { + resize(sz, capacity); + } catch (...) { + PPL_ASSERT(OK()); + destroy(); + throw; + } PPL_ASSERT(size() == sz); PPL_ASSERT(capacity_ = capacity); PPL_ASSERT(OK()); @@ -87,7 +93,13 @@ Dense_Row::Dense_Row(const dimension_type sz, inline Dense_Row::Dense_Row(const dimension_type sz, const Flags f) : size_(0), capacity_(0), flags_(f), vec_(0) { - resize(sz); + try { + resize(sz); + } catch (...) { + PPL_ASSERT(OK()); + destroy(); + throw; + } PPL_ASSERT(size() == sz); PPL_ASSERT(OK()); } @@ -96,12 +108,18 @@ inline Dense_Row::Dense_Row(const Dense_Row& y) : size_(0), capacity_(0), flags_(y.flags()), vec_(0) { if (y.vec_ != 0) { - capacity_ = y.capacity(); - vec_ = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * capacity_)); - while (size_ != y.size()) { - new (&vec_[size_]) Coefficient(y[size_]); - ++size_; + try { + capacity_ = y.capacity(); + vec_ = static_cast<Coefficient*>( + operator new(sizeof(Coefficient) * capacity_)); + while (size_ != y.size()) { + new (&vec_[size_]) Coefficient(y[size_]); + ++size_; + } + } catch (...) { + PPL_ASSERT(OK()); + destroy(); + throw; } } PPL_ASSERT(size() == y.size()); @@ -115,17 +133,26 @@ Dense_Row::Dense_Row(const Dense_Row& y, : size_(0), capacity_(0), flags_(y.flags()), vec_(0) { PPL_ASSERT(y.size() <= capacity); PPL_ASSERT(capacity <= max_size()); + + try { - vec_ = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * capacity)); - capacity_ = capacity; - - if (y.vec_ != 0) { - while (size_ != y.size()) { - new (&vec_[size_]) Coefficient(y[size_]); - ++size_; + vec_ = static_cast<Coefficient*>( + operator new(sizeof(Coefficient) * capacity)); + capacity_ = capacity; + + if (y.vec_ != 0) { + while (size_ != y.size()) { + new (&vec_[size_]) Coefficient(y[size_]); + ++size_; + } } + + } catch (...) { + PPL_ASSERT(OK()); + destroy(); + throw; } + PPL_ASSERT(size() == y.size()); PPL_ASSERT(capacity_ = capacity); PPL_ASSERT(OK()); @@ -141,18 +168,27 @@ Dense_Row::Dense_Row(const Dense_Row& y, PPL_ASSERT(capacity <= max_size()); PPL_ASSERT(capacity != 0); - vec_ = static_cast<Coefficient*>(operator new(sizeof(Coefficient) * capacity)); - capacity_ = capacity; + try { - dimension_type n = std::min(sz, y.size()); - while (size_ != n) { - new (&vec_[size_]) Coefficient(y[size_]); - ++size_; - } - while (size_ != sz) { - new (&vec_[size_]) Coefficient(); - ++size_; + vec_ = static_cast<Coefficient*>(operator new(sizeof(Coefficient) * capacity)); + capacity_ = capacity; + + dimension_type n = std::min(sz, y.size()); + while (size_ != n) { + new (&vec_[size_]) Coefficient(y[size_]); + ++size_; + } + while (size_ != sz) { + new (&vec_[size_]) Coefficient(); + ++size_; + } + + } catch (...) { + PPL_ASSERT(OK()); + destroy(); + throw; } + PPL_ASSERT(size() == sz); PPL_ASSERT(capacity_ = capacity); PPL_ASSERT(OK());

1 0

[GIT] ppl/ppl(master): Dense_Row: remove useless debugging code from the OK () method.
by Marco Poletti 27 Dec '10

27 Dec '10

Module: ppl/ppl Branch: master Commit: ff7564a57ae554269f7f4101f99d59eadc4b6028 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ff7564a57ae5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Dec 27 09:20:53 2010 +0100 Dense_Row: remove useless debugging code from the OK() method. --- src/Dense_Row.cc | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/Dense_Row.cc b/src/Dense_Row.cc index dddc104..40dcdcb 100644 --- a/src/Dense_Row.cc +++ b/src/Dense_Row.cc @@ -392,14 +392,6 @@ PPL::Dense_Row::OK() const { if (vec_ == 0) is_broken = true; } - - // TODO: Remove this. - // It was added to help finding unconstructed Coefficients with valgrind. - - Coefficient sum; - - for (dimension_type i = size(); i-- > 0; ) - sum += vec_[i]; return !is_broken; }

1 0

[GIT] ppl/ppl(sparse_matrices): Update some comments referring to the Dense_Matrix class.
by Marco Poletti 27 Dec '10

27 Dec '10

Module: ppl/ppl Branch: sparse_matrices Commit: d888e2dac633f648a83031ce5a8381c7afc98f29 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d888e2dac633… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 23:16:45 2010 +0100 Update some comments referring to the Dense_Matrix class. --- src/Congruence_System.defs.hh | 2 +- src/Grid.defs.hh | 12 ++++++------ src/Matrix.defs.hh | 18 ++---------------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/Congruence_System.defs.hh b/src/Congruence_System.defs.hh index c66591e..d0bd438 100644 --- a/src/Congruence_System.defs.hh +++ b/src/Congruence_System.defs.hh @@ -310,7 +310,7 @@ public: #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS /*! Returns <CODE>true</CODE> if and only if \p *this is a valid - Dense_Matrix, each row in the system is a valid Congruence and the + Matrix, each row in the system is a valid Congruence and the number of columns is consistent with the number of congruences. */ #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) diff --git a/src/Grid.defs.hh b/src/Grid.defs.hh index 3d523fc..a056dff 100644 --- a/src/Grid.defs.hh +++ b/src/Grid.defs.hh @@ -2432,7 +2432,7 @@ private: Uses the line \p pivot to change the representation of the line \p row so that the element at index \p col of \p row is zero. */ - // A member of Grid for access to Dense_Matrix::rows. + // A member of Grid for access to Matrix<Dense_Row>::rows. static void reduce_line_with_line(Grid_Generator& row, Grid_Generator& pivot, dimension_type col); @@ -2443,7 +2443,7 @@ private: equality \p row so that the element at index \p col of \p row is zero. */ - // A member of Grid for access to Dense_Matrix::rows. + // A member of Grid for access to Matrix<Dense_Row>::rows. static void reduce_equality_with_equality(Congruence& row, const Congruence& pivot, dimension_type col); @@ -2456,7 +2456,7 @@ private: is zero. Only elements from index \p start to index \p end are modified (i.e. it is assumed that all other elements are zero). */ - // Part of Grid for access to Dense_Matrix::rows. + // Part of Grid for access to Matrix<Dense_Row>::rows. template <typename R> static void reduce_pc_with_pc(R& row, R& pivot, @@ -2470,7 +2470,7 @@ private: parameter \p row such that the element at index \p col of \p row is zero. */ - // A member of Grid for access to Dense_Matrix::rows. + // A member of Grid for access to Matrix<Dense_Row>::rows. static void reduce_parameter_with_line(Grid_Generator& row, const Grid_Generator& pivot, dimension_type col, @@ -2482,7 +2482,7 @@ private: congruence \p row such that element at index \p col of \p row is zero. */ - // A member of Grid for access to Dense_Matrix::rows. + // A member of Grid for access to Matrix<Dense_Row>::rows. static void reduce_congruence_with_equality(Congruence& row, const Congruence& pivot, dimension_type col, @@ -2512,7 +2512,7 @@ private: bool generators = true); //! Multiply the elements of \p dest by \p multiplier. - // A member of Grid for access to Dense_Matrix::rows and cgs::operator[]. + // A member of Grid for access to Matrix<Dense_Row>::rows and cgs::operator[]. static void multiply_grid(const Coefficient& multiplier, Congruence& cg, Congruence_System& dest, dimension_type num_rows, diff --git a/src/Matrix.defs.hh b/src/Matrix.defs.hh index 6d8b088..3d29333 100644 --- a/src/Matrix.defs.hh +++ b/src/Matrix.defs.hh @@ -171,8 +171,6 @@ public: The matrix is expanded to the specified dimensions avoiding reallocation whenever possible. The contents of the original matrix is lost. - - This method is provided for compatibility with Dense_Matrix. */ void resize_no_copy(dimension_type new_n_rows, dimension_type new_n_columns, Flags row_flags); @@ -201,8 +199,6 @@ public: //! Adds to the matrix \p n rows of zeroes with flags set to \p row_flags. /*! - Provided for compatibilty with Dense_Matrix. - \param n The number of rows to be added: must be strictly positive. @@ -242,8 +238,6 @@ public: the \f$(r+1) \times c\f$ matrix \f$\genfrac{(}{)}{0pt}{}{M}{y}\f$. The matrix is expanded avoiding reallocation whenever possible. - - This method is provided for compatibility with Dense_Matrix. */ void add_recycled_row(Row& y); @@ -253,7 +247,6 @@ public: \param n The number of row that will be removed. - Provided for compatibility with Dense_Matrix. It is equivalent to num_rows() - n, num_columns()). This method takes \f$O(n+k)\f$ amortized time, where k is the total number @@ -266,8 +259,8 @@ public: //! Permutes the columns of the matrix. /*! - This method is provided for compatibilty with Dense_Matrix but it is slow - and should be avoided if possible. + This method may be slow for some Row types, and should be avoided if + possible. \param cycles A vector representing the non-trivial cycles of the permutation @@ -301,8 +294,6 @@ public: //! Adds \p n columns of zeroes to the matrix. /*! - Provided for compatibilty with Dense_Matrix. - \param n The number of columns to be added: must be strictly positive. @@ -359,8 +350,6 @@ public: \param n The number of trailing columns that will be removed. - This method is provided for compatibility with Dense_Matrix. - This operation invalidates existing iterators. This method takes \f$O(\sum_{j=1}^r (k_j*\log n_j))\f$ amortized time, @@ -374,9 +363,6 @@ public: void remove_trailing_columns(dimension_type n); //! Equivalent to resize(0,0). - /*! - Provided for compatibility with Dense_Matrix. - */ void clear(); //! Returns an %iterator pointing to the first row.

1 0

[GIT] ppl/ppl(sparse_matrices): Remove the Dense_Matrix class, and use Matrix<Dense_Row> instead.
by Marco Poletti 26 Dec '10

26 Dec '10

Module: ppl/ppl Branch: sparse_matrices Commit: c354550b9fdfd9239199a0713dfa7cc9736719c6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c354550b9fdf… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 23:11:58 2010 +0100 Remove the Dense_Matrix class, and use Matrix<Dense_Row> instead. --- src/Congruence_System.cc | 8 +- src/Congruence_System.defs.hh | 12 +- src/Congruence_System.inlines.hh | 38 ++-- src/Dense_Matrix.cc | 468 -------------------------------------- src/Dense_Matrix.defs.hh | 392 ------------------------------- src/Dense_Matrix.inlines.hh | 237 ------------------- src/Dense_Matrix.types.hh | 21 -- src/Grid_Generator_System.cc | 16 +- src/Linear_System.cc | 13 +- src/Linear_System.defs.hh | 4 +- src/Linear_System.inlines.hh | 28 ++-- src/Makefile.am | 4 - src/Matrix.defs.hh | 1 + src/Polyhedron_chdims.cc | 4 +- 14 files changed, 64 insertions(+), 1182 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=c354550b…

1 0

[GIT] ppl/ppl(sparse_matrices): Merge branch 'master' into sparse_matrices
by Marco Poletti 26 Dec '10

26 Dec '10

Module: ppl/ppl Branch: sparse_matrices Commit: 2c9be05d5c71c62c7d1c67758a19261a97120525 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2c9be05d5c71… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 23:02:12 2010 +0100 Merge branch 'master' into sparse_matrices ---

1 0

[GIT] ppl/ppl(sparse_matrices): Dense_Row, Sparse_Row, Linear_Row: modify the flags' getter and setter methods, to follow strict aliasing rules.
by Marco Poletti 26 Dec '10

26 Dec '10

Module: ppl/ppl Branch: sparse_matrices Commit: 242769b816b4723acf08fca18d8a3ad8059b5db8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=242769b816b4… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 22:57:26 2010 +0100 Dense_Row, Sparse_Row, Linear_Row: modify the flags' getter and setter methods, to follow strict aliasing rules. --- src/Constraint.inlines.hh | 6 +++--- src/Dense_Matrix.cc | 2 +- src/Dense_Row.cc | 2 +- src/Dense_Row.defs.hh | 8 ++++---- src/Dense_Row.inlines.hh | 8 ++++---- src/Generator.inlines.hh | 6 +++--- src/Linear_Row.cc | 8 +++++++- src/Linear_Row.defs.hh | 11 +++++++---- src/Linear_Row.inlines.hh | 31 ++++++++++++++++++++++--------- src/Sparse_Matrix.cc | 6 +++--- src/Sparse_Row.cc | 2 +- src/Sparse_Row.defs.hh | 8 ++++---- src/Sparse_Row.inlines.hh | 8 ++++---- 13 files changed, 64 insertions(+), 42 deletions(-) diff --git a/src/Constraint.inlines.hh b/src/Constraint.inlines.hh index e474e75..edfbbb4 100644 --- a/src/Constraint.inlines.hh +++ b/src/Constraint.inlines.hh @@ -31,9 +31,9 @@ inline Constraint::Constraint(Linear_Expression& e, Type type, Topology topology) { PPL_ASSERT(type != STRICT_INEQUALITY || topology == NOT_NECESSARILY_CLOSED); Linear_Row::swap(e); - flags() = Flags(topology, (type == EQUALITY - ? LINE_OR_EQUALITY - : RAY_OR_POINT_OR_INEQUALITY)); + set_flags(Flags(topology, (type == EQUALITY + ? LINE_OR_EQUALITY + : RAY_OR_POINT_OR_INEQUALITY))); } inline diff --git a/src/Dense_Matrix.cc b/src/Dense_Matrix.cc index 3ed35ad..455c8b6 100644 --- a/src/Dense_Matrix.cc +++ b/src/Dense_Matrix.cc @@ -44,7 +44,7 @@ PPL::Dense_Matrix::Dense_Matrix(const dimension_type n_rows, PPL_ASSERT(n_rows <= max_num_rows()); // Construct in direct order: will destroy in reverse order. for (dimension_type i = 0; i < n_rows; ++i) { - rows[i].flags() = row_flags; + rows[i].set_flags(row_flags); rows[i].resize(n_columns, row_capacity); } PPL_ASSERT(OK()); diff --git a/src/Dense_Row.cc b/src/Dense_Row.cc index 36efcbb..dddc104 100644 --- a/src/Dense_Row.cc +++ b/src/Dense_Row.cc @@ -333,7 +333,7 @@ PPL::Dense_Row::ascii_load(std::istream& s) { return false; if (!(s >> str) || str != "f") return false; - return flags().ascii_load(s); + return flags_.ascii_load(s); } PPL::memory_size_type diff --git a/src/Dense_Row.defs.hh b/src/Dense_Row.defs.hh index daa343d..adc2ea8 100644 --- a/src/Dense_Row.defs.hh +++ b/src/Dense_Row.defs.hh @@ -126,11 +126,11 @@ public: */ void shrink(dimension_type new_size); - //! Returns a const reference to the flags of \p *this. - const Flags& flags() const; + //! Returns the flags of \p *this. + const Flags flags() const; - //! Returns a non-const reference to the flags of \p *this. - Flags& flags(); + //! Sets \p f as the flags of \p *this. + void set_flags(Flags f); //! Returns the size() of the largest possible Dense_Row. static dimension_type max_size(); diff --git a/src/Dense_Row.inlines.hh b/src/Dense_Row.inlines.hh index 0dce645..284e9ae 100644 --- a/src/Dense_Row.inlines.hh +++ b/src/Dense_Row.inlines.hh @@ -44,14 +44,14 @@ Dense_Row::size() const { return size_; } -inline const Row_Flags& +inline const Dense_Row::Flags Dense_Row::flags() const { return flags_; } -inline Row_Flags& -Dense_Row::flags() { - return flags_; +inline void +Dense_Row::set_flags(Dense_Row::Flags f) { + flags_ = f; } inline dimension_type diff --git a/src/Generator.inlines.hh b/src/Generator.inlines.hh index 06ddb40..99f673f 100644 --- a/src/Generator.inlines.hh +++ b/src/Generator.inlines.hh @@ -29,9 +29,9 @@ inline Generator::Generator(Linear_Expression& e, Type type, Topology topology) { PPL_ASSERT(type != CLOSURE_POINT || topology == NOT_NECESSARILY_CLOSED); Linear_Row::swap(e); - flags() = Flags(topology, (type == LINE - ? LINE_OR_EQUALITY - : RAY_OR_POINT_OR_INEQUALITY)); + set_flags(Flags(topology, (type == LINE + ? LINE_OR_EQUALITY + : RAY_OR_POINT_OR_INEQUALITY))); } inline diff --git a/src/Linear_Row.cc b/src/Linear_Row.cc index f55ef65..87231a8 100644 --- a/src/Linear_Row.cc +++ b/src/Linear_Row.cc @@ -222,7 +222,13 @@ PPL::Linear_Row::ascii_load(std::istream& s) { return false; if (!(s >> str) || str != "f") return false; - return flags().ascii_load(s); + + Flags f; + if (!f.ascii_load(s)) + return false; + set_flags(f); + + return true; } bool diff --git a/src/Linear_Row.defs.hh b/src/Linear_Row.defs.hh index 264c640..6103889 100644 --- a/src/Linear_Row.defs.hh +++ b/src/Linear_Row.defs.hh @@ -186,6 +186,9 @@ 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); //! \name The bits that are currently in use //@{ @@ -238,11 +241,11 @@ public: //! \name Flags inspection methods //@{ - //! Returns a const reference to the flags of \p *this. - const Flags& flags() const; + //! Returns the flags of \p *this. + const Flags flags() const; - //! Returns a non-const reference to the flags of \p *this. - Flags& flags(); + //! Sets \p f as the flags of \p *this. + void set_flags(Flags f); //! Returns the topological kind of \p *this. Topology topology() const; diff --git a/src/Linear_Row.inlines.hh b/src/Linear_Row.inlines.hh index 563af89..f0357e3 100644 --- a/src/Linear_Row.inlines.hh +++ b/src/Linear_Row.inlines.hh @@ -36,6 +36,11 @@ Linear_Row::Flags::Flags() } inline +Linear_Row::Flags::Flags(Dense_Row::Flags f) +: Dense_Row::Flags(f) { +} + +inline Linear_Row::Flags::Flags(const Topology t) : Dense_Row::Flags(t << nnc_bit) { #ifndef NDEBUG @@ -124,14 +129,14 @@ Linear_Row::Flags::operator!=(const Flags& y) const { return !operator==(y); } -inline const Linear_Row::Flags& +inline const Linear_Row::Flags Linear_Row::flags() const { - return static_cast<const Flags&>(Dense_Row::flags()); + return Flags(Dense_Row::flags()); } -inline Linear_Row::Flags& -Linear_Row::flags() { - return static_cast<Flags&>(Dense_Row::flags()); +inline void +Linear_Row::set_flags(Flags f) { + Dense_Row::set_flags(f); } inline bool @@ -208,22 +213,30 @@ Linear_Row::topology() const { inline void Linear_Row::set_is_line_or_equality() { - flags().set_is_line_or_equality(); + Flags f = flags(); + f.set_is_line_or_equality(); + set_flags(f); } inline void Linear_Row::set_is_ray_or_point_or_inequality() { - flags().set_is_ray_or_point_or_inequality(); + Flags f = flags(); + f.set_is_ray_or_point_or_inequality(); + set_flags(f); } inline void Linear_Row::set_necessarily_closed() { - flags().set_necessarily_closed(); + Flags f = flags(); + f.set_necessarily_closed(); + set_flags(f); } inline void Linear_Row::set_not_necessarily_closed() { - flags().set_not_necessarily_closed(); + Flags f = flags(); + f.set_not_necessarily_closed(); + set_flags(f); } inline Coefficient_traits::const_reference diff --git a/src/Sparse_Matrix.cc b/src/Sparse_Matrix.cc index 339e500..1be6aa2 100644 --- a/src/Sparse_Matrix.cc +++ b/src/Sparse_Matrix.cc @@ -29,7 +29,7 @@ namespace PPL = Parma_Polyhedra_Library; PPL::Sparse_Matrix::Sparse_Matrix(dimension_type n, Flags row_flags) : rows(n), num_columns_(n) { for (dimension_type i = 0; i < rows.size(); ++i) { - rows[i].flags() = row_flags; + rows[i].set_flags(row_flags); rows[i].resize(num_columns_); } PPL_ASSERT(OK()); @@ -40,7 +40,7 @@ PPL::Sparse_Matrix::Sparse_Matrix(dimension_type num_rows, Flags row_flags) : rows(num_rows), num_columns_(num_columns) { for (dimension_type i = 0; i < rows.size(); ++i) { - rows[i].flags() = row_flags; + rows[i].set_flags(row_flags); rows[i].resize(num_columns_); } PPL_ASSERT(OK()); @@ -54,7 +54,7 @@ PPL::Sparse_Matrix::resize(dimension_type num_rows, rows.resize(num_rows); if (old_num_rows < num_rows) { for (dimension_type i = old_num_rows; i < num_rows; ++i) { - rows[i].flags() = row_flags; + rows[i].set_flags(row_flags); rows[i].resize(num_columns); } if (num_columns_ != num_columns) { diff --git a/src/Sparse_Row.cc b/src/Sparse_Row.cc index 7a7a078..fe8ed66 100644 --- a/src/Sparse_Row.cc +++ b/src/Sparse_Row.cc @@ -105,7 +105,7 @@ PPL::Sparse_Row::operator=(const PPL::Dense_Row& row) { Sparse_Row_from_Dense_Row_helper_function(row)); std::swap(tree, tmp_tree); size_ = row.size(); - flags() = row.flags(); + flags_ = row.flags(); PPL_ASSERT(OK()); return *this; diff --git a/src/Sparse_Row.defs.hh b/src/Sparse_Row.defs.hh index 264f569..7b1c8b3 100644 --- a/src/Sparse_Row.defs.hh +++ b/src/Sparse_Row.defs.hh @@ -266,11 +266,11 @@ public: //! Returns the size() of the largest possible Sparse_Row. static dimension_type max_size(); - //! Returns the flags associated with this row. - const Flags& flags() const; + //! Returns the flags of \p *this. + const Flags flags() const; - //! Returns a reference to the flags associated with this row. - Flags& flags(); + //! Sets \p f as the flags of \p *this. + void set_flags(Flags f); //! Resets all the elements of this row. /*! diff --git a/src/Sparse_Row.inlines.hh b/src/Sparse_Row.inlines.hh index 1d67b02..a101fc3 100644 --- a/src/Sparse_Row.inlines.hh +++ b/src/Sparse_Row.inlines.hh @@ -145,14 +145,14 @@ Sparse_Row::max_size() { return CO_Tree::max_size(); } -inline const Sparse_Row::Flags& +inline const Sparse_Row::Flags Sparse_Row::flags() const { return flags_; } -inline Sparse_Row::Flags& -Sparse_Row::flags() { - return flags_; +inline void +Sparse_Row::set_flags(Sparse_Row::Flags f) { + flags_ = f; } inline void

1 0