Changeset 91:81bf58164f60 in lemon-0.x for src/work

Timestamp:

02/17/04 13:27:49 (21 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

.

Location:

src/work/alpar

Files:

• f_ed_ka.h (modified) (4 diffs)
• f_ed_ka_demo.cc (modified) (1 diff)

src/work/alpar/f_ed_ka.h

@@ -17 +17 @@
                                       FlowMap &f,
                                       CapacityMap &c,
-                                      typename Graph::NodeIt s,
-                                      typename Graph::NodeIt t)
+                                      typename Graph::EachNodeIt s,
+                                      typename Graph::EachNodeIt t)
   { 
-    typedef typename Graph::NodeIt NodeIt;
+    typedef typename Graph::EachNodeIt EachNodeIt;
     typedef typename Graph::EdgeIt EdgeIt;
     typedef typename Graph::EachEdgeIt EachEdgeIt;
@@ -33 +33 @@
       f.set(e,0);
     
-    std::queue<NodeIt> bfs_queue;
+    std::queue<EachNodeIt> bfs_queue;
     typename Graph::NodeMap<int> visited(G); //0: unvisited,
                                              //1: reached by a forward edge
@@ -40 +40 @@
     typename Graph::NodeMap<EdgeIt> tree(G);
     
-    NodeIt gn;  //FIXME: it might be too global for some people...
+    EachNodeIt gn;  //FIXME: it might be too global for some people...
     
   augment:
     
-    for(NodeIt n(G);G.valid(n);G.next(n))
+    for(EachNodeIt n(G);G.valid(n);G.next(n))
       visited.set(n,0);
     
@@ -56 +56 @@
     while(!bfs_queue.empty() && !visited.get(t))
       {
-        NodeIt n(bfs_queue.front());
+        EachNodeIt n(bfs_queue.front());
         for(OutEdgeIt e(G,n);G.valid(e);G.next(e))
           if(f.get(e)<c.get(e) &&   //FIXME: <

src/work/alpar/f_ed_ka_demo.cc

@@ -13 +13 @@
 
 int main(int, char **) {
-  typedef ListGraph::NodeIt NodeIt;
+  typedef ListGraph::EachNodeIt EachNodeIt;
   typedef ListGraph::EachEdgeIt EachEdgeIt;
 
   ListGraph G;
-  NodeIt s, t;
+  EachNodeIt s, t;
   ListGraph::EdgeMap<int> cap(G);
   readDimacsMaxFlow(std::cin, G, s, t, cap);