1.1 --- a/src/work/jacint/preflow.h	Sun Feb 22 11:45:38 2004 +0000
     1.2 +++ b/src/work/jacint/preflow.h	Sun Feb 22 12:17:16 2004 +0000
     1.3 @@ -8,7 +8,7 @@
     1.4   list 'level_list' on the nodes on level i implemented by hand
     1.5   stack 'active' on the active nodes on level i implemented by hand
     1.6   runs heuristic 'highest label' for H1*n relabels
     1.7 - runs heuristic 'dound decrease' for H0*n relabels, starts with 'highest label'
     1.8 + runs heuristic 'bound decrease' for H0*n relabels, starts with 'highest label'
     1.9   
    1.10  Parameters H0 and H1 are initialized to 20 and 10.
    1.11  
    1.12 @@ -44,6 +44,8 @@
    1.13  #include <vector>
    1.14  #include <queue>
    1.15  
    1.16 +#include <time_measure.h>
    1.17 +
    1.18  namespace hugo {
    1.19  
    1.20    template <typename Graph, typename T, 
    1.21 @@ -65,7 +67,7 @@
    1.22      T value;
    1.23  
    1.24    public:
    1.25 -    
    1.26 +    double time;
    1.27      preflow(Graph& _G, NodeIt _s, NodeIt _t, CapMap& _capacity ) :
    1.28        G(_G), s(_s), t(_t), flow(_G, 0), capacity(_capacity)
    1.29      {
    1.30 @@ -166,7 +168,7 @@
    1.31  	    end=true;
    1.32  	  } else {
    1.33  	    phase=1;
    1.34 -
    1.35 +	    time=currTime();
    1.36  	    level.set(s,0);
    1.37  	    std::queue<NodeIt> bfs_queue;
    1.38  	    bfs_queue.push(s);