1.1 --- a/src/work/marci/graph_wrapper_test.cc	Thu Sep 16 14:27:27 2004 +0000
     1.2 +++ b/src/work/marci/graph_wrapper_test.cc	Thu Sep 16 15:05:10 2004 +0000
     1.3 @@ -5,8 +5,8 @@
     1.4  #include<hugo/full_graph.h>
     1.5  #include<hugo/graph_wrapper.h>
     1.6  
     1.7 -#include"test_tools.h"
     1.8 -#include"graph_test.h"
     1.9 +#include"test/test_tools.h"
    1.10 +#include"test/graph_test.h"
    1.11  
    1.12  /**
    1.13  \file
    1.14 @@ -20,47 +20,47 @@
    1.15  
    1.16  using namespace hugo;
    1.17  
    1.18 -template<class Graph> void bidirPetersen(Graph &G)
    1.19 -{
    1.20 -  typedef typename Graph::Edge Edge;
    1.21 -  typedef typename Graph::EdgeIt EdgeIt;
    1.22 +// template<class Graph> void bidirPetersen(Graph &G)
    1.23 +// {
    1.24 +//   typedef typename Graph::Edge Edge;
    1.25 +//   typedef typename Graph::EdgeIt EdgeIt;
    1.26    
    1.27 -  checkGraphEdgeList(G,15);
    1.28 +//   checkGraphEdgeList(G,15);
    1.29    
    1.30 -  std::vector<Edge> ee;
    1.31 +//   std::vector<Edge> ee;
    1.32    
    1.33 -  for(EdgeIt e(G);e!=INVALID;++e) ee.push_back(e);
    1.34 +//   for(EdgeIt e(G);e!=INVALID;++e) ee.push_back(e);
    1.35  
    1.36 -  for(typename std::vector<Edge>::iterator p=ee.begin();p!=ee.end();p++)
    1.37 -    G.addEdge(G.head(*p),G.tail(*p));
    1.38 -}
    1.39 +//   for(typename std::vector<Edge>::iterator p=ee.begin();p!=ee.end();p++)
    1.40 +//     G.addEdge(G.head(*p),G.tail(*p));
    1.41 +// }
    1.42  
    1.43 -template<class Graph> void checkPetersen(Graph &G)
    1.44 -{
    1.45 -  typedef typename Graph::Node Node;
    1.46 +// template<class Graph> void checkPetersen(Graph &G)
    1.47 +// {
    1.48 +//   typedef typename Graph::Node Node;
    1.49  
    1.50 -  typedef typename Graph::EdgeIt EdgeIt;
    1.51 -  typedef typename Graph::NodeIt NodeIt;
    1.52 +//   typedef typename Graph::EdgeIt EdgeIt;
    1.53 +//   typedef typename Graph::NodeIt NodeIt;
    1.54  
    1.55 -  checkGraphNodeList(G,10);
    1.56 -  checkGraphEdgeList(G,30);
    1.57 +//   checkGraphNodeList(G,10);
    1.58 +//   checkGraphEdgeList(G,30);
    1.59  
    1.60 -  for(NodeIt n(G);n!=INVALID;++n) {
    1.61 -    checkGraphInEdgeList(G,n,3);
    1.62 -    checkGraphOutEdgeList(G,n,3);
    1.63 -    ++n;
    1.64 -  }  
    1.65 -}
    1.66 +//   for(NodeIt n(G);n!=INVALID;++n) {
    1.67 +//     checkGraphInEdgeList(G,n,3);
    1.68 +//     checkGraphOutEdgeList(G,n,3);
    1.69 +//     ++n;
    1.70 +//   }  
    1.71 +// }
    1.72  
    1.73 -//Compile GraphSkeleton
    1.74 -template void checkCompileStaticGraph<skeleton::StaticGraphSkeleton>
    1.75 -(skeleton::StaticGraphSkeleton &);
    1.76 +// //Compile GraphSkeleton
    1.77 +// template void checkCompileStaticGraph<skeleton::StaticGraphSkeleton>
    1.78 +// (skeleton::StaticGraphSkeleton &);
    1.79  
    1.80 -template void checkCompileGraph<skeleton::GraphSkeleton>
    1.81 -(skeleton::GraphSkeleton &);
    1.82 +// template void checkCompileGraph<skeleton::GraphSkeleton>
    1.83 +// (skeleton::GraphSkeleton &);
    1.84  
    1.85 -template void checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>
    1.86 -(skeleton::ErasableGraphSkeleton &);
    1.87 +// template void checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>
    1.88 +// (skeleton::ErasableGraphSkeleton &);
    1.89  
    1.90  //Compile SmartGraph
    1.91  typedef SmartGraph Graph;