# HG changeset patch
# User alpar
# Date 1162222190 0
# Node ID f6b352fdc6b1dcf53cd5a9dade3b7f649fdd326d
# Parent  a2ab634541525337adddb0ad296f9b7c39b1c445
Turn off 32 bit only tests.

diff -r a2ab63454152 -r f6b352fdc6b1 benchmark/edge_lookup.cc
--- a/benchmark/edge_lookup.cc	Mon Oct 30 15:23:35 2006 +0000
+++ b/benchmark/edge_lookup.cc	Mon Oct 30 15:29:50 2006 +0000
@@ -172,192 +172,192 @@
       
   };
 
-  template<class G>
-  class EdgeLookUp4
-  {
-  public:
-    GRAPH_TYPEDEFS(typename G)
-    typedef G Graph;
+//   template<class G>
+//   class EdgeLookUp4
+//   {
+//   public:
+//     GRAPH_TYPEDEFS(typename G)
+//     typedef G Graph;
     
-  private:
-    const Graph &_g;
-    typename Graph::template NodeMap<Edge*> _start;
-    typename Graph::template NodeMap<Edge*> _end;
-    std::vector<Edge> _edges;
+//   private:
+//     const Graph &_g;
+//     typename Graph::template NodeMap<Edge*> _start;
+//     typename Graph::template NodeMap<Edge*> _end;
+//     std::vector<Edge> _edges;
     
-    class EdgeLess {
-      const Graph &g;
-    public:
-      EdgeLess(const Graph &_g) : g(_g) {}
-      bool operator()(Edge a,Edge b) const 
-      {
-	return g.target(a)<g.target(b);
-      }
-    };
+//     class EdgeLess {
+//       const Graph &g;
+//     public:
+//       EdgeLess(const Graph &_g) : g(_g) {}
+//       bool operator()(Edge a,Edge b) const 
+//       {
+// 	return g.target(a)<g.target(b);
+//       }
+//     };
     
-  public:
+//   public:
     
-    ///Constructor
-    EdgeLookUp4(const Graph &g) :_g(g),_start(g),_end(g) {refresh();}
+//     ///Constructor
+//     EdgeLookUp4(const Graph &g) :_g(g),_start(g),_end(g) {refresh();}
     
-  public:
-    ///Refresh the data structure at a node.
-    void refresh(Node n) 
-    {
-      const int bi = _start[n] = _edges.size();
-      for(OutEdgeIt e(_g,n);e!=INVALID;++e) _edges.push_back(e);
-      const typename std::vector<Edge>::iterator ei=_edges.end();
-      _end[n]=_edges.size();
-      std::sort(_edges.begin()+bi,ei,EdgeLess(_g));
-    }
-    ///Refresh the full data structure.
-    void refresh() 
-    {
-      _edges.resize(countEdges(_g));
-      int l=0;
-      for(NodeIt n(_g);n!=INVALID;++n)
-	{
-	  int ls = l;
-	  _start[n]=&(_edges[l]);	
-	  for(OutEdgeIt e(_g,n);e!=INVALID;++e) _edges[l++]=e;
-	  _end[n]=&(_edges[l]);
-	  std::sort(_edges.begin()+ls,_edges.begin()+l,EdgeLess(_g));
-	}
+//   public:
+//     ///Refresh the data structure at a node.
+//     void refresh(Node n) 
+//     {
+//       const int bi = _start[n] = _edges.size();
+//       for(OutEdgeIt e(_g,n);e!=INVALID;++e) _edges.push_back(e);
+//       const typename std::vector<Edge>::iterator ei=_edges.end();
+//       _end[n]=_edges.size();
+//       std::sort(_edges.begin()+bi,ei,EdgeLess(_g));
+//     }
+//     ///Refresh the full data structure.
+//     void refresh() 
+//     {
+//       _edges.resize(countEdges(_g));
+//       int l=0;
+//       for(NodeIt n(_g);n!=INVALID;++n)
+// 	{
+// 	  int ls = l;
+// 	  _start[n]=&(_edges[l]);	
+// 	  for(OutEdgeIt e(_g,n);e!=INVALID;++e) _edges[l++]=e;
+// 	  _end[n]=&(_edges[l]);
+// 	  std::sort(_edges.begin()+ls,_edges.begin()+l,EdgeLess(_g));
+// 	}
       
-    }
+//     }
     
-    ///Find an edge between two nodes.
+//     ///Find an edge between two nodes.
     
-    ///Find an edge between two nodes.
-    ///\param s The source node
-    ///\param t The target node
-    ///\return An edge from \c s to \c t if there exists,
-    ///\ref INVALID otherwise.
+//     ///Find an edge between two nodes.
+//     ///\param s The source node
+//     ///\param t The target node
+//     ///\return An edge from \c s to \c t if there exists,
+//     ///\ref INVALID otherwise.
 
-    Edge operator()(Node s, Node t) 
-    {
-      Edge *a=_start[s];
-      Edge *b=_end[s];
-      while(a!=b) 
-	{
-// #ifdef X86
- 	  Edge *m=(Edge*)(((unsigned int)a+(unsigned int)b)/2 & 0xfffffffc);
-// #elif X86_64
-// 	  Edge *m=(Edge*)(((unsigned long)a+(undigned long)b)/2 & 0xfffffffc);
-// #else
-//  	  Edge *m=a+((b-a)/2);
-// #endif
-	  Node tt = _g.target(*m);
-	  if(tt==t) return *m;
-	  else if(tt<t) a=m+1;
-	  else b=m;
-	}
-      return INVALID;
-    }
+//     Edge operator()(Node s, Node t) 
+//     {
+//       Edge *a=_start[s];
+//       Edge *b=_end[s];
+//       while(a!=b) 
+// 	{
+// // #ifdef X86
+//  	  Edge *m=(Edge*)(((unsigned int)a+(unsigned int)b)/2 & 0xfffffffc);
+// // #elif X86_64
+// // 	  Edge *m=(Edge*)(((unsigned long)a+(undigned long)b)/2 & 0xfffffffc);
+// // #else
+// //  	  Edge *m=a+((b-a)/2);
+// // #endif
+// 	  Node tt = _g.target(*m);
+// 	  if(tt==t) return *m;
+// 	  else if(tt<t) a=m+1;
+// 	  else b=m;
+// 	}
+//       return INVALID;
+//     }
 
-    ///Find the next edge
+//     ///Find the next edge
       
-      ///\warning This function is unimplemented.
-    Edge operator()(Node s, Node t, Edge prev) 
-    {
-      return prev==INVALID?(*this)(s,t):INVALID;
-    }
+//       ///\warning This function is unimplemented.
+//     Edge operator()(Node s, Node t, Edge prev) 
+//     {
+//       return prev==INVALID?(*this)(s,t):INVALID;
+//     }
       
-  };
+//   };
 
