1.1 --- a/src/work/marci/augmenting_flow.h	Tue Sep 14 17:42:43 2004 +0000
     1.2 +++ b/src/work/marci/augmenting_flow.h	Wed Sep 15 10:34:12 2004 +0000
     1.3 @@ -1261,17 +1261,17 @@
     1.4  	  dist.set(res_graph.head(e), dist[res_graph.tail(e)]+1);
     1.5  	  typename MG::Edge f=F.addEdge(res_graph_to_F[res_graph.tail(e)],
     1.6  					res_graph_to_F[res_graph.head(e)]);
     1.7 -	  original_edge.update();
     1.8 +	  //original_edge.update();
     1.9  	  original_edge.set(f, e);
    1.10 -	  residual_capacity.update();
    1.11 +	  //residual_capacity.update();
    1.12  	  residual_capacity.set(f, res_graph.resCap(e));
    1.13  	} else {
    1.14  	  if (dist[res_graph.head(e)]==(dist[res_graph.tail(e)]+1)) {
    1.15  	    typename MG::Edge f=F.addEdge(res_graph_to_F[res_graph.tail(e)],
    1.16  					  res_graph_to_F[res_graph.head(e)]);
    1.17 -	    original_edge.update();
    1.18 +	    //original_edge.update();
    1.19  	    original_edge.set(f, e);
    1.20 -	    residual_capacity.update();
    1.21 +	    //residual_capacity.update();
    1.22  	    residual_capacity.set(f, res_graph.resCap(e));
    1.23  	  }
    1.24  	}
    1.25 @@ -1294,7 +1294,7 @@
    1.26        dfs.pushAndSetReached(sF);
    1.27        while (!dfs.finished()) {
    1.28  	++dfs;
    1.29 -	if (F.valid(/*typename MG::OutEdgeIt*/(dfs))) {
    1.30 +	if (typename MG::Edge(dfs)!=INVALID) {
    1.31  	  if (dfs.isBNodeNewlyReached()) {
    1.32  	    typename MG::Node v=F.tail(dfs);
    1.33  	    typename MG::Node w=F.head(dfs);
    1.34 @@ -1311,7 +1311,7 @@
    1.35  	    }
    1.36  
    1.37  	  } else {
    1.38 -	    F.erase(/*typename MG::OutEdgeIt*/(dfs));
    1.39 +	    F.erase(typename MG::Edge(dfs));
    1.40  	  }
    1.41  	}
    1.42        }