Changeset 158:4f54d89fa9d2 in lemon-0.x for src/work/bfs_iterator.hh

Timestamp:

03/08/04 13:29:07 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

a lot of interesting and very useful wrapper graphs

File:

• src/work/bfs_iterator.hh (modified) (5 diffs)

src/work/bfs_iterator.hh

@@ -624 +624 @@
 
 
-  template <typename GraphWrapper, typename OutEdgeIt, 
+  template <typename GraphWrapper, /*typename OutEdgeIt,*/ 
             typename ReachedMap/*=typename GraphWrapper::NodeMap<bool>*/ >
   class BfsIterator5 {
     typedef typename GraphWrapper::NodeIt NodeIt;
+    typedef typename GraphWrapper::OutEdgeIt OutEdgeIt;
     GraphWrapper G;
     std::queue<NodeIt> bfs_queue;
@@ -641 +642 @@
       G(_G), reached(*(new ReachedMap(G /*, false*/))), 
       own_reached_map(true) { }
+//     BfsIterator5(const typename GraphWrapper::BaseGraph& _G, 
+//               ReachedMap& _reached) : 
+//       G(_G), reached(_reached), 
+//       own_reached_map(false) { }
+//     BfsIterator5(const typename GraphWrapper::BaseGraph& _G) : 
+//       G(_G), reached(*(new ReachedMap(G /*, false*/))), 
+//       own_reached_map(true) { }
     ~BfsIterator5() { if (own_reached_map) delete &reached; }
     void pushAndSetReached(NodeIt s) { 
@@ -661 +669 @@
       }
     }
-    BfsIterator5<GraphWrapper, OutEdgeIt, ReachedMap>& 
+    BfsIterator5<GraphWrapper, /*OutEdgeIt,*/ ReachedMap>& 
     operator++() { 
       if (G.valid(actual_edge)/*.valid()*/) { 
@@ -759 +767 @@
   };
 
-  template <typename GraphWrapper, typename OutEdgeIt, 
+  template <typename GraphWrapper, /*typename OutEdgeIt,*/ 
             typename ReachedMap/*=typename GraphWrapper::NodeMap<bool>*/ >
   class DfsIterator5 {
     typedef typename GraphWrapper::NodeIt NodeIt;
+    typedef typename GraphWrapper::OutEdgeIt OutEdgeIt;
     GraphWrapper G;
     std::stack<OutEdgeIt> dfs_stack;
@@ -783 +792 @@
       dfs_stack.push(G.template first<OutEdgeIt>(s)); 
     }
-    DfsIterator5<GraphWrapper, OutEdgeIt, ReachedMap>& 
+    DfsIterator5<GraphWrapper, /*OutEdgeIt,*/ ReachedMap>& 
     operator++() { 
       actual_edge=dfs_stack.top();