December 2010 - PPL-devel - BUGSENG Mailman

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

26 Dec '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=31c662c5d47b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 20:10:21 2010 +0100 Dense_Matrix: make all fields private instead of protected. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=85190b211f87… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 20:09:54 2010 +0100 Matrix: rename the row_capacity() method into capacity(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fa35c9443c89… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 20:09:13 2010 +0100 Linear_System: avoid accessing private fields of Dense_Matrix. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a61d278e99b3… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 16:47:38 2010 +0100 Congruence_System: avoid accessing private fields of Dense_Matrix. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d7e1b8ad7a84… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 16:46:57 2010 +0100 Grid_Generator_System: avoid accessing private fields of Dense_Matrix. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c359346e33d7… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 16:45:31 2010 +0100 Dense_Matrix: add non-const iterator and the remove_rows() and reserve_rows() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f4fe636dd860… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 12:34:33 2010 +0100 Grid: avoid accessing private fields of Dense_Matrix directly. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a19f58a1d3dd… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 12:30:36 2010 +0100 Matrix: call reserve_rows() in resize() to improve performance. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b607a6d7990a… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 12:28:09 2010 +0100 Matrix: add some methods: row_capacity(), reserve_rows(), remove_rows() and swap_columns(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f96818824ca0… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Dec 26 12:19:07 2010 +0100 Dense_Row: remove the capacity argument from the two-argument OK() method.

1 0

[GIT] ppl/ppl(master): 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: master 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

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

25 Dec '10

Module: ppl/ppl Branch: sparse_matrices Commit: 2d2bbd89b24c42c46c3884cf5a34ac4b5b6004f9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2d2bbd89b24c… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Dec 25 11:33:17 2010 +0100 Merge branch 'master' into sparse_matrices ---

1 0

[GIT] ppl/ppl(sparse_matrices): Dense_Row, Sparse_Row: remove the construct () methods and add a constructor from Flags. Update client code.
by Marco Poletti 25 Dec '10

25 Dec '10

Module: ppl/ppl Branch: sparse_matrices Commit: c85e31fb4f456b5d5fe9ff060b955dda7b46e820 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c85e31fb4f45… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Dec 25 10:50:44 2010 +0100 Dense_Row, Sparse_Row: remove the construct() methods and add a constructor from Flags. Update client code. --- src/Dense_Matrix.cc | 44 ++++++++++++++++++++++---------------------- src/Dense_Row.defs.hh | 28 ++-------------------------- src/Dense_Row.inlines.hh | 20 +++----------------- src/Linear_Expression.cc | 2 +- src/Linear_Row.defs.hh | 26 -------------------------- src/Linear_Row.inlines.hh | 19 ++++--------------- src/Linear_System.cc | 4 ++-- src/Sparse_Row.defs.hh | 40 ++-------------------------------------- src/Sparse_Row.inlines.hh | 19 ++++++------------- 9 files changed, 42 insertions(+), 160 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=c85e31fb…

1 0

[GIT] ppl/ppl(sparse_matrices): Dense_Row: simplify the internal representation and implementation.
by Marco Poletti 25 Dec '10

25 Dec '10

Module: ppl/ppl Branch: sparse_matrices Commit: ecffa9a026c3f25847aab7ed89a0c1419f27f5cb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ecffa9a026c3… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Dec 25 10:46:23 2010 +0100 Dense_Row: simplify the internal representation and implementation. --- src/Dense_Matrix.cc | 15 ++ src/Dense_Matrix.inlines.hh | 17 +- src/Dense_Row.cc | 341 ++++++++++++++++++++++++++++--------------- src/Dense_Row.defs.hh | 230 +++-------------------------- src/Dense_Row.inlines.hh | 307 +++++++++++++-------------------------- src/Dense_Row.types.hh | 1 - 6 files changed, 368 insertions(+), 543 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=ecffa9a0…

1 0

[GIT] ppl/ppl(master): Dense_Row, Sparse_Row: remove the construct() methods and add a constructor from Flags. Update client code.
by Marco Poletti 25 Dec '10

