# HG changeset patch
# User marci
# Date 1078142816 0
# Node ID c6297c1214090b8d6a398e7d31a7ef9ec996682d
# Parent  6364b07f8cd4da337893df04874095af7ef40257
.

diff -r 6364b07f8cd4 -r c6297c121409 src/work/marci/edmonds_karp_demo.cc
--- a/src/work/marci/edmonds_karp_demo.cc	Mon Mar 01 11:33:10 2004 +0000
+++ b/src/work/marci/edmonds_karp_demo.cc	Mon Mar 01 12:06:56 2004 +0000
@@ -26,7 +26,8 @@
   double pre_time=currTime();
   MaxFlow<ListGraph, int, ListGraph::EdgeMap<int>, ListGraph::EdgeMap<int> > max_flow_test(G, s, t, flow, cap);
   //max_flow_test.augmentWithBlockingFlow<ListGraph>();
-  max_flow_test.run<ListGraph>();
+  int i=0;
+  while (max_flow_test.augmentOnBlockingFlow<ListGraph>()) { ++i; }
   double post_time=currTime();
 
   //std::cout << "maximum flow: "<< std::endl;
@@ -35,6 +36,7 @@
   //}
   //std::cout<<std::endl;
   std::cout << "elapsed time: " << post_time-pre_time << " sec"<< std::endl; 
+  std::cout << "number of augmentation phases: " << i << std::endl; 
   std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
   }
 
@@ -45,7 +47,8 @@
   double pre_time=currTime();
   MaxFlow<ListGraph, int, ListGraph::EdgeMap<int>, ListGraph::EdgeMap<int> > max_flow_test(G, s, t, flow, cap);
   //max_flow_test.augmentWithBlockingFlow<ListGraph>();
-  max_flow_test.run();
+  int i=0;
+  while (max_flow_test.augmentOnShortestPath()) { ++i; }
   double post_time=currTime();
 
   //std::cout << "maximum flow: "<< std::endl;
@@ -54,6 +57,7 @@
   //}
   //std::cout<<std::endl;
   std::cout << "elapsed time: " << post_time-pre_time << " sec"<< std::endl; 
+  std::cout << "number of augmentation phases: " << i << std::endl; 
   std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
   }