diff -r 891f99700ea1 -r b6c56353832c src/benchmark/graph-bench.cc
--- a/src/benchmark/graph-bench.cc	Tue Jul 20 09:43:12 2004 +0000
+++ b/src/benchmark/graph-bench.cc	Tue Jul 20 09:50:11 2004 +0000
@@ -2,39 +2,11 @@
 #include<hugo/list_graph.h>
 #include<hugo/time_measure.h>
 #include<iostream>
-#include<sage_graph.h>
-#include<vector>
+
+#include"bench_tools.h"
 
 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;
- 
-
-///A primitive primtest
-bool isPrim(int n)
-{
-  if(n%2) {
-    for(int k=3;n/k>=k;k+=2)
-      if(!(n%k)) return false;
-    return true;
-  }
-  return false;
-}
-
-///Finds the smallest prime not less then \c n.
-int nextPrim(int n)
-{
-  for(n+=!(n%2);!isPrim(n);n+=2) ;
-  return n;
-}
-
 ///Makes a full graph by adding and deleting a lot of edges;
 
 ///\param n Number of nodes.