25 Dec '10

Module: ppl/ppl Branch: master Commit: c85e31fb4f456b5d5fe9ff060b955dda7b46e820 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c85e31fb4f45… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Dec 25 10:50:44 2010 +0100 Dense_Row, Sparse_Row: remove the construct() methods and add a constructor from Flags. Update client code. --- src/Dense_Matrix.cc | 44 ++++++++++++++++++++++---------------------- src/Dense_Row.defs.hh | 28 ++-------------------------- src/Dense_Row.inlines.hh | 20 +++----------------- src/Linear_Expression.cc | 2 +- src/Linear_Row.defs.hh | 26 -------------------------- src/Linear_Row.inlines.hh | 19 ++++--------------- src/Linear_System.cc | 4 ++-- src/Sparse_Row.defs.hh | 40 ++-------------------------------------- src/Sparse_Row.inlines.hh | 19 ++++++------------- 9 files changed, 42 insertions(+), 160 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=c85e31fb…

1 0

[GIT] ppl/ppl(master): Dense_Row: simplify the internal representation and implementation.
by Marco Poletti 25 Dec '10

25 Dec '10

Module: ppl/ppl Branch: master Commit: ecffa9a026c3f25847aab7ed89a0c1419f27f5cb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ecffa9a026c3… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Dec 25 10:46:23 2010 +0100 Dense_Row: simplify the internal representation and implementation. --- src/Dense_Matrix.cc | 15 ++ src/Dense_Matrix.inlines.hh | 17 +- src/Dense_Row.cc | 341 ++++++++++++++++++++++++++++--------------- src/Dense_Row.defs.hh | 230 +++-------------------------- src/Dense_Row.inlines.hh | 307 +++++++++++++-------------------------- src/Dense_Row.types.hh | 1 - 6 files changed, 368 insertions(+), 543 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=ecffa9a0…

1 0

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

25 Dec '10

Module: ppl/ppl Branch: sparse_matrices Commit: 9a14cdd6bdea50b6aec9acbaf761161d704d8327 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9a14cdd6bdea… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Dec 25 08:55:40 2010 +0100 Merge branch 'master' into sparse_matrices ---

1 0

[GIT] ppl/ppl(sparse_matrices): Avoid a couple of doxygen warnings.
by Enea Zaffanella 25 Dec '10

25 Dec '10

Module: ppl/ppl Branch: sparse_matrices Commit: e5c712fb857756c993ad2a0c29142f854a5815b6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e5c712fb8577… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 24 12:02:23 2010 +0100 Avoid a couple of doxygen warnings. --- src/Sparse_Row.defs.hh | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/Sparse_Row.defs.hh b/src/Sparse_Row.defs.hh index dc74266..28c50fa 100644 --- a/src/Sparse_Row.defs.hh +++ b/src/Sparse_Row.defs.hh @@ -138,6 +138,9 @@ public: \param n The new size for the row. + \param flags + Flags for the row that will be constructed. + This method, with this signature, is needed for compatibility with Dense_Row. @@ -155,6 +158,9 @@ public: \param capacity This is ignored. + \param flags + Flags for the row that will be constructed. + This method, with this signature, is needed for compatibility with Dense_Row. @@ -201,7 +207,7 @@ public: This method takes \f$O(1)\f$ time. */ - void expand_within_capacity(dimension_type new_size); + void expand_within_capacity(dimension_type n); //! Resizes the row to size \p n. /*!

1 0

[GIT] ppl/ppl(sparse_matrices): Memory leaks fixed.
by Roberto Bagnara 25 Dec '10

25 Dec '10

