Changeset 854:baf0b6e40211 in lemon-0.x for src/work/marci/augmenting_flow.h

Timestamp:

09/15/04 12:34:12 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

correction of SubGraphWrapper? bug.

File:

• src/work/marci/augmenting_flow.h (modified) (4 diffs)

src/work/marci/augmenting_flow.h

@@ -1262 +1262 @@
           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 {
@@ -1270 +1270 @@
             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));
           }
@@ -1295 +1295 @@
       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);
@@ -1312 +1312 @@
 
           } else {
-            F.erase(/*typename MG::OutEdgeIt*/(dfs));
+            F.erase(typename MG::Edge(dfs));
           }
         }