Changeset 317:6e6db1c49bc1 in lemon-0.x for src/work/marci/edmonds_karp.h

Timestamp:

04/13/04 22:35:47 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

gw

File:

• src/work/marci/edmonds_karp.h (modified) (3 diffs)

src/work/marci/edmonds_karp.h

@@ -600 +600 @@
         //invalid iterators for sources
 
-        typename ErasingResGW::NodeMap<Number> free(erasing_res_graph);
-
-        dfs.pushAndSetReached(s);
+        typename ErasingResGW::NodeMap<Number> free1(erasing_res_graph);
+
+        dfs.pushAndSetReached(
+          typename ErasingResGW::Node(
+            typename FilterResGW::Node(
+              typename ResGW::Node(s)
+              )
+            )
+          );
         while (!dfs.finished()) {
           ++dfs;
           if (erasing_res_graph.valid(
-                /*typename ErasingResGW::OutEdgeIt*/(dfs))) 
+                typename ErasingResGW::OutEdgeIt(dfs))) 
           { 
             if (dfs.isBNodeNewlyReached()) {
@@ -615 +621 @@
               pred.set(w, /*typename ErasingResGW::OutEdgeIt*/(dfs));
               if (erasing_res_graph.valid(pred[v])) {
-                free.set(w, std::min(free[v], res_graph.resCap(dfs)));
+                free1.set(w, std::min(free1[v], res_graph.resCap(
+                                       typename ErasingResGW::OutEdgeIt(dfs))));
               } else {
-                free.set(w, res_graph.resCap(dfs)); 
+                free1.set(w, res_graph.resCap(
+                           typename ErasingResGW::OutEdgeIt(dfs))); 
               }
               
@@ -632 +640 @@
 
         if (__augment) {
-          typename ErasingResGW::Node n=t;
-          Number augment_value=free[n];
+          typename ErasingResGW::Node n=typename FilterResGW::Node(typename ResGW::Node(t));
+//        typename ResGW::NodeMap<Number> a(res_graph);
+//        typename ResGW::Node b;
+//        Number j=a[b];
+//        typename FilterResGW::NodeMap<Number> a1(filter_res_graph);
+//        typename FilterResGW::Node b1;
+//        Number j1=a1[b1];
+//        typename ErasingResGW::NodeMap<Number> a2(erasing_res_graph);
+//        typename ErasingResGW::Node b2;
+//        Number j2=a2[b2];
+          Number augment_value=free1[n];
           while (erasing_res_graph.valid(pred[n])) { 
             typename ErasingResGW::OutEdgeIt e=pred[n];