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

Timestamp:

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

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

correction of SubGraphWrapper? bug.

Location:

src/work/marci

Files:

• augmenting_flow.h (modified) (4 diffs)
• max_flow_demo.cc (modified) (12 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));
           }
         }

src/work/marci/max_flow_demo.cc

@@ -4 +4 @@
 // max_flow_demo < dimacs_max_flow_file
 
-
 #include <iostream>
 #include <fstream>
 
-#include <sage_graph.h>
 #include <hugo/smart_graph.h>
+#include <hugo/list_graph.h>
 #include <hugo/dimacs.h>
 #include <hugo/time_measure.h>
-//#include <graph_wrapper.h>
 #include <hugo/preflow.h>
 #include <augmenting_flow.h>
-//#include <preflow_res.h>
-#include <for_each_macros.h>
 #include <graph_concept.h>
 
@@ -23 +19 @@
 int main(int, char **) {
 
-  typedef SageGraph MutableGraph;
-
-  //typedef FullFeatureGraphConcept Graph;
-  //typedef SmartGraph Graph;
-  typedef SageGraph Graph;
+  typedef ListGraph MutableGraph;
+  typedef SmartGraph Graph;
   typedef Graph::Node Node;
   typedef Graph::EdgeIt EdgeIt;
@@ -54 +47 @@
     max_flow_test.minCut(cut);
 
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) {
+    for(Graph::EdgeIt e(g); e!=INVALID; ++e) {
       if (cut[g.tail(e)] && !cut[g.head(e)] && !flow[e]==cap[e]) 
         std::cout << "Slackness does not hold!" << std::endl;
@@ -64 +57 @@
   {
     std::cout << "preflow ..." << std::endl;
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
+    for(Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
     ts.reset();
-    max_flow_test.preflow(Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
+    max_flow_test.run(Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
     std::cout << "elapsed time: " << ts << std::endl;
     std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
 
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) {
+    for(Graph::EdgeIt e(g); e!=INVALID; ++e) {
       if (cut[g.tail(e)] && !cut[g.head(e)] && !flow[e]==cap[e]) 
         std::cout << "Slackness does not hold!" << std::endl;
@@ -89 +82 @@
   {
     std::cout << "physical blocking flow augmentation ..." << std::endl;
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
+    for(Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
     ts.reset();
     int i=0;
@@ -97 +90 @@
     std::cout << "flow value: "<< augmenting_flow_test.flowValue() << std::endl;
 
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) {
+    for(Graph::EdgeIt e(g); e!=INVALID; ++e) {
       if (cut[g.tail(e)] && !cut[g.head(e)] && !flow[e]==cap[e]) 
         std::cout << "Slackness does not hold!" << std::endl;
@@ -107 +100 @@
   {
     std::cout << "on-the-fly blocking flow augmentation ..." << std::endl;
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
+    for(Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
     ts.reset();
     int i=0;
@@ -115 +108 @@
     std::cout << "flow value: "<< augmenting_flow_test.flowValue() << std::endl;
 
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) {
+    for(Graph::EdgeIt e(g); e!=INVALID; ++e) {
       if (cut[g.tail(e)] && !cut[g.head(e)] && !flow[e]==cap[e]) 
         std::cout << "Slackness does not hold!" << std::endl;
@@ -125 +118 @@
   {
     std::cout << "on-the-fly shortest path augmentation ..." << std::endl;
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
+    for(Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
     ts.reset();
     int i=0;
@@ -133 +126 @@
     std::cout << "flow value: "<< augmenting_flow_test.flowValue() << std::endl;
 
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) {
+    for(Graph::EdgeIt e(g); e!=INVALID; ++e) {
       if (cut[g.tail(e)] && !cut[g.head(e)] && !flow[e]==cap[e]) 
         std::cout << "Slackness does not hold!" << std::endl;
@@ -143 +136 @@
   {
     std::cout << "on-the-fly shortest path augmentation ..." << std::endl;
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
+    for(Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
     ts.reset();
     int i=0;
@@ -151 +144 @@
     std::cout << "flow value: "<< augmenting_flow_test.flowValue() << std::endl;
 
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) {
+    for(Graph::EdgeIt e(g); e!=INVALID; ++e) {
       if (cut[g.tail(e)] && !cut[g.head(e)] && !flow[e]==cap[e]) 
         std::cout << "Slackness does not hold!" << std::endl;