Changeset 762:511200bdb71f in lemon-0.x for src/work/marci/max_flow_demo.cc

Timestamp:

08/17/04 13:20:16 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

technical corrections

File:

• src/work/marci/max_flow_demo.cc (modified) (7 diffs)

src/work/marci/max_flow_demo.cc

@@ -8 +8 @@
 #include <hugo/time_measure.h>
 //#include <graph_wrapper.h>
-#include <max_flow.h>
+#include <hugo/max_flow.h>
+#include <augmenting_flow.h>
 //#include <preflow_res.h>
-#include <hugo/for_each_macros.h>
+#include <for_each_macros.h>
 #include <graph_concept.h>
 
@@ -39 +40 @@
 
   //typedef FullFeatureGraphConcept Graph;
-  typedef SmartGraph Graph;
-  //  typedef SageGraph Graph;
+  //typedef SmartGraph Graph;
+  typedef SageGraph Graph;
   typedef Graph::Node Node;
   typedef Graph::EdgeIt EdgeIt;
@@ -76 +77 @@
   MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
     max_flow_test(g, s, t, cap, flow);
+  AugmentingFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
+    augmenting_flow_test(g, s, t, cap, flow);
+  
   Graph::NodeMap<bool> cut(g);
 
@@ -124 +128 @@
     ts.reset();
     int i=0;
-    while (max_flow_test.augmentOnBlockingFlow<MutableGraph>()) { ++i; }
-    std::cout << "elapsed time: " << ts << std::endl;
-    std::cout << "number of augmentation phases: " << i << std::endl; 
-    std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
+    while (augmenting_flow_test.augmentOnBlockingFlow<MutableGraph>()) { ++i; }
+    std::cout << "elapsed time: " << ts << std::endl;
+    std::cout << "number of augmentation phases: " << i << std::endl; 
+    std::cout << "flow value: "<< augmenting_flow_test.flowValue() << std::endl;
 
     FOR_EACH_LOC(Graph::EdgeIt, e, g) {
@@ -153 +157 @@
     ts.reset();
     int i=0;
-    while (max_flow_test.augmentOnBlockingFlow2()) { ++i; }
-    std::cout << "elapsed time: " << ts << std::endl;
-    std::cout << "number of augmentation phases: " << i << std::endl; 
-    std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
+    while (augmenting_flow_test.augmentOnBlockingFlow2()) { ++i; }
+    std::cout << "elapsed time: " << ts << std::endl;
+    std::cout << "number of augmentation phases: " << i << std::endl; 
+    std::cout << "flow value: "<< augmenting_flow_test.flowValue() << std::endl;
 
     FOR_EACH_LOC(Graph::EdgeIt, e, g) {
@@ -171 +175 @@
     ts.reset();
     int i=0;
-    while (max_flow_test.augmentOnShortestPath()) { ++i; }
-    std::cout << "elapsed time: " << ts << std::endl;
-    std::cout << "number of augmentation phases: " << i << std::endl; 
-    std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
+    while (augmenting_flow_test.augmentOnShortestPath()) { ++i; }
+    std::cout << "elapsed time: " << ts << std::endl;
+    std::cout << "number of augmentation phases: " << i << std::endl; 
+    std::cout << "flow value: "<< augmenting_flow_test.flowValue() << std::endl;
 
     FOR_EACH_LOC(Graph::EdgeIt, e, g) {
@@ -189 +193 @@
     ts.reset();
     int i=0;
-    while (max_flow_test.augmentOnShortestPath2()) { ++i; }
-    std::cout << "elapsed time: " << ts << std::endl;
-    std::cout << "number of augmentation phases: " << i << std::endl; 
-    std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
+    while (augmenting_flow_test.augmentOnShortestPath2()) { ++i; }
+    std::cout << "elapsed time: " << ts << std::endl;
+    std::cout << "number of augmentation phases: " << i << std::endl; 
+    std::cout << "flow value: "<< augmenting_flow_test.flowValue() << std::endl;
 
     FOR_EACH_LOC(Graph::EdgeIt, e, g) {