1.1 --- a/src/work/marci/edmonds_karp_demo.cc Thu Apr 15 08:06:43 2004 +0000
1.2 +++ b/src/work/marci/edmonds_karp_demo.cc Thu Apr 15 14:41:20 2004 +0000
1.3 @@ -104,7 +104,7 @@
1.4 ts.reset();
1.5
1.6 MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
1.7 - max_flow_test(G, s, t, flow, cap);
1.8 + max_flow_test(G, s, t, cap, flow);
1.9 int i=0;
1.10 while (max_flow_test.augmentOnBlockingFlow<MutableGraph>()) {
1.11 // for(EdgeIt e=G.template first<EdgeIt>(); e.valid(); ++e) {
1.12 @@ -132,7 +132,7 @@
1.13 ts.reset();
1.14
1.15 MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
1.16 - max_flow_test(G, s, t, flow, cap);
1.17 + max_flow_test(G, s, t, cap, flow);
1.18 int i=0;
1.19 while (max_flow_test.augmentOnBlockingFlow1<MutableGraph>()) {
1.20 // for(EdgeIt e=G.template first<EdgeIt>(); e.valid(); ++e) {
1.21 @@ -160,7 +160,7 @@
1.22 ts.reset();
1.23
1.24 MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
1.25 - max_flow_test(G, s, t, flow, cap);
1.26 + max_flow_test(G, s, t, cap, flow);
1.27 int i=0;
1.28 while (max_flow_test.augmentOnBlockingFlow2()) {
1.29 // for(EdgeIt e=G.template first<EdgeIt>(); e.valid(); ++e) {
1.30 @@ -188,7 +188,7 @@
1.31 ts.reset();
1.32
1.33 MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
1.34 - max_flow_test(G, s, t, flow, cap);
1.35 + max_flow_test(G, s, t, cap, flow);
1.36 int i=0;
1.37 while (max_flow_test.augmentOnShortestPath()) {
1.38 // for(EdgeIt e=G.template first<EdgeIt>(); e.valid(); ++e) {