Module: ppl/ppl Branch: MPI Commit: 316e8514be96641ad7a3b9e8ff9f545011c74d67 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=316e8514be966...
Author: Marco Poletti poletti.marco@gmail.com Date: Sun Sep 12 08:58:40 2010 +0200
MIP_Problem: use Distributed_Sparse_Matrix::exact_entering_index().
---
src/MIP_Problem.cc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index d5a7566..1069730 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -1176,7 +1176,8 @@ PPL::dimension_type PPL::MIP_Problem::steepest_edge_exact_entering_index() const { #if USE_PPL_DISTRIBUTED_SPARSE_MATRIX PPL_ASSERT(distributed_tableau == tableau); -#endif + return distributed_tableau.exact_entering_index(working_cost); +#else // !USE_PPL_DISTRIBUTED_SPARSE_MATRIX const dimension_type tableau_num_rows = tableau.num_rows(); PPL_ASSERT(tableau_num_rows == base.size()); // The square of the lcm of all the coefficients of variables in base. @@ -1332,6 +1333,8 @@ PPL::MIP_Problem::steepest_edge_exact_entering_index() const { #endif // !USE_PPL_SPARSE_MATRIX
return entering_index; + +#endif // !USE_PPL_DISTRIBUTED_SPARSE_MATRIX }