1.1 --- a/src/work/marci/lp/min_cost_gen_flow.h Tue Jan 11 09:15:25 2005 +0000
1.2 +++ b/src/work/marci/lp/min_cost_gen_flow.h Tue Jan 11 17:15:46 2005 +0000
1.3 @@ -14,7 +14,7 @@
1.4 //#include <augmenting_flow.h>
1.5 //#include <preflow_res.h>
1.6 #include <work/marci/merge_node_graph_wrapper.h>
1.7 -#include <work/marci/lp/lp_solver_wrapper_2.h>
1.8 +#include <work/marci/lp/lp_solver_wrapper_3.h>
1.9
1.10 namespace lemon {
1.11
1.12 @@ -228,6 +228,12 @@
1.13 lp.setColBounds(col_it, LPX_DB, lcapacity[e], capacity[e]);
1.14 lp.setObjCoef(col_it, cost[e]);
1.15 }
1.16 + LPSolver::ColIt col_it;
1.17 + for (lp.col_iter_map.first(col_it, lp.VALID_CLASS);
1.18 + lp.col_iter_map.valid(col_it);
1.19 + lp.col_iter_map.next(col_it)) {
1.20 + std::cout << "ize " << lp.col_iter_map[col_it] << std::endl;
1.21 + }
1.22 for (typename Graph::NodeIt n(g); n!=INVALID; ++n) {
1.23 typename Graph::template EdgeMap<Num> coeffs(g, 0);
1.24 for (typename Graph::InEdgeIt e(g, n); e!=INVALID; ++e)
1.25 @@ -244,6 +250,7 @@
1.26 }
1.27 }
1.28 //std::cout << std::endl;
1.29 + std::cout << " " << g.id(n) << " " << row.size() << std::endl;
1.30 lp.setRowCoeffs(row_it, row.begin(), row.end());
1.31 lp.setRowBounds(row_it, LPX_FX, 0.0, 0.0);
1.32 }