diff -r b217fc69f913 -r 1765ff9fefa1 src/work/marci/lp/max_flow_expression.cc --- a/src/work/marci/lp/max_flow_expression.cc Wed Feb 16 16:17:30 2005 +0000 +++ b/src/work/marci/lp/max_flow_expression.cc Wed Feb 16 21:40:16 2005 +0000 @@ -82,4 +82,28 @@ } lp.solveSimplex(); cout << "elapsed time: " << ts << endl; +// cout << "rows:" << endl; +// for ( +// LPSolver::Rows::ClassIt i(lp.row_iter_map, 0); +// i!=INVALID; +// ++i) { +// cout << i << " "; +// } +// cout << endl; +// cout << "cols:" << endl; +// for ( +// LPSolver::Cols::ClassIt i(lp.col_iter_map, 0); +// i!=INVALID; +// ++i) { +// cout << i << " "; +// } +// cout << endl; + lp.setMIP(); + cout << "elapsed time: " << ts << endl; + for (LPSolver::Cols::ClassIt it(lp.col_iter_map ,1); it!=INVALID; ++it) { + lp.setColInt(it); + } + cout << "elapsed time: " << ts << endl; + lp.solveBandB(); + cout << "elapsed time: " << ts << endl; }