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

Timestamp:

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

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

minor changes

File:

• src/work/edmonds_karp.h (modified) (4 diffs)

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());
+        }
       }