Module: ppl/ppl Branch: master Commit: 46655e57eb7d63ccf42ee7ed51cb74139c7a3aca URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=46655e57eb7d6...
Author: Marco Poletti poletti.marco@gmail.com Date: Tue Sep 7 19:05:39 2010 +0200
MIP_Problem: fix some debug messages and comments, in OK().
---
src/MIP_Problem.cc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index f603f4a..c122db4 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -2330,13 +2330,13 @@ PPL::MIP_Problem::OK() const { matrix_type::row_type::const_iterator itr = tableau_j.begin(); matrix_type::row_type::const_iterator itr_end = tableau_j.end(); for ( ; i != i_end && itr != itr_end; ++i) { - // tableau[i][base[i]] must be different from zero. - // tableau[i][base[j]], with i different from j, must not be a zero. + // tableau[i][base[j]], with i different from j, must be zero. if (itr.index() < i->first) itr = tableau_j.lower_bound(itr, itr.index()); if (i->second != j && itr.index() == i->first && *itr != 0) { #ifndef NDEBUG - cerr << "tableau[i][base[i]] must be different from zero" << endl; + cerr << "tableau[i][base[j]], with i different from j, must be " + << "zero" << endl; ascii_dump(cerr); #endif return false; @@ -2344,11 +2344,11 @@ PPL::MIP_Problem::OK() const { } } } + // tableau[i][base[i]] must not be a zero. for (dimension_type i = base.size(); i-- > 0; ) { if (tableau[i].get(base[i]) == 0) { #ifndef NDEBUG - cerr << "tableau[i][base[j]], with i different from j, must not be " - << "a zero" << endl; + cerr << "tableau[i][base[i]] must not be a zero" << endl; ascii_dump(cerr); #endif return false;