Changeset 360:91fba31268d6 in lemon-0.x for src/work/marci/edmonds_karp.h

Timestamp:

04/21/04 17:14:45 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

work/marci/bfs_iterator.h BfsIterator5 -> BfsIterator?, DfsIterator5 -> DfsIterator?

File:

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

src/work/marci/edmonds_karp.h

@@ -276 +276 @@
       bool _augment=false;
       
-      BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
+      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
       bfs.pushAndSetReached(s);
         
@@ -340 +340 @@
       ResGW res_graph(*g, *capacity, *flow);
 
-      BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
+      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
 
       bfs.pushAndSetReached(s);
@@ -392 +392 @@
         //computing blocking flow with dfs
 
-        DfsIterator5< MG, typename MG::NodeMap<bool> > dfs(F);
+        DfsIterator< MG, typename MG::NodeMap<bool> > dfs(F);
         typename MG::NodeMap<typename MG::Edge> pred(F);
         pred.set(sF, INVALID);
@@ -450 +450 @@
 
       //bfs for distances on the residual graph
-      BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
+      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
       bfs.pushAndSetReached(s);
       typename ResGW::NodeMap<int> dist(res_graph); //filled up with 0's
@@ -498 +498 @@
         __augment=false;
         //computing blocking flow with dfs
-        DfsIterator5< MG, typename MG::NodeMap<bool> > dfs(F);
+        DfsIterator< MG, typename MG::NodeMap<bool> > dfs(F);
         typename MG::NodeMap<typename MG::Edge> pred(F);
         pred.set(sF, INVALID);
@@ -554 +554 @@
       ResGW res_graph(*g, *capacity, *flow);
 
-      BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
+      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
 
       bfs.pushAndSetReached(s);
@@ -594 +594 @@
         __augment=false;
         //computing blocking flow with dfs
-        DfsIterator5< ErasingResGW, typename ErasingResGW::NodeMap<bool> > 
+        DfsIterator< ErasingResGW, typename ErasingResGW::NodeMap<bool> > 
           dfs(erasing_res_graph);
         typename ErasingResGW::NodeMap<typename ErasingResGW::OutEdgeIt> 
@@ -729 +729 @@
       
 //       typedef typename AugGraph::NodeMap<bool> ReachedMap;
-//       BfsIterator5< AugGraph, /*AugOutEdgeIt,*/ ReachedMap > bfs(res_graph);
+//       BfsIterator< AugGraph, /*AugOutEdgeIt,*/ ReachedMap > bfs(res_graph);
 //       typename AugGraph::NodeMap<AugEdge> pred(res_graph); 
 //       for(NodeIt s=G->template first<NodeIt>(); G->valid(s); G->next(s)) {
@@ -919 +919 @@
 
 //       //typedef typename EAugGraph::NodeMap<bool> ReachedMap;
-//       BfsIterator5< 
+//       BfsIterator< 
 //      ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>, 
 //      /*typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,*/ 
@@ -959 +959 @@
 //      //computing blocking flow with dfs
 //      typedef typename EAugGraph::NodeMap<bool> BlockingReachedMap;
-//      DfsIterator5< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap > 
+//      DfsIterator< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap > 
 //        dfs(res_graph);
 //      typename EAugGraph::NodeMap<EAugEdge> pred(res_graph, INVALID);