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

Timestamp:

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

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

minor changes

Location:

src/work

Files:

• bfs_iterator.h (modified) (2 diffs)
• edmonds_karp.h (modified) (4 diffs)
• iterator_bfs_demo.cc (modified) (4 diffs)
• list_graph.h (modified) (1 diff)
• marci/graph_wrapper.h (modified) (3 diffs)

src/work/bfs_iterator.h

@@ -797 +797 @@
       actual_node=s;
       reached.set(s, true);
-      dfs_stack.push(G.template first<OutEdgeIt>(s)); 
+      OutEdgeIt e;
+      G.first(e, s);
+      dfs_stack.push(e); 
     }
     DfsIterator5<GraphWrapper, /*OutEdgeIt,*/ ReachedMap>& 
@@ -807 +809 @@
         actual_node=w;
         if (!reached.get(w)) {
-          dfs_stack.push(G.template first<OutEdgeIt>(w));
+          OutEdgeIt e;
+          G.first(e, w);
+          dfs_stack.push(e);
           reached.set(w, true);
           b_node_newly_reached=true;

src/work/edmonds_karp.h

@@ -353 +353 @@
       FilterResGW filter_res_graph(res_graph, dist);
       typename ResGW::NodeMap<typename MG::Node> res_graph_to_F(res_graph);
-      for(typename ResGW::NodeIt n=res_graph.template first<typename ResGW::NodeIt>(); res_graph.valid(n); res_graph.next(n)) {
-        res_graph_to_F.set(n, F.addNode());
+      {
+        typename ResGW::NodeIt n;
+        for(res_graph.first(n); res_graph.valid(n); res_graph.next(n)) {
+          res_graph_to_F.set(n, F.addNode());
+        }
       }
 
@@ -364 +367 @@
       //Making F to the graph containing the edges of the residual graph 
       //which are in some shortest paths
-      for(typename FilterResGW::EdgeIt e=filter_res_graph.template first<typename FilterResGW::EdgeIt>(); filter_res_graph.valid(e); filter_res_graph.next(e)) {
-        //if (dist.get(res_graph.head(e))==dist.get(res_graph.tail(e))+1) {
+      {
+        typename FilterResGW::EdgeIt e;
+        for(filter_res_graph.first(e); filter_res_graph.valid(e); filter_res_graph.next(e)) {
+          //if (dist.get(res_graph.head(e))==dist.get(res_graph.tail(e))+1) {
           typename MG::Edge f=F.addEdge(res_graph_to_F.get(res_graph.tail(e)), res_graph_to_F.get(res_graph.head(e)));
           original_edge.update();
@@ -372 +377 @@
           residual_capacity.set(f, res_graph.resCap(e));
           //} 
+        }
       }
 
@@ -447 +453 @@
       MG F;
       typename ResGW::NodeMap<typename MG::Node> res_graph_to_F(res_graph);
-      for(typename ResGW::NodeIt n=res_graph.template first<typename ResGW::NodeIt>(); res_graph.valid(n); res_graph.next(n)) {
-        res_graph_to_F.set(n, F.addNode());
+      {
+        typename ResGW::NodeIt n;
+        for(res_graph.first(n); res_graph.valid(n); res_graph.next(n)) {
+          res_graph_to_F.set(n, F.addNode());
+        }
       }
 

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;

src/work/list_graph.h

@@ -310 +310 @@
     bool valid(Edge e) const { return e.valid(); }
     
-    template <typename It> It getNext(It it) const { 
-      It tmp(it); next(tmp); return tmp; }
+//    template <typename It> It getNext(It it) const { 
+//      It tmp(it); next(tmp); return tmp; }
 //     NodeIt& next(NodeIt& it) const { return ++it; }
 //     EdgeIt& next(EdgeIt& it) const { return ++it; }

src/work/marci/graph_wrapper.h

@@ -449 +449 @@
 //   };
 
-
   template<typename GraphWrapper>
   class RevGraphWrapper : public GraphWrapperSkeleton<GraphWrapper> {
@@ -455 +454 @@
     typedef typename GraphWrapperSkeleton<GraphWrapper>::Node Node;
     typedef typename GraphWrapperSkeleton<GraphWrapper>::Edge Edge;
+    //FIXME 
+    //If GraphWrapper::OutEdgeIt is not defined
+    //and we do not want to use RevGraphWrapper::InEdgeIt,
+    //this won't work, because of typedef
+    //OR
+    //graphs have to define their non-existing iterators to void
+    //Unfortunately all the typedefs are instantiated in templates, 
+    //unlike other stuff
     typedef typename GraphWrapperSkeleton<GraphWrapper>::OutEdgeIt InEdgeIt;
     typedef typename GraphWrapperSkeleton<GraphWrapper>::InEdgeIt OutEdgeIt;
@@ -703 +710 @@
     class Edge {
       friend class UndirGraphWrapper<GraphWrapper>;
+    protected:
       bool out_or_in; //true iff out
       GraphOutEdgeIt out;