Changeset 389:770cc1f4861f in lemon-0.x for src/work/marci/edmonds_karp.h

Timestamp:

04/24/04 14:44:41 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

modifications for better compatibility with gcc 3.4.0

File:

• src/work/marci/edmonds_karp.h (modified) (13 diffs)

src/work/marci/edmonds_karp.h

@@ -276 +276 @@
       bool _augment=false;
       
-      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
+      BfsIterator< ResGW, typename ResGW::template NodeMap<bool> > 
+        bfs(res_graph);
       bfs.pushAndSetReached(s);
         
-      typename ResGW::NodeMap<ResGWEdge> pred(res_graph); 
+      typename ResGW::template NodeMap<ResGWEdge> pred(res_graph); 
       pred.set(s, INVALID);
       
-      typename ResGW::NodeMap<Number> free(res_graph);
+      typename ResGW::template NodeMap<Number> free(res_graph);
         
       //searching for augmenting path
@@ -319 +320 @@
     protected:
       const MapGraphWrapper* g;
-      typename MapGraphWrapper::NodeMap<int> dist; 
+      typename MapGraphWrapper::template NodeMap<int> dist; 
     public:
       DistanceMap(MapGraphWrapper& _g) : g(&_g), dist(*g, g->nodeNum()) { }
@@ -340 +341 @@
       ResGW res_graph(*g, *capacity, *flow);
 
-      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
+      BfsIterator< ResGW, typename ResGW::template NodeMap<bool> > 
+        bfs(res_graph);
 
       bfs.pushAndSetReached(s);
@@ -358 +360 @@
         DistanceMap<ResGW> > FilterResGW;
       FilterResGW filter_res_graph(res_graph, true_map, dist);
-      typename ResGW::NodeMap<typename MG::Node> res_graph_to_F(res_graph);
+      typename ResGW::template NodeMap<typename MG::Node> 
+        res_graph_to_F(res_graph);
       {
         typename ResGW::NodeIt n;
@@ -368 +371 @@
       typename MG::Node sF=res_graph_to_F[s];
       typename MG::Node tF=res_graph_to_F[t];
-      typename MG::EdgeMap<ResGWEdge> original_edge(F);
-      typename MG::EdgeMap<Number> residual_capacity(F);
+      typename MG::template EdgeMap<ResGWEdge> original_edge(F);
+      typename MG::template EdgeMap<Number> residual_capacity(F);
 
       //Making F to the graph containing the edges of the residual graph 
@@ -392 +395 @@
         //computing blocking flow with dfs
 
-        DfsIterator< MG, typename MG::NodeMap<bool> > dfs(F);
-        typename MG::NodeMap<typename MG::Edge> pred(F);
+        DfsIterator< MG, typename MG::template NodeMap<bool> > dfs(F);
+        typename MG::template NodeMap<typename MG::Edge> pred(F);
         pred.set(sF, INVALID);
         //invalid iterators for sources
 
-        typename MG::NodeMap<Number> free(F);
+        typename MG::template NodeMap<Number> free(F);
 
         dfs.pushAndSetReached(sF);      
@@ -450 +453 @@
 
       //bfs for distances on the residual graph
-      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
+      BfsIterator< ResGW, typename ResGW::template NodeMap<bool> > 
+        bfs(res_graph);
       bfs.pushAndSetReached(s);
-      typename ResGW::NodeMap<int> dist(res_graph); //filled up with 0's
+      typename ResGW::template NodeMap<int> 
+        dist(res_graph); //filled up with 0's
 
       //F will contain the physical copy of the residual graph
       //with the set of edges which are on shortest paths
       MG F;
-      typename ResGW::NodeMap<typename MG::Node> res_graph_to_F(res_graph);
+      typename ResGW::template NodeMap<typename MG::Node> 
+        res_graph_to_F(res_graph);
       {
         typename ResGW::NodeIt n;
@@ -467 +473 @@
       typename MG::Node sF=res_graph_to_F[s];
       typename MG::Node tF=res_graph_to_F[t];
-      typename MG::EdgeMap<ResGWEdge> original_edge(F);
-      typename MG::EdgeMap<Number> residual_capacity(F);
+      typename MG::template EdgeMap<ResGWEdge> original_edge(F);
+      typename MG::template EdgeMap<Number> residual_capacity(F);
 
       while ( !bfs.finished() ) { 
@@ -498 +504 @@
         __augment=false;
         //computing blocking flow with dfs
-        DfsIterator< MG, typename MG::NodeMap<bool> > dfs(F);
-        typename MG::NodeMap<typename MG::Edge> pred(F);
+        DfsIterator< MG, typename MG::template NodeMap<bool> > dfs(F);
+        typename MG::template NodeMap<typename MG::Edge> pred(F);
         pred.set(sF, INVALID);
         //invalid iterators for sources
 
-        typename MG::NodeMap<Number> free(F);
+        typename MG::template NodeMap<Number> free(F);
 
         dfs.pushAndSetReached(sF);      
@@ -554 +560 @@
       ResGW res_graph(*g, *capacity, *flow);
 
-      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
+      BfsIterator< ResGW, typename ResGW::template NodeMap<bool> > 
+        bfs(res_graph);
 
       bfs.pushAndSetReached(s);
@@ -574 +581 @@
       //Subgraph, which is able to delete edges which are already 
       //met by the dfs
-      typename FilterResGW::NodeMap<typename FilterResGW::OutEdgeIt> 
+      typename FilterResGW::template NodeMap<typename FilterResGW::OutEdgeIt> 
         first_out_edges(filter_res_graph);
       typename FilterResGW::NodeIt v;
@@ -585 +592 @@
       }
       typedef ErasingFirstGraphWrapper<FilterResGW, typename FilterResGW::
-        NodeMap<typename FilterResGW::OutEdgeIt> > ErasingResGW;
+        template NodeMap<typename FilterResGW::OutEdgeIt> > ErasingResGW;
       ErasingResGW erasing_res_graph(filter_res_graph, first_out_edges);
 
@@ -594 +601 @@
         __augment=false;
         //computing blocking flow with dfs
-        DfsIterator< ErasingResGW, typename ErasingResGW::NodeMap<bool> > 
+        DfsIterator< ErasingResGW, 
+          typename ErasingResGW::template NodeMap<bool> > 
           dfs(erasing_res_graph);
-        typename ErasingResGW::NodeMap<typename ErasingResGW::OutEdgeIt> 
-          pred(erasing_res_graph); 
+        typename ErasingResGW::
+          template NodeMap<typename ErasingResGW::OutEdgeIt> 
+          pred(erasing_res_graph); 
         pred.set(s, INVALID);
         //invalid iterators for sources
 
-        typename ErasingResGW::NodeMap<Number> free1(erasing_res_graph);
+        typename ErasingResGW::template NodeMap<Number> 
+          free1(erasing_res_graph);
 
         dfs.pushAndSetReached(