Changeset 311:6635b11938fe in lemon-0.x for src/work/marci/edmonds_karp.h

Timestamp:

04/06/04 14:00:34 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

gw

File:

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

src/work/marci/edmonds_karp.h

@@ -10 +10 @@
 #include <invalid.h>
 #include <graph_wrapper.h>
+#include <maps.h>
 
 namespace hugo {
@@ -354 +355 @@
 
       MG F;
-      typedef SubGraphWrapper<ResGW, DistanceMap<ResGW> > FilterResGW;
-      FilterResGW filter_res_graph(res_graph, dist);
+      ConstMap<typename ResGW::Node, bool> true_map(true);
+      typedef SubGraphWrapper<ResGW, ConstMap<typename ResGW::Node, bool>, 
+        DistanceMap<ResGW> > FilterResGW;
+      FilterResGW filter_res_graph(res_graph, true_map, dist);
       typename ResGW::NodeMap<typename MG::Node> res_graph_to_F(res_graph);
       {
@@ -568 +571 @@
 
       //Subgraph containing the edges on some shortest paths
-      typedef SubGraphWrapper<ResGW, DistanceMap<ResGW> > FilterResGW;
-      FilterResGW filter_res_graph(res_graph, dist);
+      ConstMap<typename ResGW::Node, bool> true_map(true);
+      typedef SubGraphWrapper<ResGW, ConstMap<typename ResGW::Node, bool>, 
+        DistanceMap<ResGW> > FilterResGW;
+      FilterResGW filter_res_graph(res_graph, true_map, dist);
 
       //Subgraph, which is able to delete edges which are already 
@@ -592 +597 @@
 
         __augment=false;
-        //computing blocking flow with dfs
+        //computing blocking flow with dfs
         typedef typename ErasingResGW::NodeMap<bool> BlockingReachedMap;
-        DfsIterator5< ErasingResGW, BlockingReachedMap > 
-          dfs(erasing_res_graph);
+        DfsIterator5< ErasingResGW, BlockingReachedMap > 
+          dfs(erasing_res_graph);
         typename ErasingResGW::NodeMap<typename ErasingResGW::OutEdgeIt> 
           pred(erasing_res_graph); 
         pred.set(s, INVALID);
-        //invalid iterators for sources
-
-        typename ErasingResGW::NodeMap<Number> free(erasing_res_graph);
+        //invalid iterators for sources
+
+        typename ErasingResGW::NodeMap<Number> free(erasing_res_graph);
 
         dfs.pushAndSetReached(s);
@@ -609 +614 @@
                 /*typename ErasingResGW::OutEdgeIt*/(dfs))) 
           { 
-            if (dfs.isBNodeNewlyReached()) {
+            if (dfs.isBNodeNewlyReached()) {
           
               typename ErasingResGW::Node v=erasing_res_graph.aNode(dfs);
@@ -626 +631 @@
                 break; 
               }
-            } else {
-              erasing_res_graph.erase(dfs);
+            } else {
+              erasing_res_graph.erase(dfs);
             }
           }
         }       
 
-        if (__augment) {
-          typename ErasingResGW::Node n=t;
+        if (__augment) {
+          typename ErasingResGW::Node n=t;
           Number augment_value=free[n];
           while (erasing_res_graph.valid(pred[n])) { 
@@ -641 +646 @@
             if (res_graph.resCap(e)==0)
               erasing_res_graph.erase(e);
-          }
-        }
+        }
+      }
       
       } //while (__augment)