1.1 --- a/src/benchmark/hcube.cc	Tue Jul 20 09:43:12 2004 +0000
     1.2 +++ b/src/benchmark/hcube.cc	Tue Jul 20 09:50:11 2004 +0000
     1.3 @@ -6,56 +6,12 @@
     1.4  #include<hugo/dijkstra.h>
     1.5  #include<hugo/time_measure.h>
     1.6  #include<iostream>
     1.7 -#include<../work/jacint/max_flow.h>
     1.8 +//#include<../work/jacint/max_flow.h>
     1.9 +#include"bench_tools.h"
    1.10  
    1.11  using namespace std;
    1.12  using namespace hugo;
    1.13  
    1.14 -///An experimental typedef factory
    1.15 -#define GRAPH_TYPEDEF_FACTORY(Graph) \
    1.16 -   typedef typename Graph::   Node      Node;\
    1.17 -   typedef typename Graph::   NodeIt    NodeIn;\
    1.18 -   typedef typename Graph::   Edge      Edge;\
    1.19 -   typedef typename Graph::   EdgeIt    EdgeIt;\
    1.20 -   typedef typename Graph:: InEdgeIt  InEdgeIt;\
    1.21 -   typedef typename Graph::OutEdgeIt OutEdgeIt;
    1.22 -
    1.23 -#define GRAPH_TYPEDEF_FACTORY_NOTYPENAME(Graph) \
    1.24 -   typedef Graph::   Node      Node;\
    1.25 -   typedef Graph::   NodeIt    NodeIn;\
    1.26 -   typedef Graph::   Edge      Edge;\
    1.27 -   typedef Graph::   EdgeIt    EdgeIt;\
    1.28 -   typedef Graph:: InEdgeIt  InEdgeIt;\
    1.29 -   typedef Graph::OutEdgeIt OutEdgeIt;
    1.30 -
    1.31 -
    1.32 -class Primes 
    1.33 -{
    1.34 -  vector<int> primes;
    1.35 -  int n;
    1.36 -  
    1.37 -  bool isPrime(int m) 
    1.38 -  {
    1.39 -    for(int i=0;m<primes[i]*primes[i];i++) if(!(m%primes[i])) return false;
    1.40 -    return true;
    1.41 -  }
    1.42 -public:
    1.43 -  Primes() : n(1) {}
    1.44 -  
    1.45 -  int operator() ()
    1.46 -    {
    1.47 -      if(primes.size()==0) {
    1.48 -	primes.push_back(2);
    1.49 -	return 2;
    1.50 -      }
    1.51 -      else {
    1.52 -	do n+=2; while(!isPrime(n));
    1.53 -	primes.push_back(n);
    1.54 -	return n;
    1.55 -      }
    1.56 -    }
    1.57 -};
    1.58 -
    1.59  template<class Graph>
    1.60  void addHiperCube(Graph &G,int dim,vector<typename Graph::Node> &nodes)
    1.61  {