1.1 --- a/src/work/marci/iterator_bfs_demo.cc	Wed Apr 21 14:59:43 2004 +0000
     1.2 +++ b/src/work/marci/iterator_bfs_demo.cc	Wed Apr 21 15:14:45 2004 +0000
     1.3 @@ -103,7 +103,7 @@
     1.4      }
     1.5  
     1.6      cout << "bfs from s ..." << endl;
     1.7 -    BfsIterator5< Graph, Graph::NodeMap<bool> > bfs(G);
     1.8 +    BfsIterator< Graph, Graph::NodeMap<bool> > bfs(G);
     1.9      bfs.pushAndSetReached(s);
    1.10      while (!bfs.finished()) {
    1.11        //cout << "edge: ";
    1.12 @@ -136,7 +136,7 @@
    1.13      cout << "    \\-->    ------------->         "<< endl;
    1.14  
    1.15      cout << "dfs from s ..." << endl;
    1.16 -    DfsIterator5< Graph, Graph::NodeMap<bool> > dfs(G);
    1.17 +    DfsIterator< Graph, Graph::NodeMap<bool> > dfs(G);
    1.18      dfs.pushAndSetReached(s);
    1.19      while (!dfs.finished()) {
    1.20        ++dfs;
    1.21 @@ -179,7 +179,7 @@
    1.22      }
    1.23  
    1.24      cout << "bfs from t ..." << endl;
    1.25 -    BfsIterator5< GW, GW::NodeMap<bool> > bfs(gw);
    1.26 +    BfsIterator< GW, GW::NodeMap<bool> > bfs(gw);
    1.27      bfs.pushAndSetReached(t);
    1.28      while (!bfs.finished()) {
    1.29        //cout << "edge: ";
    1.30 @@ -212,7 +212,7 @@
    1.31      cout << "    \\-->    ------------->         "<< endl;
    1.32      
    1.33      cout << "dfs from t ..." << endl;
    1.34 -    DfsIterator5< GW, GW::NodeMap<bool> > dfs(gw);
    1.35 +    DfsIterator< GW, GW::NodeMap<bool> > dfs(gw);
    1.36      dfs.pushAndSetReached(t);
    1.37      while (!dfs.finished()) {
    1.38        ++dfs;
    1.39 @@ -258,7 +258,7 @@
    1.40  //     cout << endl;
    1.41  
    1.42      cout << "bfs from t ..." << endl;
    1.43 -    BfsIterator5< GW, GW::NodeMap<bool> > bfs(gw);
    1.44 +    BfsIterator< GW, GW::NodeMap<bool> > bfs(gw);
    1.45      bfs.pushAndSetReached(t);
    1.46      while (!bfs.finished()) {
    1.47        //cout << "edge: ";
    1.48 @@ -291,7 +291,7 @@
    1.49      cout << "    \\-->    ------------->         "<< endl;
    1.50      
    1.51      cout << "dfs from t ..." << endl;
    1.52 -    DfsIterator5< GW, GW::NodeMap<bool> > dfs(gw);
    1.53 +    DfsIterator< GW, GW::NodeMap<bool> > dfs(gw);
    1.54      dfs.pushAndSetReached(t);
    1.55      while (!dfs.finished()) {
    1.56        ++dfs;