1.1 --- a/lemon/min_cost_max_flow.h	Sat Nov 17 20:58:11 2007 +0000
     1.2 +++ b/lemon/min_cost_max_flow.h	Sat Nov 17 21:41:01 2007 +0000
     1.3 @@ -92,7 +92,7 @@
     1.4      /// \brief The edge map of the found flow.
     1.5      FlowMap flow;
     1.6  
     1.7 -    typedef Preflow<Graph, Capacity, CapacityMap, FlowMap> PreflowImpl;
     1.8 +    typedef Preflow<Graph, CapacityMap> PreflowImpl;
     1.9      /// \brief \ref lemon::Preflow "Preflow" class for finding the
    1.10      /// maximum flow value.
    1.11      PreflowImpl preflow;
    1.12 @@ -114,7 +114,7 @@
    1.13  		    Node _s, Node _t ) :
    1.14        graph(_graph), capacity(_capacity), cost(_cost),
    1.15        source(_s), target(_t), flow(_graph),
    1.16 -      preflow(_graph, _s, _t, _capacity, flow)
    1.17 +      preflow(_graph, _capacity, _s, _t)
    1.18      {}
    1.19  
    1.20      /// \brief Returns a const reference to the flow map.
    1.21 @@ -141,7 +141,8 @@
    1.22  
    1.23      /// \brief Runs the algorithm.
    1.24      void run() {
    1.25 -      preflow.phase1();
    1.26 +      preflow.flowMap(flow);
    1.27 +      preflow.runMinCut();
    1.28        MinCostFlowImpl mcf_impl( graph, capacity, cost,
    1.29  				source, target, preflow.flowValue() );
    1.30        mcf_impl.run();