Changeset 777:a82713ed19f3 in lemon-0.x for src/work/marci/iterator_bfs_demo.cc

Timestamp:

08/31/04 19:54:22 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

graph_wrapper.h is ready for hugo 0.2

File:

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

src/work/marci/iterator_bfs_demo.cc

@@ -10 +10 @@
 
 using namespace hugo;
+
 using std::cout; 
 using std::endl;
@@ -73 +74 @@
   cout << "    \\-->    ------------->         "<< endl;
   
-//   typedef TrivGraphWrapper<const Graph> CGW;
-//   CGW gw(G);
-
-//   cout << "bfs and dfs demo on the directed graph" << endl;
-//   for(CGW::NodeIt n=gw.first<CGW::NodeIt>(); n.valid(); ++n) { 
-//     cout << n << ": ";
-//     cout << "out edges: ";
-//     for(CGW::OutEdgeIt e=gw.first<CGW::OutEdgeIt>(n); e.valid(); ++e) 
-//       cout << e << " ";
-//     cout << "in edges: ";
-//     for(CGW::InEdgeIt e=gw.first<CGW::InEdgeIt>(n); e.valid(); ++e) 
-//       cout << e << " ";
-//     cout << endl;
-//   }
-
   {
     EdgeNameMap< Graph, Graph::NodeMap<string> > edge_name(G, node_name);
@@ -108 +94 @@
     while (!bfs.finished()) {
       //cout << "edge: ";
-      if (Graph::Edge(Graph::OutEdgeIt(bfs))!=INVALID) {
+      if (Graph::Edge(bfs)!=INVALID) {
         cout << edge_name[bfs] << /*endl*/", " << 
           node_name[G.tail(bfs)] << 
@@ -117 +103 @@
       } else { 
         cout << "invalid" << /*endl*/", " << 
-          node_name[bfs.aNode()] << 
+          node_name[bfs.tail()] << 
           (bfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
           
@@ -142 +128 @@
       ++dfs;
       //cout << "edge: ";
-      if (Graph::Edge(Graph::OutEdgeIt(dfs))!=INVALID) {
+      if (Graph::Edge(dfs)!=INVALID) {
         cout << edge_name[dfs] << /*endl*/", " << 
           node_name[G.tail(dfs)] << 
@@ -151 +137 @@
       } else { 
         cout << "invalid" << /*endl*/", " << 
-          node_name[dfs.aNode()] << 
+          node_name[dfs.tail()] << 
           (dfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
           
@@ -184 +170 @@
     while (!bfs.finished()) {
       //cout << "edge: ";
-      if (GW::Edge(GW::OutEdgeIt(bfs))!=INVALID) {
-        cout << edge_name[GW::OutEdgeIt(bfs)] << /*endl*/", " << 
+      if (GW::Edge(bfs)!=INVALID) {
+        cout << edge_name[GW::Edge(bfs)] << /*endl*/", " << 
           node_name[gw.tail(bfs)] << 
           (bfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
@@ -193 +179 @@
       } else { 
         cout << "invalid" << /*endl*/", " << 
-          node_name[bfs.aNode()] << 
+          node_name[bfs.tail()] << 
           (bfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
           
@@ -218 +204 @@
       ++dfs;
       //cout << "edge: ";
-      if (GW::OutEdgeIt(dfs)!=INVALID) {
-        cout << edge_name[GW::OutEdgeIt(dfs)] << /*endl*/", " << 
+      if (GW::Edge(dfs)!=INVALID) {
+        cout << edge_name[GW::Edge(dfs)] << /*endl*/", " << 
           node_name[gw.tail(dfs)] << 
           (dfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
@@ -227 +213 @@
       } else { 
         cout << "invalid" << /*endl*/", " << 
-          node_name[dfs.aNode()] << 
+          node_name[dfs.tail()] << 
           (dfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
           
@@ -347 +333 @@
     while (!bfs.finished()) {
       //cout << "edge: ";
-      if (GW::OutEdgeIt(bfs)!=INVALID) {
-        cout << edge_name[GW::OutEdgeIt(bfs)] << /*endl*/", " << 
+      if (GW::Edge(bfs)!=INVALID) {
+        cout << edge_name[GW::Edge(bfs)] << /*endl*/", " << 
           node_name[gw.tail(bfs)] << 
           (bfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
@@ -356 +342 @@
       } else { 
         cout << "invalid" << /*endl*/", " << 
-          node_name[bfs.aNode()] << 
+          node_name[bfs.tail()] << 
           (bfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
           
@@ -381 +367 @@
       ++dfs;
       //cout << "edge: ";
-      if (GW::OutEdgeIt(dfs)!=INVALID) {
-        cout << edge_name[GW::OutEdgeIt(dfs)] << /*endl*/", " << 
+      if (GW::Edge(dfs)!=INVALID) {
+        cout << edge_name[GW::Edge(dfs)] << /*endl*/", " << 
           node_name[gw.tail(dfs)] << 
           (dfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") << 
@@ -390 +376 @@
       } else { 
         cout << "invalid" << /*endl*/", " << 
-          node_name[dfs.aNode()] << 
+          node_name[dfs.tail()] << 
           (dfs.isANodeExamined() ? ": is examined, " : ": is not examined, ") <<