Changeset 762:511200bdb71f in lemon-0.x for src/work/marci/lg_vs_sg_vs_sg.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/lg_vs_sg_vs_sg.cc (modified) (13 diffs)

src/work/marci/lg_vs_sg_vs_sg.cc

@@ -8 +8 @@
 #include <hugo/smart_graph.h>
 #include <hugo/dimacs.h>
-#include <max_flow.h>
+#include <hugo/max_flow.h>
+#include <augmenting_flow.h>
 #include <hugo/time_measure.h>
-#include <hugo/for_each_macros.h>
+#include <for_each_macros.h>
 
 using namespace hugo;
@@ -38 +39 @@
     MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
       max_flow_test(g, s, t, cap, flow/*, true*/);
+    AugmentingFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
+      augmenting_flow_test(g, s, t, cap, flow/*, true*/);
 
     std::cout << "SageGraph ..." << std::endl;
@@ -54 +57 @@
       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;
     }
 
@@ -76 +79 @@
       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;
     }
 
@@ -87 +90 @@
       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;
     }
   }
@@ -110 +113 @@
     MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
       max_flow_test(g, s, t, cap, flow/*, true*/);
+    AugmentingFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
+      augmenting_flow_test(g, s, t, cap, flow/*, true*/);
     //    MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
     //  max_flow_test(g, s, t, cap, flow);
@@ -129 +134 @@
       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;
     }
 
@@ -151 +156 @@
       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;
     }
 
@@ -162 +167 @@
       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;
     }
   }
@@ -185 +190 @@
     MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
       max_flow_test(g, s, t, cap, flow/*, true*/);
+    AugmentingFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
+      augmenting_flow_test(g, s, t, cap, flow/*, true*/);
     //    MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
     //  max_flow_test(g, s, t, cap, flow);
@@ -204 +211 @@
       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;
     }
 
@@ -226 +233 @@
       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;
     }
 
@@ -237 +244 @@
       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;
     }
   }
-
-
-
 
   return 0;