Changeset 330:7ac0d4e8a31c in lemon-0.x for src/work/marci/edmonds_karp_demo.cc

Timestamp:

04/15/04 16:41:20 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

In the resgraphwrapper interface, and in the constructor,
the order of FlowMap? and CapacityMap? is changed.

File:

• src/work/marci/edmonds_karp_demo.cc (modified) (4 diffs)

src/work/marci/edmonds_karp_demo.cc

@@ -105 +105 @@
 
     MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-      max_flow_test(G, s, t, flow, cap);
+      max_flow_test(G, s, t, cap, flow);
     int i=0;
     while (max_flow_test.augmentOnBlockingFlow<MutableGraph>()) { 
@@ -133 +133 @@
 
     MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-      max_flow_test(G, s, t, flow, cap);
+      max_flow_test(G, s, t, cap, flow);
     int i=0;
     while (max_flow_test.augmentOnBlockingFlow1<MutableGraph>()) { 
@@ -161 +161 @@
 
     MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-      max_flow_test(G, s, t, flow, cap);
+      max_flow_test(G, s, t, cap, flow);
     int i=0;
     while (max_flow_test.augmentOnBlockingFlow2()) { 
@@ -189 +189 @@
 
     MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-      max_flow_test(G, s, t, flow, cap);
+      max_flow_test(G, s, t, cap, flow);
     int i=0;
     while (max_flow_test.augmentOnShortestPath()) {