1.1 --- a/src/work/marci/lp/min_cost_gen_flow.h	Mon Dec 06 00:30:44 2004 +0000
     1.2 +++ b/src/work/marci/lp/min_cost_gen_flow.h	Mon Dec 06 11:56:10 2004 +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.h>
     1.8 +#include <work/marci/lp/lp_solver_wrapper_2.h>
     1.9  
    1.10  namespace lemon {
    1.11  
    1.12 @@ -211,10 +211,11 @@
    1.13        return (expected>=min_cost_flow.flowValue());
    1.14      }
    1.15      void runByLP() {
    1.16 -      LPSolverWrapper lp;
    1.17 +      typedef LPSolverWrapper LPSolver;
    1.18 +      LPSolver lp;
    1.19        lp.setMinimize();
    1.20 -      typedef LPSolverWrapper::ColIt ColIt;
    1.21 -      typedef LPSolverWrapper::RowIt RowIt;
    1.22 +      typedef LPSolver::ColIt ColIt;
    1.23 +      typedef LPSolver::RowIt RowIt;
    1.24        typedef typename Graph::template EdgeMap<ColIt> EdgeIndexMap;
    1.25        EdgeIndexMap edge_index_map(g);
    1.26        PrimalMap<typename Graph::Edge, EdgeIndexMap> lp_flow(lp, edge_index_map);