Changeset 279:be43902fadb7 in lemon-0.x for src/work/iterator_bfs_demo.cc

Timestamp:

04/03/04 16:22:33 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

minor changes

File:

• src/work/iterator_bfs_demo.cc (modified) (4 diffs)

src/work/iterator_bfs_demo.cc

@@ -34 +34 @@
   typedef Graph::Node Node;
   typedef Graph::Edge Edge;
-  //typedef Graph::NodeIt NodeIt;
-  //typedef Graph::EdgeIt EdgeIt;
-  //typedef Graph::OutEdgeIt OutEdgeIt;
-  //typedef Graph::InEdgeIt InEdgeIt;
-  //typedef Graph::SymEdgeIt SymEdgeIt;
  
   Graph G;
@@ -100 +95 @@
     
     cout << "bfs and dfs iterator demo on the directed graph" << endl;
-    for(GW::NodeIt n=gw.first<GW::NodeIt>(); 
-        gw.valid(n); 
-        gw.next(n)) { 
+    for(GW::NodeIt n(gw); gw.valid(n); gw.next(n)) { 
       cout << node_name.get(n) << ": ";
       cout << "out edges: ";
-      for(GW::OutEdgeIt e=gw.first<GW::OutEdgeIt>(n); gw.valid(e); gw.next(e)) 
+      for(GW::OutEdgeIt e(gw, n); gw.valid(e); gw.next(e)) 
         cout << edge_name.get(e) << " ";
       cout << "in edges: ";
-      for(GW::InEdgeIt e=gw.first<GW::InEdgeIt>(n); gw.valid(e); gw.next(e)) 
+      for(GW::InEdgeIt e(gw, n); gw.valid(e); gw.next(e)) 
         cout << edge_name.get(e) << " ";
       cout << endl;
@@ -178 +171 @@
     
     cout << "bfs and dfs iterator demo on the reversed directed graph" << endl;
-    for(GW::NodeIt n=gw.first<GW::NodeIt>(); gw.valid(n); gw.next(n)) { 
+    for(GW::NodeIt n(gw); gw.valid(n); gw.next(n)) { 
       cout << node_name.get(n) << ": ";
       cout << "out edges: ";
-      for(GW::OutEdgeIt e=gw.first<GW::OutEdgeIt>(n); gw.valid(e); gw.next(e)) 
+      for(GW::OutEdgeIt e(gw, n); gw.valid(e); gw.next(e)) 
         cout << edge_name.get(e) << " ";
       cout << "in edges: ";
-      for(GW::InEdgeIt e=gw.first<GW::InEdgeIt>(n); gw.valid(e); gw.next(e)) 
+      for(GW::InEdgeIt e(gw, n); gw.valid(e); gw.next(e)) 
         cout << edge_name.get(e) << " ";
       cout << endl;
@@ -254 +247 @@
     
     cout << "bfs and dfs iterator demo on the undirected graph" << endl;
-    for(GW::NodeIt n=gw.first<GW::NodeIt>(); gw.valid(n); gw.next(n)) { 
+    for(GW::NodeIt n(gw); gw.valid(n); gw.next(n)) { 
       cout << node_name.get(n) << ": ";
       cout << "out edges: ";
-      for(GW::OutEdgeIt e=gw.first<GW::OutEdgeIt>(n); gw.valid(e); gw.next(e)) 
+      for(GW::OutEdgeIt e(gw, n); gw.valid(e); gw.next(e)) 
         cout << edge_name.get(e) << " ";
       cout << "in edges: ";
-      for(GW::InEdgeIt e=gw.first<GW::InEdgeIt>(n); gw.valid(e); gw.next(e)) 
+      for(GW::InEdgeIt e(gw, n); gw.valid(e); gw.next(e)) 
         cout << edge_name.get(e) << " ";
       cout << endl;