Changeset 138:c6297c121409 in lemon-0.x for src/work/marci

Timestamp:

03/01/04 13:06:56 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

.

File:

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

src/work/marci/edmonds_karp_demo.cc

@@ -27 +27 @@
   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();
 
@@ -36 +37 @@
   //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;
   }
@@ -46 +48 @@
   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();
 
@@ -55 +58 @@
   //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;
   }