Changeset 476:cfe550761745 in lemon-0.x for src/work/marci/lg_vs_sg.cc

Timestamp:

04/29/04 18:25:03 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

preflow, maxflow

File:

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

src/work/marci/lg_vs_sg.cc

@@ -7 +7 @@
 #include <smart_graph.h>
 #include <dimacs.h>
-#include <edmonds_karp.h>
 #include <preflow.h>
 #include <time_measure.h>
@@ -35 +34 @@
     Timer ts;
     Graph::EdgeMap<int> flow(G); //0 flow
-    Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-      pre_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);
+      max_flow_test(G, s, t, cap, flow/*, true*/);
 
     std::cout << "ListGraph ..." << std::endl;
@@ -45 +42 @@
       std::cout << "preflow ..." << std::endl;
       ts.reset();
-      pre_flow_test.run();
+      max_flow_test.run();
       std::cout << "elapsed time: " << ts << std::endl;
-      std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;
+      std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
     }
 
@@ -61 +58 @@
     }
 
-    {
-      std::cout << "faster physical blocking flow augmentation ..." << std::endl;
-      FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
-      ts.reset();
-      int i=0;
-      while (max_flow_test.augmentOnBlockingFlow1<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;
-    }
+//     {
+//       std::cout << "faster physical blocking flow augmentation ..." << std::endl;
+//       FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
+//       ts.reset();
+//       int i=0;
+//       while (max_flow_test.augmentOnBlockingFlow1<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;
+//     }
 
     {
@@ -109 +106 @@
     Timer ts;
     Graph::EdgeMap<int> flow(G); //0 flow
-    Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-      pre_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);
+      max_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);
 
     std::cout << "SmatrGraph ..." << std::endl;
@@ -120 +117 @@
       FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
       ts.reset();
-      pre_flow_test.run();
+      max_flow_test.run();
       std::cout << "elapsed time: " << ts << std::endl;
-      std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;
+      std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
     }
 
@@ -136 +133 @@
     }
 
-    {
-      std::cout << "faster physical blocking flow augmentation ..." << std::endl;
-      FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
-      ts.reset();
-      int i=0;
-      while (max_flow_test.augmentOnBlockingFlow1<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;
-    }
+//     {
+//       std::cout << "faster physical blocking flow augmentation ..." << std::endl;
+//       FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
+//       ts.reset();
+//       int i=0;
+//       while (max_flow_test.augmentOnBlockingFlow1<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;
+//     }
 
     {