[Lemon-commits] [lemon_svn] marci: r558 - hugo/trunk/src/work/marci

[Lemon SVN]

Author: marci
Date: Mon Apr 26 18:02:09 2004
New Revision: 558

Modified:
   hugo/trunk/src/work/marci/edmonds_karp_demo.cc

Log:
misc


Modified: hugo/trunk/src/work/marci/edmonds_karp_demo.cc
==============================================================================
--- hugo/trunk/src/work/marci/edmonds_karp_demo.cc	(original)
+++ hugo/trunk/src/work/marci/edmonds_karp_demo.cc	Mon Apr 26 18:02:09 2004
@@ -72,6 +72,8 @@
   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);
+  Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
+    pre_flow_ize(G, s, t, cap, flow, false);
   PreflowRes<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
     pre_flow_res(G, s, t, cap, flow, true);
   MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
@@ -86,6 +88,15 @@
   }
 
   {
+    std::cout << "preflow ..." << std::endl;
+    FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
+    ts.reset();
+    pre_flow_ize.run();
+    std::cout << "elapsed time: " << ts << std::endl;
+    std::cout << "flow value: "<< pre_flow_ize.flowValue() << std::endl;
+  }
+
+  {
     std::cout << "wrapped preflow ..." << std::endl;
     FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
     ts.reset();