1.1 --- a/src/hugo/graph_wrapper.h	Thu Sep 16 14:27:27 2004 +0000
     1.2 +++ b/src/hugo/graph_wrapper.h	Thu Sep 16 15:05:10 2004 +0000
     1.3 @@ -229,9 +229,9 @@
     1.4      public:
     1.5        NodeMap(const GraphWrapper<Graph>& gw) :  Parent(*(gw.graph)) { }
     1.6        NodeMap(const GraphWrapper<Graph>& gw, T a) : Parent(*(gw.graph), a) { }
     1.7 -//       NodeMap(const NodeMap<T>& map) : Parent(map) { }
     1.8 -//       template<typename Map>
     1.9 -//       NodeMap(const Map& map) :  Parent(map) { }
    1.10 +      NodeMap(const NodeMap<T>& map) : Parent(map) { }
    1.11 +      template<typename Map>
    1.12 +      NodeMap(const Map& map) :  Parent(map) { }
    1.13      };
    1.14  
    1.15      template<typename T> class EdgeMap : public Graph::template EdgeMap<T> { 
    1.16 @@ -239,9 +239,9 @@
    1.17      public:
    1.18        EdgeMap(const GraphWrapper<Graph>& gw) : Parent(*(gw.graph)) { }
    1.19        EdgeMap(const GraphWrapper<Graph>& gw, T a) : Parent(*(gw.graph), a) { }
    1.20 -//       EdgeMap(const EdgeMap<T>& map) : Parent(map) { }
    1.21 -//       template<typename Map>
    1.22 -//       EdgeMap(const Map& map) :  Parent(map) { }
    1.23 +      EdgeMap(const EdgeMap<T>& map) : Parent(map) { }
    1.24 +      template<typename Map>
    1.25 +      EdgeMap(const Map& map) :  Parent(map) { }
    1.26      };
    1.27    };
    1.28  

     2.1 --- a/src/work/marci/graph_wrapper_test.cc	Thu Sep 16 14:27:27 2004 +0000
     2.2 +++ b/src/work/marci/graph_wrapper_test.cc	Thu Sep 16 15:05:10 2004 +0000
     2.3 @@ -5,8 +5,8 @@
     2.4  #include<hugo/full_graph.h>
     2.5  #include<hugo/graph_wrapper.h>
     2.6  
     2.7 -#include"test_tools.h"
     2.8 -#include"graph_test.h"
     2.9 +#include"test/test_tools.h"
    2.10 +#include"test/graph_test.h"
    2.11  
    2.12  /**
    2.13  \file
    2.14 @@ -20,47 +20,47 @@
    2.15  
    2.16  using namespace hugo;
    2.17  
    2.18 -template<class Graph> void bidirPetersen(Graph &G)
    2.19 -{
    2.20 -  typedef typename Graph::Edge Edge;
    2.21 -  typedef typename Graph::EdgeIt EdgeIt;
    2.22 +// template<class Graph> void bidirPetersen(Graph &G)
    2.23 +// {
    2.24 +//   typedef typename Graph::Edge Edge;
    2.25 +//   typedef typename Graph::EdgeIt EdgeIt;
    2.26    
    2.27 -  checkGraphEdgeList(G,15);
    2.28 +//   checkGraphEdgeList(G,15);
    2.29    
    2.30 -  std::vector<Edge> ee;
    2.31 +//   std::vector<Edge> ee;
    2.32    
    2.33 -  for(EdgeIt e(G);e!=INVALID;++e) ee.push_back(e);
    2.34 +//   for(EdgeIt e(G);e!=INVALID;++e) ee.push_back(e);
    2.35  
    2.36 -  for(typename std::vector<Edge>::iterator p=ee.begin();p!=ee.end();p++)
    2.37 -    G.addEdge(G.head(*p),G.tail(*p));
    2.38 -}
    2.39 +//   for(typename std::vector<Edge>::iterator p=ee.begin();p!=ee.end();p++)
    2.40 +//     G.addEdge(G.head(*p),G.tail(*p));
    2.41 +// }
    2.42  
    2.43 -template<class Graph> void checkPetersen(Graph &G)
    2.44 -{
    2.45 -  typedef typename Graph::Node Node;
    2.46 +// template<class Graph> void checkPetersen(Graph &G)
    2.47 +// {
    2.48 +//   typedef typename Graph::Node Node;
    2.49  
    2.50 -  typedef typename Graph::EdgeIt EdgeIt;
    2.51 -  typedef typename Graph::NodeIt NodeIt;
    2.52 +//   typedef typename Graph::EdgeIt EdgeIt;
    2.53 +//   typedef typename Graph::NodeIt NodeIt;
    2.54  
    2.55 -  checkGraphNodeList(G,10);
    2.56 -  checkGraphEdgeList(G,30);
    2.57 +//   checkGraphNodeList(G,10);
    2.58 +//   checkGraphEdgeList(G,30);
    2.59  
    2.60 -  for(NodeIt n(G);n!=INVALID;++n) {
    2.61 -    checkGraphInEdgeList(G,n,3);
    2.62 -    checkGraphOutEdgeList(G,n,3);
    2.63 -    ++n;
    2.64 -  }  
    2.65 -}
    2.66 +//   for(NodeIt n(G);n!=INVALID;++n) {
    2.67 +//     checkGraphInEdgeList(G,n,3);
    2.68 +//     checkGraphOutEdgeList(G,n,3);
    2.69 +//     ++n;
    2.70 +//   }  
    2.71 +// }
    2.72  
    2.73 -//Compile GraphSkeleton
    2.74 -template void checkCompileStaticGraph<skeleton::StaticGraphSkeleton>
    2.75 -(skeleton::StaticGraphSkeleton &);
    2.76 +// //Compile GraphSkeleton
    2.77 +// template void checkCompileStaticGraph<skeleton::StaticGraphSkeleton>
    2.78 +// (skeleton::StaticGraphSkeleton &);
    2.79  
    2.80 -template void checkCompileGraph<skeleton::GraphSkeleton>
    2.81 -(skeleton::GraphSkeleton &);
    2.82 +// template void checkCompileGraph<skeleton::GraphSkeleton>
    2.83 +// (skeleton::GraphSkeleton &);
    2.84  
    2.85 -template void checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>
    2.86 -(skeleton::ErasableGraphSkeleton &);
    2.87 +// template void checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>
    2.88 +// (skeleton::ErasableGraphSkeleton &);
    2.89  
    2.90  //Compile SmartGraph
    2.91  typedef SmartGraph Graph;