src/work/edmonds_karp.h
changeset 265 bf7aea53635a
parent 263 f24f276e0b6b
child 266 4cec4981dfd1
     1.1 --- a/src/work/edmonds_karp.h	Tue Mar 30 13:18:10 2004 +0000
     1.2 +++ b/src/work/edmonds_karp.h	Tue Mar 30 13:37:21 2004 +0000
     1.3 @@ -479,8 +479,8 @@
     1.4  //       }
     1.5  
     1.6        MutableGraph F;
     1.7 -      typedef SubGraphWrapper<AugGraph, DistanceMap<AugGraph> > FilterResGraph;
     1.8 -      FilterResGraph filter_res_graph(res_graph, dist);
     1.9 +      //typedef SubGraphWrapper<AugGraph, DistanceMap<AugGraph> > FilterResGraph;
    1.10 +      //FilterResGraph filter_res_graph(res_graph, dist);
    1.11        typename AugGraph::NodeMap<typename MutableGraph::Node> 
    1.12  	res_graph_to_F(res_graph);
    1.13        for(typename AugGraph::NodeIt n=res_graph.template first<typename AugGraph::NodeIt>(); res_graph.valid(n); res_graph.next(n)) {
    1.14 @@ -495,7 +495,9 @@
    1.15  
    1.16        //Making F to the graph containing the edges of the residual graph 
    1.17        //which are in some shortest paths
    1.18 -      for(typename AugGraph::EdgeIt e=res_graph.template first<typename AugGraph::EdgeIt>(); res_graph.valid(e); res_graph.next(e)) {
    1.19 +      for(typename AugGraph::EdgeIt e=res_graph.template first<typename AugGraph::EdgeIt>(); 
    1.20 +	  res_graph.valid(e); 
    1.21 +	  res_graph.next(e)) {
    1.22  	if (dist.get(res_graph.head(e))==dist.get(res_graph.tail(e))+1) {
    1.23  	  typename MutableGraph::Edge f=F.addEdge(res_graph_to_F.get(res_graph.tail(e)), res_graph_to_F.get(res_graph.head(e)));
    1.24  	  original_edge.update();