Module: ppl/ppl Branch: sparse_matrices Commit: bae9231e876e264a8d973ad22ef465f0a1829e02 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bae9231e876e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Dec 24 11:59:17 2010 +0100 Memory leaks fixed. (Patch by Marco Poletti.) --- src/MIP_Problem.templates.hh | 82 ++++++++++++++++++++++++++---------------- 1 files changed, 51 insertions(+), 31 deletions(-) diff --git a/src/MIP_Problem.templates.hh b/src/MIP_Problem.templates.hh index 8997ad3..4b54b9e 100644 --- a/src/MIP_Problem.templates.hh +++ b/src/MIP_Problem.templates.hh @@ -77,22 +77,32 @@ MIP_Problem::MIP_Problem(const dimension_type dim, throw std::invalid_argument(s.str()); } // Check the constraints. - for (In i = first; i != last; ++i) { - if (i->is_strict_inequality()) - throw std::invalid_argument("PPL::MIP_Problem::" - "MIP_Problem(dim, first, last, int_vars," - "obj, mode):\nrange [first, last) contains" - "a strict inequality constraint."); - if (i->space_dimension() > dim) { - std::ostringstream s; - s << "PPL::MIP_Problem::" - << "MIP_Problem(dim, first, last, int_vars, obj, mode):\n" - << "range [first, last) contains a constraint having space" - << "dimension == " << i->space_dimension() << " that exceeds" - "this->space_dimension == " << dim << "."; - throw std::invalid_argument(s.str()); + try { + for (In i = first; i != last; ++i) { + if (i->is_strict_inequality()) + throw std::invalid_argument("PPL::MIP_Problem::" + "MIP_Problem(dim, first, last, int_vars," + "obj, mode):\nrange [first, last) contains" + "a strict inequality constraint."); + if (i->space_dimension() > dim) { + std::ostringstream s; + s << "PPL::MIP_Problem::" + << "MIP_Problem(dim, first, last, int_vars, obj, mode):\n" + << "range [first, last) contains a constraint having space" + << "dimension == " << i->space_dimension() << " that exceeds" + "this->space_dimension == " << dim << "."; + throw std::invalid_argument(s.str()); + } + add_constraint_helper(*i); } - add_constraint_helper(*i); + } catch (...) { + // Delete the allocated constraints, to avoid memory leaks. + + for (Constraint_Sequence::const_iterator + i = input_cs.begin(), i_end = input_cs.end(); i != i_end; ++i) + delete *i; + + throw; } PPL_ASSERT(OK()); } @@ -134,23 +144,33 @@ MIP_Problem::MIP_Problem(dimension_type dim, throw std::invalid_argument(s.str()); } // Check the constraints. - for (In i = first; i != last; ++i) { - if (i->is_strict_inequality()) - throw std::invalid_argument("PPL::MIP_Problem::" - "MIP_Problem(dim, first, last, obj, mode):" - "\n" - "range [first, last) contains a strict " - "inequality constraint."); - if (i->space_dimension() > dim) { - std::ostringstream s; - s << "PPL::MIP_Problem::" - << "MIP_Problem(dim, first, last, obj, mode):\n" - << "range [first, last) contains a constraint having space" - << "dimension" << " == " << i->space_dimension() << " that exceeds" - "this->space_dimension == " << dim << "."; - throw std::invalid_argument(s.str()); + try { + for (In i = first; i != last; ++i) { + if (i->is_strict_inequality()) + throw std::invalid_argument("PPL::MIP_Problem::" + "MIP_Problem(dim, first, last, obj, mode):" + "\n" + "range [first, last) contains a strict " + "inequality constraint."); + if (i->space_dimension() > dim) { + std::ostringstream s; + s << "PPL::MIP_Problem::" + << "MIP_Problem(dim, first, last, obj, mode):\n" + << "range [first, last) contains a constraint having space" + << "dimension" << " == " << i->space_dimension() << " that exceeds" + "this->space_dimension == " << dim << "."; + throw std::invalid_argument(s.str()); + } + add_constraint_helper(*i); } - add_constraint_helper(*i); + } catch (...) { + // Delete the allocated constraints, to avoid memory leaks. + + for (Constraint_Sequence::const_iterator + i = input_cs.begin(), i_end = input_cs.end(); i != i_end; ++i) + delete *i; + + throw; } PPL_ASSERT(OK()); }

1 0