March 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(termination): New commits
by Roberto Bagnara 23 Mar '10

23 Mar '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ef1ccd4fea5b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 22 13:54:43 2010 +0100 Cut exponential execution paths by calls to maybe_abandon(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=55a4822b6ce0… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 22 13:51:56 2010 +0100 All test functions should be declared in the anonymous namespace. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b647339a3a3e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 12:01:52 2010 +0000 Revised exceptions that can be thrown. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=718813cb67fe… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 11:31:29 2010 +0000 Added missing C++ exceptions. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=47b3a6714f3f… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 10:19:29 2010 +0000 Revised to allow for for expected logic_error. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3a684bb36a7a… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Mar 21 19:25:53 2010 +0100 Let test13 compile.

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Tree.cc: fix and optimize merge_assign( ).
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: f4b385706bf8e72fabe551b7a83c6ec5fecddfce URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f4b385706bf8… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 21:47:02 2010 +0100 PIP_Tree.cc: fix and optimize merge_assign(). --- src/PIP_Tree.cc | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 0b2963b..a1d72e4 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -377,31 +377,31 @@ merge_assign(PIP_Tree_Node::matrix_type& x, PPL_ASSERT(y_i->is_nonstrict_inequality()); PIP_Tree_Node::matrix_row_reference_type x_i = x[i]; const Coefficient& inhomogeneous_term = y_i->inhomogeneous_term(); - x_i.assign_if_nonzero(0, inhomogeneous_term); - Variables_Set::const_iterator pj; + PIP_Tree_Node::matrix_row_iterator itr = x_i.end(); + Variables_Set::const_iterator pj = parameters.begin(); dimension_type j = 1; - PIP_Tree_Node::matrix_row_iterator last = x_i.begin(); - for (pj = param_begin; pj != param_end; ++pj, ++j) { - Variable vj(*pj); - if (vj.space_dimension() > cs_space_dim) - break; - const Coefficient& c = y_i->coefficient(vj); - if (c != 0) { - last = x_i.find_create(j, c); - ++pj; - ++j; - break; + if (inhomogeneous_term != 0) + itr = x_i.find_create(0, inhomogeneous_term); + else + if (pj != param_end) { + Variable vj(*pj); + if (vj.space_dimension() <= cs_space_dim) { + const Coefficient& c = y_i->coefficient(vj); + if (c != 0) { + itr = x_i.find_create(j, c); + ++pj; + ++j; + } + } } - } + PPL_ASSERT(pj == param_end || itr != x_i.end()); for ( ; pj != param_end; ++pj, ++j) { Variable vj(*pj); if (vj.space_dimension() > cs_space_dim) break; const Coefficient& c = y_i->coefficient(vj); - if (c != 0) { - last = x_i.find_create(j, c, last); - break; - } + if (c != 0) + itr = x_i.find_create(j, c, itr); } } }

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Tree.cc: use assign_if_nonzero() instead of reinventing the wheel, in merge_assign().
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: b6f85980b898e00fb075730cfb9d7a0856d734df URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b6f85980b898… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 21:36:00 2010 +0100 PIP_Tree.cc: use assign_if_nonzero() instead of reinventing the wheel, in merge_assign(). --- src/PIP_Tree.cc | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index d1b5dcd..0b2963b 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -377,8 +377,7 @@ merge_assign(PIP_Tree_Node::matrix_type& x, PPL_ASSERT(y_i->is_nonstrict_inequality()); PIP_Tree_Node::matrix_row_reference_type x_i = x[i]; const Coefficient& inhomogeneous_term = y_i->inhomogeneous_term(); - if (inhomogeneous_term != 0) - x_i[0] = inhomogeneous_term; + x_i.assign_if_nonzero(0, inhomogeneous_term); Variables_Set::const_iterator pj; dimension_type j = 1; PIP_Tree_Node::matrix_row_iterator last = x_i.begin();

1 0

[GIT] ppl/ppl(sparse_matrices): Dense_Row: added two-argument assign() and assign_if_nonzero().
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 4f2763f9ea5ea650b2c68773eaa41d09375788ab URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4f2763f9ea5e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 21:35:10 2010 +0100 Dense_Row: added two-argument assign() and assign_if_nonzero(). --- src/Dense_Row.defs.hh | 8 ++++++++ src/Dense_Row.inlines.hh | 11 +++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/Dense_Row.defs.hh b/src/Dense_Row.defs.hh index 895499c..ba04ad7 100644 --- a/src/Dense_Row.defs.hh +++ b/src/Dense_Row.defs.hh @@ -225,6 +225,14 @@ public: */ void normalize(); + //! After this call, get(i) == x. + //! Provided for compatibility with Sparse_Row. + void assign(dimension_type i, const Coefficient& x); + + //! Equivalent to <CODE>if (x != 0) find_create(i, x);</CODE>, provided + //! for convenience. Provided for compatibility with Sparse_Row. + void assign_if_nonzero(dimension_type i, const Coefficient& x); + PPL_OUTPUT_DECLARATIONS /*! \brief diff --git a/src/Dense_Row.inlines.hh b/src/Dense_Row.inlines.hh index 895111c..28152ce 100644 --- a/src/Dense_Row.inlines.hh +++ b/src/Dense_Row.inlines.hh @@ -250,6 +250,17 @@ Dense_Row::normalize() { } inline void +Dense_Row::assign(dimension_type i, const Coefficient& x) { + (*this)[i] = x; +} + +inline void +Dense_Row::assign_if_nonzero(dimension_type i, const Coefficient& x) { + if (x != 0) + (*this)[i] = x; +} + +inline void Dense_Row::ascii_dump(std::ostream& s) const { row.ascii_dump(s); }

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Tree.cc: add an optimized version of sub_assign() for sparse backends with slow insertions.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 9ffce899fb3f1f0a87af578413d80b762009dfb6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9ffce899fb3f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 21:23:32 2010 +0100 PIP_Tree.cc: add an optimized version of sub_assign() for sparse backends with slow insertions. --- src/PIP_Tree.cc | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index cbe6925..d1b5dcd 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -200,6 +200,8 @@ add_mul_assign_row(PIP_Tree_Node::matrix_row_reference_type x, #endif // !defined(PPL_SPARSE_BACKEND_SLOW_INSERTIONS) +#ifndef PPL_SPARSE_BACKEND_SLOW_INSERTIONS + // Compute x -= y inline void sub_assign(PIP_Tree_Node::matrix_row_reference_type x, @@ -284,6 +286,74 @@ sub_assign(PIP_Tree_Node::matrix_row_reference_type x, } } +#else // !defined(PPL_SPARSE_BACKEND_SLOW_INSERTIONS) + +// Compute x -= y +inline void +sub_assign(PIP_Tree_Node::matrix_row_reference_type x, + PIP_Tree_Node::matrix_row_const_reference_type y) { + PIP_Tree_Node::matrix_row_copy_type row(x.size()); + PIP_Tree_Node::matrix_row_copy_iterator itr = row.end(); + PIP_Tree_Node::matrix_row_const_iterator i = x.begin(); + PIP_Tree_Node::matrix_row_const_iterator i_end = x.end(); + PIP_Tree_Node::matrix_const_row_const_iterator j = y.begin(); + PIP_Tree_Node::matrix_const_row_const_iterator j_end = y.end(); + if (i == i_end && j == j_end) + return; + if (j == j_end + || (i != i_end && (*i).first < (*j).first)) { + itr = row.find_create(*i); + ++i; + } else + if (i == i_end + || (j != j_end && (*i).first > (*j).first)) { + itr = row.find_create(*j); + neg_assign((*itr).second); + ++j; + } else { + PPL_ASSERT(i != i_end); + PPL_ASSERT(j != j_end); + PPL_ASSERT((*i).first == (*j).first); + itr = row.find_create(*i); + (*itr).second -= (*j).second; + ++i; + ++j; + } + PPL_ASSERT(itr != row.end()); + while (i != i_end && j != j_end) { + if ((*i).first < (*j).first) { + itr = row.find_create(*i,itr); + ++i; + } else { + if ((*i).first > (*j).first) { + itr = row.find_create(*j,itr); + neg_assign((*itr).second); + ++j; + } else { + PPL_ASSERT((*i).first == (*j).first); + itr = row.find_create(*i,itr); + (*itr).second -= (*j).second; + ++i; + ++j; + } + } + } + while (i != i_end) { + itr = row.find_create(*i,itr); + ++i; + } + PPL_ASSERT(i == i_end); + while (j != j_end) { + itr = row.find_create(*j,itr); + neg_assign((*itr).second); + ++j; + } + PPL_ASSERT(j == j_end); + std::swap(row,x); +} + +#endif // !defined(PPL_SPARSE_BACKEND_SLOW_INSERTIONS) + // Merge constraint system to a Matrix-form context such as x = x U y void merge_assign(PIP_Tree_Node::matrix_type& x,

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Tree.cc: fix optimized version of add_mul_assign_row().
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: cc3261c876763af7a2ff7df334e35b1a978b889f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cc3261c87676… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 21:22:36 2010 +0100 PIP_Tree.cc: fix optimized version of add_mul_assign_row(). --- src/PIP_Tree.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index f55a4e7..cbe6925 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -150,7 +150,7 @@ add_mul_assign_row(PIP_Tree_Node::matrix_row_reference_type x, ++i; } else if (i == i_end - || (j != j_end && (*i).first < (*j).first)) { + || (j != j_end && (*i).first > (*j).first)) { itr = row.find_create(*j); (*itr).second *= c; ++j;

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Tree.cc: add an optimized version of add_mul_assign_row() for sparse backends with slow insertions.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: e52cabe4d862e6b82bb5e8055435eed58797e202 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e52cabe4d862… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 21:14:00 2010 +0100 PIP_Tree.cc: add an optimized version of add_mul_assign_row() for sparse backends with slow insertions. --- src/PIP_Tree.cc | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 2cd3578..f55a4e7 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -42,6 +42,8 @@ mod_assign(Coefficient& z, z += y; } +#ifndef PPL_SPARSE_BACKEND_SLOW_INSERTIONS + // Compute x += c * y inline void add_mul_assign_row(PIP_Tree_Node::matrix_row_reference_type x, @@ -127,6 +129,77 @@ add_mul_assign_row(PIP_Tree_Node::matrix_row_reference_type x, } } +#else // !defined(PPL_SPARSE_BACKEND_SLOW_INSERTIONS) + +// Compute x += c * y +inline void +add_mul_assign_row(PIP_Tree_Node::matrix_row_reference_type x, + Coefficient_traits::const_reference c, + PIP_Tree_Node::matrix_row_const_reference_type y) { + PIP_Tree_Node::matrix_row_copy_type row(x.size()); + PIP_Tree_Node::matrix_row_copy_iterator itr = row.end(); + PIP_Tree_Node::matrix_row_const_iterator i = x.begin(); + PIP_Tree_Node::matrix_row_const_iterator i_end = x.end(); + PIP_Tree_Node::matrix_const_row_const_iterator j = y.begin(); + PIP_Tree_Node::matrix_const_row_const_iterator j_end = y.end(); + if (i == i_end && j == j_end) + return; + if (j == j_end + || (i != i_end && (*i).first < (*j).first)) { + itr = row.find_create(*i); + ++i; + } else + if (i == i_end + || (j != j_end && (*i).first < (*j).first)) { + itr = row.find_create(*j); + (*itr).second *= c; + ++j; + } else { + PPL_ASSERT(i != i_end); + PPL_ASSERT(j != j_end); + PPL_ASSERT((*i).first == (*j).first); + itr = row.find_create(*j); + (*itr).second *= c; + (*itr).second += (*i).second; + ++i; + ++j; + } + PPL_ASSERT(itr != row.end()); + while (i != i_end && j != j_end) { + if ((*i).first < (*j).first) { + itr = row.find_create(*i,itr); + ++i; + } else { + if ((*i).first > (*j).first) { + itr = row.find_create(*j,itr); + (*itr).second *= c; + ++j; + } else { + PPL_ASSERT((*i).first == (*j).first); + itr = row.find_create(*j,itr); + (*itr).second *= c; + (*itr).second += (*i).second; + ++i; + ++j; + } + } + } + while (i != i_end) { + itr = row.find_create(*i,itr); + ++i; + } + PPL_ASSERT(i == i_end); + while (j != j_end) { + itr = row.find_create(*j,itr); + (*itr).second *= c; + ++j; + } + PPL_ASSERT(j == j_end); + std::swap(row,x); +} + +#endif // !defined(PPL_SPARSE_BACKEND_SLOW_INSERTIONS) + // Compute x -= y inline void sub_assign(PIP_Tree_Node::matrix_row_reference_type x,

1 0

[GIT] ppl/ppl(sparse_matrices): Indentation fixes.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: d03e637794519c09824b92e0ebcab88f0e208893 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d03e63779451… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 14:34:04 2010 +0100 Indentation fixes. --- src/PIP_Problem.cc | 18 +++++++++--------- src/PIP_Problem.templates.hh | 5 ++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index c24e57c..3c6f9ca 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -610,9 +610,9 @@ PPL::PIP_Problem } if (should_throw) throw std::length_error("PPL::PIP_Problem::" - "add_space_dimensions_and_embed(m_v, m_p):\n" - "adding m_v+m_p new space dimensions exceeds " - "the maximum allowed space dimension."); + "add_space_dimensions_and_embed(m_v, m_p):\n" + "adding m_v+m_p new space dimensions exceeds " + "the maximum allowed space dimension."); // First add PIP variables ... external_space_dim += m_vars; // ... then add PIP parameters. @@ -631,9 +631,9 @@ PPL::PIP_Problem ::add_to_parameter_space_dimensions(const Variables_Set& p_vars) { if (p_vars.space_dimension() > external_space_dim) throw std::invalid_argument("PPL::PIP_Problem::" - "add_to_parameter_space_dimension(p_vars):\n" - "*this and p_vars are dimension " - "incompatible."); + "add_to_parameter_space_dimension(p_vars):\n" + "*this and p_vars are dimension " + "incompatible."); const dimension_type original_size = parameters.size(); parameters.insert(p_vars.begin(), p_vars.end()); // Do not allow to turn variables into parameters. @@ -641,8 +641,8 @@ PPL::PIP_Problem end = p_vars.end(); p != end; ++p) { if (*p < internal_space_dim) { throw std::invalid_argument("PPL::PIP_Problem::" - "add_to_parameter_space_dimension(p_vars):" - "p_vars contain variable indices."); + "add_to_parameter_space_dimension(p_vars):" + "p_vars contain variable indices."); } } @@ -725,7 +725,7 @@ PPL::PIP_Problem::external_memory_in_bytes() const { // Adding the external memory for `input_cs'. n += input_cs.capacity() * sizeof(Constraint); for (const_iterator i = input_cs.begin(), - i_end = input_cs.end(); i != i_end; ++i) + i_end = input_cs.end(); i != i_end; ++i) n += (i->external_memory_in_bytes()); // FIXME: Adding the external memory for `parameters'. n += parameters.size() * sizeof(dimension_type); diff --git a/src/PIP_Problem.templates.hh b/src/PIP_Problem.templates.hh index 9faa49d..4781182 100644 --- a/src/PIP_Problem.templates.hh +++ b/src/PIP_Problem.templates.hh @@ -29,9 +29,8 @@ namespace Parma_Polyhedra_Library { template <typename In> PIP_Problem::PIP_Problem(dimension_type dim, - In first, - In last, - const Variables_Set& p_vars) + In first, In last, + const Variables_Set& p_vars) : external_space_dim(dim), internal_space_dim(0), status(PARTIALLY_SATISFIABLE),

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Problem: fix border-case in solve() method.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: ae3a65ca5a53cf39b74b95b5450e7c52c5ccc5d4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ae3a65ca5a53… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 14:31:34 2010 +0100 PIP_Problem: fix border-case in solve() method. --- src/PIP_Problem.cc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index 5bb4ed4..c24e57c 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -183,8 +183,10 @@ PPL::PIP_Problem::solve() const { ++i; break; } - } else + } else { continue_looping = false; + break; + } } if (continue_looping) { for ( ; pi != param_end; ++pi, ++i) {

1 0

[GIT] ppl/ppl(sparse_matrices): MIP_Problem: indentation fixes.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 6a0581c0733ca545f6812e01bd70ded9a03ee093 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6a0581c0733c… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 14:20:35 2010 +0100 MIP_Problem: indentation fixes. --- src/MIP_Problem.templates.hh | 104 +++++++++++++++++++++--------------------- 1 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/MIP_Problem.templates.hh b/src/MIP_Problem.templates.hh index 2dc137d..2a15b10 100644 --- a/src/MIP_Problem.templates.hh +++ b/src/MIP_Problem.templates.hh @@ -29,11 +29,10 @@ namespace Parma_Polyhedra_Library { template <typename In> MIP_Problem::MIP_Problem(const dimension_type dim, - In first, - In last, - const Variables_Set& int_vars, - const Linear_Expression& obj, - const Optimization_Mode mode) + In first, In last, + const Variables_Set& int_vars, + const Linear_Expression& obj, + const Optimization_Mode mode) : external_space_dim(dim), internal_space_dim(0), tableau(), @@ -61,47 +60,47 @@ MIP_Problem::MIP_Problem(const dimension_type dim, throw std::invalid_argument(s.str()); } - // Check for space dimension overflow. - if (dim > max_space_dimension()) - throw std::length_error("PPL::MIP_Problem:: MIP_Problem(dim, first, " - "last, int_vars, obj, mode):\n" - "dim exceeds the maximum allowed" - "space dimension."); - // Check the objective function. - if (obj.space_dimension() > dim) { - std::ostringstream s; - s << "PPL::MIP_Problem::MIP_Problem(dim, first, last," - << "int_vars, obj, mode):\n" - << "obj.space_dimension() == "<< obj.space_dimension() - << " exceeds d == "<< 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()); - } - input_cs.push_back(*i); - } - PPL_ASSERT(OK()); + // Check for space dimension overflow. + if (dim > max_space_dimension()) + throw std::length_error("PPL::MIP_Problem:: MIP_Problem(dim, first, " + "last, int_vars, obj, mode):\n" + "dim exceeds the maximum allowed" + "space dimension."); + // Check the objective function. + if (obj.space_dimension() > dim) { + std::ostringstream s; + s << "PPL::MIP_Problem::MIP_Problem(dim, first, last," + << "int_vars, obj, mode):\n" + << "obj.space_dimension() == "<< obj.space_dimension() + << " exceeds d == "<< 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()); + } + input_cs.push_back(*i); + } + PPL_ASSERT(OK()); } template <typename In> MIP_Problem::MIP_Problem(dimension_type dim, - In first, In last, - const Linear_Expression& obj, - Optimization_Mode mode) + In first, In last, + const Linear_Expression& obj, + Optimization_Mode mode) : external_space_dim(dim), internal_space_dim(0), tableau(), @@ -120,9 +119,9 @@ MIP_Problem::MIP_Problem(dimension_type dim, // Check for space dimension overflow. if (dim > max_space_dimension()) throw std::length_error("PPL::MIP_Problem::" - "MIP_Problem(dim, first, last, obj, mode):\n" - "dim exceeds the maximum allowed space " - "dimension."); + "MIP_Problem(dim, first, last, obj, mode):\n" + "dim exceeds the maximum allowed space " + "dimension."); // Check the objective function. if (obj.space_dimension() > dim) { std::ostringstream s; @@ -136,16 +135,17 @@ MIP_Problem::MIP_Problem(dimension_type dim, 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."); + "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 << "."; + << "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()); } input_cs.push_back(*i);

1 0