Changeset 376:5c12f3515452 in lemon-0.x for src/work/marci/edmonds_karp_demo.cc

Timestamp:

04/22/04 18:07:17 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

preflow mods

File:

• src/work/marci/edmonds_karp_demo.cc (modified) (3 diffs)

src/work/marci/edmonds_karp_demo.cc

@@ -10 +10 @@
 //#include <graph_wrapper.h>
 #include <preflow.h>
+#include <preflowproba.h>
 #include <for_each_macros.h>
 
@@ -71 +72 @@
   Graph::EdgeMap<int> flow(G); //0 flow
   Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-    pre_flow_test(G, s, t, cap, flow);
+    pre_flow_test(G, s, t, cap, flow, true);
+  PreflowProba<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
+    pre_flow_proba(G, s, t, cap, flow, true, true);
   MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
     max_flow_test(G, s, t, cap, flow);
@@ -79 +82 @@
     ts.reset();
     pre_flow_test.run();
+    std::cout << "elapsed time: " << ts << std::endl;
+    std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;
+  }
+
+  {
+    std::cout << "wrapped preflow ..." << std::endl;
+    FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
+    ts.reset();
+    pre_flow_proba.run();
     std::cout << "elapsed time: " << ts << std::endl;
     std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;