diff -r 4cb8f31c1ff8 -r baf0b6e40211 src/work/marci/augmenting_flow.h
--- a/src/work/marci/augmenting_flow.h	Tue Sep 14 17:42:43 2004 +0000
+++ b/src/work/marci/augmenting_flow.h	Wed Sep 15 10:34:12 2004 +0000
@@ -1261,17 +1261,17 @@
 	  dist.set(res_graph.head(e), dist[res_graph.tail(e)]+1);
 	  typename MG::Edge f=F.addEdge(res_graph_to_F[res_graph.tail(e)],
 					res_graph_to_F[res_graph.head(e)]);
-	  original_edge.update();
+	  //original_edge.update();
 	  original_edge.set(f, e);
-	  residual_capacity.update();
+	  //residual_capacity.update();
 	  residual_capacity.set(f, res_graph.resCap(e));
 	} else {
 	  if (dist[res_graph.head(e)]==(dist[res_graph.tail(e)]+1)) {
 	    typename MG::Edge f=F.addEdge(res_graph_to_F[res_graph.tail(e)],
 					  res_graph_to_F[res_graph.head(e)]);
-	    original_edge.update();
+	    //original_edge.update();
 	    original_edge.set(f, e);
-	    residual_capacity.update();
+	    //residual_capacity.update();
 	    residual_capacity.set(f, res_graph.resCap(e));
 	  }
 	}
@@ -1294,7 +1294,7 @@
       dfs.pushAndSetReached(sF);
       while (!dfs.finished()) {
 	++dfs;
-	if (F.valid(/*typename MG::OutEdgeIt*/(dfs))) {
+	if (typename MG::Edge(dfs)!=INVALID) {
 	  if (dfs.isBNodeNewlyReached()) {
 	    typename MG::Node v=F.tail(dfs);
 	    typename MG::Node w=F.head(dfs);
@@ -1311,7 +1311,7 @@
 	    }
 
 	  } else {
-	    F.erase(/*typename MG::OutEdgeIt*/(dfs));
+	    F.erase(typename MG::Edge(dfs));
 	  }
 	}
       }