Changeset 2515:caa640aa9a7e in lemon-0.x

Timestamp:

11/17/07 22:41:01 (16 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3380

Message:

Changing max flow interface

File:

• lemon/min_cost_max_flow.h (modified) (3 diffs)

lemon/min_cost_max_flow.h

@@ -93 +93 @@
     FlowMap flow;
 
-    typedef Preflow<Graph, Capacity, CapacityMap, FlowMap> PreflowImpl;
+    typedef Preflow<Graph, CapacityMap> PreflowImpl;
     /// \brief \ref lemon::Preflow "Preflow" class for finding the
     /// maximum flow value.
@@ -115 +115 @@
       graph(_graph), capacity(_capacity), cost(_cost),
       source(_s), target(_t), flow(_graph),
-      preflow(_graph, _s, _t, _capacity, flow)
+      preflow(_graph, _capacity, _s, _t)
     {}
 
@@ -142 +142 @@
     /// \brief Runs the algorithm.
     void run() {
-      preflow.phase1();
+      preflow.flowMap(flow);
+      preflow.runMinCut();
       MinCostFlowImpl mcf_impl( graph, capacity, cost,
                                 source, target, preflow.flowValue() );