Changeset 243:a85fd87460e3 in lemon-0.x for src/work/edmonds_karp.h

Timestamp:

03/25/04 10:42:59 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

.

File:

• src/work/edmonds_karp.h (modified) (8 diffs)

src/work/edmonds_karp.h

@@ -320 +320 @@
 
       typedef typename AugGraph::NodeMap<bool> ReachedMap;
-      BfsIterator4< AugGraph, AugOutEdgeIt, ReachedMap > bfs(res_graph);
+      BfsIterator5< AugGraph /*, AugOutEdgeIt*/, ReachedMap > bfs(res_graph);
 
       bfs.pushAndSetReached(s);
@@ -363 +363 @@
         __augment=false;
         //computing blocking flow with dfs
-        typedef typename MutableGraph::NodeMap<bool> BlockingReachedMap;
-        DfsIterator4< MutableGraph, typename MutableGraph::OutEdgeIt, BlockingReachedMap > dfs(F);
+        typedef typename TrivGraphWrapper<MutableGraph>::NodeMap<bool> BlockingReachedMap;
+        DfsIterator5< TrivGraphWrapper<MutableGraph>/*, typename MutableGraph::OutEdgeIt*/, BlockingReachedMap > dfs(F);
         typename MutableGraph::NodeMap<typename MutableGraph::Edge> pred(F);
         pred.set(sF, typename MutableGraph::Edge(INVALID));
@@ -421 +421 @@
       //bfs for distances on the residual graph
       typedef typename AugGraph::NodeMap<bool> ReachedMap;
-      BfsIterator4< AugGraph, AugOutEdgeIt, ReachedMap > bfs(res_graph);
+      BfsIterator5< AugGraph /*, AugOutEdgeIt*/, ReachedMap > bfs(res_graph);
       bfs.pushAndSetReached(s);
       typename AugGraph::NodeMap<int> dist(res_graph); //filled up with 0's
@@ -466 +466 @@
         __augment=false;
         //computing blocking flow with dfs
-        typedef typename MutableGraph::NodeMap<bool> BlockingReachedMap;
-        DfsIterator4< MutableGraph, typename MutableGraph::OutEdgeIt, BlockingReachedMap > dfs(F);
+        typedef typename TrivGraphWrapper<MutableGraph>::NodeMap<bool> BlockingReachedMap;
+        DfsIterator5< TrivGraphWrapper<MutableGraph>/*, typename MutableGraph::OutEdgeIt*/, BlockingReachedMap > dfs(F);
         typename MutableGraph::NodeMap<typename MutableGraph::Edge> pred(F);
         pred.set(sF, typename MutableGraph::Edge(INVALID));
@@ -528 +528 @@
 
       //typedef typename EAugGraph::NodeMap<bool> ReachedMap;
-      BfsIterator4< 
+      BfsIterator5< 
         ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>, 
-        typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt, 
+        /*typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,*/ 
         ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::NodeMap<bool> > bfs(res_graph);
       
@@ -553 +553 @@
         //computing blocking flow with dfs
         typedef typename EAugGraph::NodeMap<bool> BlockingReachedMap;
-        DfsIterator4< EAugGraph, EAugOutEdgeIt, BlockingReachedMap > 
+        DfsIterator5< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap > 
           dfs(res_graph);
         typename EAugGraph::NodeMap<EAugEdge> pred(res_graph); 
@@ -855 +855 @@
 
       //typedef typename EAugGraph::NodeMap<bool> ReachedMap;
-      BfsIterator4< 
+      BfsIterator5< 
         ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>, 
-        typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt, 
+        /*typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,*/ 
         ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::NodeMap<bool> > bfs(res_graph);
 
@@ -895 +895 @@
         //computing blocking flow with dfs
         typedef typename EAugGraph::NodeMap<bool> BlockingReachedMap;
-        DfsIterator4< EAugGraph, EAugOutEdgeIt, BlockingReachedMap > 
+        DfsIterator5< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap > 
           dfs(res_graph);
         typename EAugGraph::NodeMap<EAugEdge> pred(res_graph, INVALID);