Changeset 312:54e07057eb47 in lemon-0.x for src/work/marci/iterator_bfs_demo.cc

Timestamp:

04/07/04 12:57:58 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

gw

File:

• src/work/marci/iterator_bfs_demo.cc (modified) (5 diffs)

src/work/marci/iterator_bfs_demo.cc

@@ -89 +89 @@
 
   {
-    typedef TrivGraphWrapper<const Graph> GW;
-    GW gw(G);
-
-    EdgeNameMap< GW, Graph::NodeMap<string> > edge_name(gw, node_name);
+    EdgeNameMap< Graph, Graph::NodeMap<string> > edge_name(G, node_name);
     
     cout << "bfs and dfs iterator demo on the directed graph" << endl;
-    for(GW::NodeIt n(gw); gw.valid(n); gw.next(n)) { 
+    for(Graph::NodeIt n(G); G.valid(n); G.next(n)) { 
       cout << node_name[n] << ": ";
       cout << "out edges: ";
-      for(GW::OutEdgeIt e(gw, n); gw.valid(e); gw.next(e)) 
+      for(Graph::OutEdgeIt e(G, n); G.valid(e); G.next(e)) 
         cout << edge_name[e] << " ";
       cout << "in edges: ";
-      for(GW::InEdgeIt e(gw, n); gw.valid(e); gw.next(e)) 
+      for(Graph::InEdgeIt e(G, n); G.valid(e); G.next(e)) 
         cout << edge_name[e] << " ";
       cout << endl;
@@ -107 +104 @@
 
     cout << "bfs from s ..." << endl;
-    BfsIterator5< GW, GW::NodeMap<bool> > bfs(gw);
+    BfsIterator5< Graph, Graph::NodeMap<bool> > bfs(G);
     bfs.pushAndSetReached(s);
     while (!bfs.finished()) {
       //cout << "edge: ";
-      if (gw.valid(bfs)) {
+      if (G.valid(bfs)) {
         cout << edge_name[bfs] << /*endl*/", " << 
-          node_name[gw.aNode(bfs)] << 
-          (bfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
-          node_name[gw.bNode(bfs)] << 
+          node_name[G.aNode(bfs)] << 
+          (bfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
+          node_name[G.bNode(bfs)] << 
           (bfs.isBNodeNewlyReached() ? ": is newly reached." : 
            ": is not newly reached.");
@@ -140 +137 @@
 
     cout << "dfs from s ..." << endl;
-    DfsIterator5< GW, GW::NodeMap<bool> > dfs(gw);
+    DfsIterator5< Graph, Graph::NodeMap<bool> > dfs(G);
     dfs.pushAndSetReached(s);
     while (!dfs.finished()) {
       ++dfs;
       //cout << "edge: ";
-      if (gw.valid(dfs)) {
+      if (G.valid(dfs)) {
         cout << edge_name[dfs] << /*endl*/", " << 
-          node_name[gw.aNode(dfs)] << 
-          (dfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
-          node_name[gw.bNode(dfs)] << 
+          node_name[G.aNode(dfs)] << 
+          (dfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
+          node_name[G.bNode(dfs)] << 
           (dfs.isBNodeNewlyReached() ? ": is newly reached." : 
            ": is not newly reached.");
@@ -165 +162 @@
 
   {
-    typedef RevGraphWrapper<const TrivGraphWrapper<const Graph> > GW;
+    typedef RevGraphWrapper<const Graph> GW;
     GW gw(G);
     
@@ -241 +238 @@
   {
     //typedef UndirGraphWrapper<const Graph> GW;
-    typedef UndirGraphWrapper<const TrivGraphWrapper<const Graph> > GW;
+    typedef UndirGraphWrapper<const Graph> GW;
     GW gw(G);