Changeset 2526:b7727edd44f2 in lemon-0.x for lemon/cycle_canceling.h

Timestamp:

11/28/07 18:51:02 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Redesign Circulation interface according to new flow interface
New greedy approach initialization

File:

• lemon/cycle_canceling.h (modified) (1 diff)

lemon/cycle_canceling.h

@@ -324 +324 @@
 
       // Finding a feasible flow
-      Circulation< Graph, Capacity, FlowMap, ConstMap<Edge, Capacity>,
-                   CapacityRefMap, SupplyMap >
+      Circulation< Graph, Capacity, ConstMap<Edge, Capacity>,
+        CapacityRefMap, SupplyMap >::DefFlowMap<FlowMap>::Create
         circulation( graph, constMap<Edge>((Capacity)0),
-                     capacity, supply, flow );
-      return circulation.run() == -1;
+                     capacity, supply);
+      circulation.flowMap(flowMap);
+      return circulation.run();
     }