Module: ppl/ppl Branch: master Commit: 876b91f81ffc77c5fdbc0ca3935e6025f1853e9a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=876b91f81ffc7...

Author: Enea Zaffanella zaffanella@cs.unipr.it Date: Thu Feb 23 15:37:18 2012 +0100

Avoid implicit conversion changing signedness. Detected by ECLAIR service utypflag.

---

src/MIP_Problem.cc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index e3ad951..83eeeb8 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -744,13 +744,14 @@ PPL::MIP_Problem::process_pending_constraints() { // * number of non-pending constraints that are no longer satisfied // due to re-merging of split variables.

- dimension_type num_satisfied_inequalities - = std::count(is_satisfied_inequality.begin(), - is_satisfied_inequality.end(), - true); + const dimension_type num_satisfied_inequalities + = static_cast<dimension_type>(std::count(is_satisfied_inequality.begin(), + is_satisfied_inequality.end(), + true)); const dimension_type unfeasible_tableau_rows_size = unfeasible_tableau_rows.size();

+ PPL_ASSERT(additional_tableau_rows >= num_satisfied_inequalities); const dimension_type additional_artificial_vars = (additional_tableau_rows - num_satisfied_inequalities) + unfeasible_tableau_rows_size;