diff -r 891f99700ea1 -r b6c56353832c src/benchmark/hcube.cc
--- a/src/benchmark/hcube.cc	Tue Jul 20 09:43:12 2004 +0000
+++ b/src/benchmark/hcube.cc	Tue Jul 20 09:50:11 2004 +0000
@@ -6,56 +6,12 @@
 #include<hugo/dijkstra.h>
 #include<hugo/time_measure.h>
 #include<iostream>
-#include<../work/jacint/max_flow.h>
+//#include<../work/jacint/max_flow.h>
+#include"bench_tools.h"
 
 using namespace std;
 using namespace hugo;
 
-///An experimental typedef factory
-#define GRAPH_TYPEDEF_FACTORY(Graph) \
-   typedef typename Graph::   Node      Node;\
-   typedef typename Graph::   NodeIt    NodeIn;\
-   typedef typename Graph::   Edge      Edge;\
-   typedef typename Graph::   EdgeIt    EdgeIt;\
-   typedef typename Graph:: InEdgeIt  InEdgeIt;\
-   typedef typename Graph::OutEdgeIt OutEdgeIt;
-
-#define GRAPH_TYPEDEF_FACTORY_NOTYPENAME(Graph) \
-   typedef Graph::   Node      Node;\
-   typedef Graph::   NodeIt    NodeIn;\
-   typedef Graph::   Edge      Edge;\
-   typedef Graph::   EdgeIt    EdgeIt;\
-   typedef Graph:: InEdgeIt  InEdgeIt;\
-   typedef Graph::OutEdgeIt OutEdgeIt;
-
-
-class Primes 
-{
-  vector<int> primes;
-  int n;
-  
-  bool isPrime(int m) 
-  {
-    for(int i=0;m<primes[i]*primes[i];i++) if(!(m%primes[i])) return false;
-    return true;
-  }
-public:
-  Primes() : n(1) {}
-  
-  int operator() ()
-    {
-      if(primes.size()==0) {
-	primes.push_back(2);
-	return 2;
-      }
-      else {
-	do n+=2; while(!isPrime(n));
-	primes.push_back(n);
-	return n;
-      }
-    }
-};
-
 template<class Graph>
 void addHiperCube(Graph &G,int dim,vector<typename Graph::Node> &nodes)
 {