Changeset 133:0631992fe7a1 in lemon-0.x for src/work/marci

Timestamp:

02/27/04 13:39:15 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

Dinits blocking flow added to edmonds_karp_demo.hh.

File:

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

src/work/marci/edmonds_karp_demo.cc

@@ -20 +20 @@
   readDimacsMaxFlow(std::cin, G, s, t, cap);
 
-/*
-  double pre_time_copy=currTime();
-  ListGraph F;
-  ListGraph::NodeMap<NodeIt> G_to_F(G);
-  typedef ListGraph::EachNodeIt EachNodeIt;
-  for(EachNodeIt n=G.first<EachNodeIt>(); n.valid(); ++n) {
-    G_to_F.set(n, F.addNode());
-  }
-  for(EachEdgeIt e=G.first<EachEdgeIt>(); e.valid(); ++e) {
-    F.addEdge(G_to_F.get(G.tail(e)), G_to_F.get(G.head(e)));
-  }
-  double post_time_copy=currTime();
-  std::cout << "copy time: " << post_time_copy-pre_time_copy << " sec"<< std::endl; 
-*/
-
-  std::cout << "edmonds karp demo..." << std::endl;
+  {
+  std::cout << "edmonds karp demo (blocking flow augmentation)..." << std::endl;
   ListGraph::EdgeMap<int> flow(G); //0 flow
 
   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();
-  max_flow_test.run();
+  //max_flow_test.augmentWithBlockingFlow<ListGraph>();
+  max_flow_test.run<ListGraph>();
   double post_time=currTime();
+
   //std::cout << "maximum flow: "<< std::endl;
   //for(EachEdgeIt e=G.first<EachEdgeIt>(); e.valid(); ++e) { 
@@ -50 +37 @@
   std::cout << "elapsed time: " << post_time-pre_time << " sec"<< std::endl; 
   std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
+  }
+
+  {
+  std::cout << "edmonds karp demo (shortest path augmentation)..." << std::endl;
+  ListGraph::EdgeMap<int> flow(G); //0 flow
+
+  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();
+  double post_time=currTime();
+
+  //std::cout << "maximum flow: "<< std::endl;
+  //for(EachEdgeIt e=G.first<EachEdgeIt>(); e.valid(); ++e) { 
+  //  std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
+  //}
+  //std::cout<<std::endl;
+  std::cout << "elapsed time: " << post_time-pre_time << " sec"<< std::endl; 
+  std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
+  }
 
   return 0;