1.1 --- a/src/benchmark/hcube.cc	Thu Jul 22 14:24:00 2004 +0000
     1.2 +++ b/src/benchmark/hcube.cc	Thu Jul 22 14:28:00 2004 +0000
     1.3 @@ -4,7 +4,8 @@
     1.4  #include<hugo/list_graph.h>
     1.5  #include<hugo/smart_graph.h>
     1.6  #include<hugo/dijkstra.h>
     1.7 -#include<../work/jacint/max_flow_no_stack.h>
     1.8 +#include<hugo/max_flow.h>
     1.9 +
    1.10  #include"bench_tools.h"
    1.11  
    1.12  using namespace std;
    1.13 @@ -94,7 +95,7 @@
    1.14  
    1.15    T.reset();
    1.16    Graph::EdgeMap<int> map(G);
    1.17 -  {
    1.18 +  for(int i=0;i<5;i++) {
    1.19      Primes P;
    1.20      for(int i=0;i<dim*(1<<dim);i++) P();
    1.21      
    1.22 @@ -115,7 +116,8 @@
    1.23    T.reset();
    1.24    {
    1.25      Dijkstra<Graph> Dij(G,map);
    1.26 -    Dij.run(nodes[0]);
    1.27 +    for(int i=0;i<10;i++)
    1.28 +      Dij.run(nodes[0]);
    1.29    }
    1.30    PrintTime("DIJKSTRA",T);
    1.31  
    1.32 @@ -123,8 +125,9 @@
    1.33    {
    1.34     Graph::EdgeMap<int> flow(G);
    1.35     
    1.36 -    MaxFlowNoStack<Graph,int> MF(G,nodes[0],nodes[1<<dim-1],map,flow);
    1.37 -    MF.run(MF.NO_FLOW);
    1.38 +    MaxFlow<Graph,int> MF(G,nodes[0],nodes[1<<dim-1],map,flow);
    1.39 +    for(int i=0;i<10;i++)
    1.40 +      MF.run(MF.NO_FLOW);
    1.41    }
    1.42    PrintTime("PREFLOW",T);
    1.43