Changeset 211:9222a9b8b323 in lemon-0.x for src/work/jacint/preflow.cc

Timestamp:

03/19/04 23:16:05 (20 years ago)

Author:

jacint

Branch:

default

Phase:

public

Convert:

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

Message:

updating

File:

• src/work/jacint/preflow.cc (modified) (6 diffs)

src/work/jacint/preflow.cc

@@ -2 +2 @@
 #include <fstream>
 
-#include <list_graph.hh>
-#include <dimacs.hh>
+#include <list_graph.h>
+#include <dimacs.h>
 #include <preflow.h>
 #include <time_measure.h>
@@ -12 +12 @@
 // read_dimacs_demo < dimacs_max_flow_file
 int main(int, char **) {
-  typedef ListGraph::NodeIt NodeIt;
-  typedef ListGraph::EachEdgeIt EachEdgeIt;
+  typedef ListGraph::Node Node;
+  typedef ListGraph::EdgeIt EdgeIt;
 
   ListGraph G;
-  NodeIt s, t;
+  Node s, t;
   ListGraph::EdgeMap<int> cap(G);
   readDimacsMaxFlow(std::cin, G, s, t, cap);
@@ -25 +25 @@
 
   for ( int i=1; i!=11; ++i ) {
+    ListGraph::EdgeMap<int> flow(G);
     double pre_time=currTime();
-    preflow<ListGraph, int> max_flow_test(G, s, t, cap);
+    Preflow<ListGraph, int> max_flow_test(G, s, t, cap, flow);
+    max_flow_test.run();
     double post_time=currTime();
     if ( mintime > post_time-pre_time ) mintime = post_time-pre_time;
   }
 
-  double pre_time=currTime();
-    preflow<ListGraph, int> max_flow_test(G, s, t, cap);
-  double post_time=currTime();
-    
+  ListGraph::EdgeMap<int> flow(G);
+  Preflow<ListGraph, int> max_flow_test(G, s, t, cap, flow);
+  max_flow_test.run();
+  
   ListGraph::NodeMap<bool> cut(G);
   max_flow_test.minCut(cut); 
   int min_cut_value=0;
-  for(EachEdgeIt e=G.first<EachEdgeIt>(); e.valid(); ++e) {
+  EdgeIt e;
+  for(G.first(e); G.valid(e); G.next(e)) {
     if (cut.get(G.tail(e)) && !cut.get(G.head(e))) min_cut_value+=cap.get(e);
   }
@@ -45 +48 @@
   max_flow_test.minMinCut(cut1); 
   int min_min_cut_value=0;
-  for(EachEdgeIt e=G.first<EachEdgeIt>(); e.valid(); ++e) {
+  for(G.first(e); G.valid(e); G.next(e)) {
     if (cut.get(G.tail(e)) && !cut.get(G.head(e))) 
       min_min_cut_value+=cap.get(e);
@@ -53 +56 @@
   max_flow_test.maxMinCut(cut2); 
   int max_min_cut_value=0;
-  for(EachEdgeIt e=G.first<EachEdgeIt>(); e.valid(); ++e) {
+  for(G.first(e); G.valid(e); G.next(e)) {
     if (cut2.get(G.tail(e)) && !cut2.get(G.head(e))) 
       max_min_cut_value+=cap.get(e);
@@ -59 +62 @@
   
   std::cout << "min time of 10 runs: " << mintime << " sec"<< std::endl; 
-  std::cout << "phase 0: " << max_flow_test.time-pre_time 
-            << " sec"<< std::endl; 
-  std::cout << "phase 1: " << post_time-max_flow_test.time 
-            << " sec"<< std::endl; 
-  std::cout << "flow value: "<< max_flow_test.maxFlow() << std::endl;
+  std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
   std::cout << "min cut value: "<< min_cut_value << std::endl;
   std::cout << "min min cut value: "<< min_min_cut_value << std::endl;