Changeset 577:e8703f0a6e2f in lemon-0.x for src/work/marci/bfsit_vs_byhand.cc

Timestamp:

05/07/04 13:57:34 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

top-sort, dimacs mods.

File:

• src/work/marci/bfsit_vs_byhand.cc (modified) (3 diffs)

src/work/marci/bfsit_vs_byhand.cc

@@ -20 +20 @@
   typedef Graph::OutEdgeIt OutEdgeIt;
 
-  Graph G;
+  Graph g;
   Node s, t;
-  Graph::EdgeMap<int> cap(G);
-  readDimacsMaxFlow(std::cin, G, s, t, cap);
-  Graph::NodeMap<OutEdgeIt> pred(G);
+  Graph::EdgeMap<int> cap(g);
+  //readDimacsMaxFlow(std::cin, g, s, t, cap);
+  readDimacs(std::cin, g);
+
+  Graph::NodeMap<OutEdgeIt> pred(g);
   Timer ts;
   {
     ts.reset();
-    Graph::NodeMap<bool> reached(G);
+    Graph::NodeMap<bool> reached(g);
     reached.set(s, true);
     pred.set(s, INVALID);
@@ -37 +39 @@
       bfs_queue.pop();
       OutEdgeIt e;
-      for(G.first(e,v); G.valid(e); G.next(e)) {
-        Node w=G.head(e);
+      for(g.first(e,v); g.valid(e); g.next(e)) {
+        Node w=g.head(e);
         if (!reached[w]) {
           bfs_queue.push(w);
@@ -52 +54 @@
   {
     ts.reset();      
-    BfsIterator< Graph, Graph::NodeMap<bool> > bfs(G);
+    BfsIterator< Graph, Graph::NodeMap<bool> > bfs(g);
     bfs.pushAndSetReached(s);
     pred.set(s, INVALID);
     while (!bfs.finished()) { 
       ++bfs; 
-      if (G.valid(bfs) && bfs.isBNodeNewlyReached()) 
+      if (g.valid(bfs) && bfs.isBNodeNewlyReached()) 
         pred.set(bfs.bNode(), bfs);
     }