Changeset 113:cf7b01232d86 in lemon-0.x

Timestamp:

02/22/04 13:17:16 (20 years ago)

Author:

jacint

Branch:

default

Phase:

public

Convert:

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

Message:

* empty log message *

Location:

src/work/jacint

Files:

• preflow.cc (modified) (2 diffs)
• preflow.h (modified) (4 diffs)

src/work/jacint/preflow.cc

@@ -31 +31 @@
   }
 
-  preflow<ListGraph, int> max_flow_test(G, s, t, cap);
-  
+  double pre_time=currTime();
+    preflow<ListGraph, int> max_flow_test(G, s, t, cap);
+  double post_time=currTime();
+    
   ListGraph::NodeMap<bool> cut(G);
   max_flow_test.minCut(cut); 
@@ -57 +59 @@
   
   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 << "min cut value: "<< min_cut_value << std::endl;

src/work/jacint/preflow.h

@@ -9 +9 @@
  stack 'active' on the active nodes on level i implemented by hand
  runs heuristic 'highest label' for H1*n relabels
- runs heuristic 'dound decrease' for H0*n relabels, starts with 'highest label'
+ runs heuristic 'bound decrease' for H0*n relabels, starts with 'highest label'
  
 Parameters H0 and H1 are initialized to 20 and 10.
@@ -44 +44 @@
 #include <vector>
 #include <queue>
+
+#include <time_measure.h>
 
 namespace hugo {
@@ -66 +68 @@
 
   public:
-    
+    double time;
     preflow(Graph& _G, NodeIt _s, NodeIt _t, CapMap& _capacity ) :
       G(_G), s(_s), t(_t), flow(_G, 0), capacity(_capacity)
@@ -167 +169 @@
           } else {
             phase=1;
-
+            time=currTime();
             level.set(s,0);
             std::queue<NodeIt> bfs_queue;