-  template<class G>
-  class EdgeLookUp5
-  {
-  public:
-    GRAPH_TYPEDEFS(typename G)
-    typedef G Graph;
+//   template<class G>
+//   class EdgeLookUp5
+//   {
+//   public:
+//     GRAPH_TYPEDEFS(typename G)
+//     typedef G Graph;
     
-  private:
-    const Graph &_g;
-    typename Graph::template NodeMap<Edge*> _start;
-    typename Graph::template NodeMap<Edge*> _end;
-    std::vector<Edge> _edges;
+//   private:
+//     const Graph &_g;
+//     typename Graph::template NodeMap<Edge*> _start;
+//     typename Graph::template NodeMap<Edge*> _end;
+//     std::vector<Edge> _edges;
     
-    class EdgeLess {
-      const Graph &g;
-    public:
-      EdgeLess(const Graph &_g) : g(_g) {}
-      bool operator()(Edge a,Edge b) const 
-      {
-	return g.target(a)<g.target(b);
-      }
-    };
+//     class EdgeLess {
+//       const Graph &g;
+//     public:
+//       EdgeLess(const Graph &_g) : g(_g) {}
+//       bool operator()(Edge a,Edge b) const 
+//       {
+// 	return g.target(a)<g.target(b);
+//       }
+//     };
     
-  public:
+//   public:
     
-    ///Constructor
-    EdgeLookUp5(const Graph &g) :_g(g),_start(g),_end(g) {refresh();}
+//     ///Constructor
+//     EdgeLookUp5(const Graph &g) :_g(g),_start(g),_end(g) {refresh();}
     
-  public:
-    ///Refresh the data structure at a node.
-    void refresh(Node n) 
-    {
-      const int bi = _start[n] = _edges.size();
-      for(OutEdgeIt e(_g,n);e!=INVALID;++e) _edges.push_back(e);
-      const typename std::vector<Edge>::iterator ei=_edges.end();
-      _end[n]=_edges.size();
-      std::sort(_edges.begin()+bi,ei,EdgeLess(_g));
-    }
-    ///Refresh the full data structure.
-    void refresh() 
-    {
-      _edges.resize(countEdges(_g));
-      int l=0;
-      for(NodeIt n(_g);n!=INVALID;++n)
-	{
-	  int ls = l;
-	  _start[n]=&(_edges[l]);	
-	  for(OutEdgeIt e(_g,n);e!=INVALID;++e) _edges[l++]=e;
-	  _end[n]=&(_edges[l]);
-	  std::sort(_edges.begin()+ls,_edges.begin()+l,EdgeLess(_g));
-	}
+//   public:
+//     ///Refresh the data structure at a node.
+//     void refresh(Node n) 
+//     {
+//       const int bi = _start[n] = _edges.size();
+//       for(OutEdgeIt e(_g,n);e!=INVALID;++e) _edges.push_back(e);
+//       const typename std::vector<Edge>::iterator ei=_edges.end();
+//       _end[n]=_edges.size();
+//       std::sort(_edges.begin()+bi,ei,EdgeLess(_g));
+//     }
+//     ///Refresh the full data structure.
+//     void refresh() 
+//     {
+//       _edges.resize(countEdges(_g));
+//       int l=0;
+//       for(NodeIt n(_g);n!=INVALID;++n)
+// 	{
+// 	  int ls = l;
+// 	  _start[n]=&(_edges[l]);	
+// 	  for(OutEdgeIt e(_g,n);e!=INVALID;++e) _edges[l++]=e;
+// 	  _end[n]=&(_edges[l]);
+// 	  std::sort(_edges.begin()+ls,_edges.begin()+l,EdgeLess(_g));
+// 	}
       
-    }
+//     }
     
-    ///Find an edge between two nodes.
+//     ///Find an edge between two nodes.
     
-    ///Find an edge between two nodes.
-    ///\param s The source node
-    ///\param t The target node
-    ///\return An edge from \c s to \c t if there exists,
-    ///\ref INVALID otherwise.
+//     ///Find an edge between two nodes.
+//     ///\param s The source node
+//     ///\param t The target node
+//     ///\return An edge from \c s to \c t if there exists,
+//     ///\ref INVALID otherwise.
 
-    Edge operator()(Node s, Node t) 
-    {
-      Edge *a=_start[s];
-      Edge *b=_end[s];
-      while(a!=b) 
-	{
-// #ifdef X86
- 	  Edge *m=(Edge*)((((unsigned int)a>>1)+((unsigned int)b)>>1)
-			  & 0xfffffffc);
-// #elif X86_64
-// 	  Edge *m=(Edge*)(((unsigned long)a>>1+(undigned long)b)>>1)&0xfffffffc);
-// #else
-//  	  Edge *m=a+((b-a)/2);
-// #endif
-	  Node tt = _g.target(*m);
-	  if(tt==t) return *m;
-	  else if(tt<t) a=m+1;
-	  else b=m;
-	}
-      return INVALID;
-    }
+//     Edge operator()(Node s, Node t) 
+//     {
+//       Edge *a=_start[s];
+//       Edge *b=_end[s];
+//       while(a!=b) 
+// 	{
+// // #ifdef X86
+//  	  Edge *m=(Edge*)((((unsigned int)a>>1)+((unsigned int)b)>>1)
+// 			  & 0xfffffffc);
+// // #elif X86_64
+// // 	  Edge *m=(Edge*)(((unsigned long)a>>1+(undigned long)b)>>1)&0xfffffffc);
+// // #else
+// //  	  Edge *m=a+((b-a)/2);
+// // #endif
+// 	  Node tt = _g.target(*m);
+// 	  if(tt==t) return *m;
+// 	  else if(tt<t) a=m+1;
+// 	  else b=m;
+// 	}
+//       return INVALID;
+//     }
 
-    ///Find the next edge
+//     ///Find the next edge
       
-      ///\warning This function is unimplemented.
-    Edge operator()(Node s, Node t, Edge prev) 
-    {
-      return prev==INVALID?(*this)(s,t):INVALID;
-    }
+//       ///\warning This function is unimplemented.
+//     Edge operator()(Node s, Node t, Edge prev) 
+//     {
+//       return prev==INVALID?(*this)(s,t):INVALID;
+//     }
       
-  };
+//   };
 
 GRAPH_TYPEDEFS(SmartGraph)
 typedef SmartGraph Graph;
@@ -496,15 +496,15 @@
   TimeStamp t2 = runningTimeTest(EL(g),1);
   TimeStamp t3 = runningTimeTest(EL2(g),1);
   TimeStamp t4 = runningTimeTest(EL3(g),1);
-  TimeStamp t5 = runningTimeTest(EL4(g),1);
-  TimeStamp t6 = runningTimeTest(EL5(g),1);
+//   TimeStamp t5 = runningTimeTest(EL4(g),1);
+//   TimeStamp t6 = runningTimeTest(EL5(g),1);
 
   std::cout << t1.userTime()/N/N << ' ' 
 	    << t2.userTime()/N/N << ' '
 	    << t3.userTime()/N/N << ' '
 	    << t4.userTime()/N/N << ' '
-	    << t5.userTime()/N/N << ' '
- 	    << t6.userTime()/N/N
+// 	    << t5.userTime()/N/N << ' '
+//  	    << t6.userTime()/N/N
 	    << std::endl;
 }