# HG changeset patch
# User marci
# Date 1095347110 0
# Node ID 9bde6cd8e3da7c4e03134323995b8a3d9e507e11
# Parent  c19cf2007a7abfdf6c8c4bf15ab03af61455a859


diff -r c19cf2007a7a -r 9bde6cd8e3da src/hugo/graph_wrapper.h
--- a/src/hugo/graph_wrapper.h	Thu Sep 16 14:27:27 2004 +0000
+++ b/src/hugo/graph_wrapper.h	Thu Sep 16 15:05:10 2004 +0000
@@ -229,9 +229,9 @@
     public:
       NodeMap(const GraphWrapper<Graph>& gw) :  Parent(*(gw.graph)) { }
       NodeMap(const GraphWrapper<Graph>& gw, T a) : Parent(*(gw.graph), a) { }
-//       NodeMap(const NodeMap<T>& map) : Parent(map) { }
-//       template<typename Map>
-//       NodeMap(const Map& map) :  Parent(map) { }
+      NodeMap(const NodeMap<T>& map) : Parent(map) { }
+      template<typename Map>
+      NodeMap(const Map& map) :  Parent(map) { }
     };
 
     template<typename T> class EdgeMap : public Graph::template EdgeMap<T> { 
@@ -239,9 +239,9 @@
     public:
       EdgeMap(const GraphWrapper<Graph>& gw) : Parent(*(gw.graph)) { }
       EdgeMap(const GraphWrapper<Graph>& gw, T a) : Parent(*(gw.graph), a) { }
-//       EdgeMap(const EdgeMap<T>& map) : Parent(map) { }
-//       template<typename Map>
-//       EdgeMap(const Map& map) :  Parent(map) { }
+      EdgeMap(const EdgeMap<T>& map) : Parent(map) { }
+      template<typename Map>
+      EdgeMap(const Map& map) :  Parent(map) { }
     };
   };
 
diff -r c19cf2007a7a -r 9bde6cd8e3da src/work/marci/graph_wrapper_test.cc
--- a/src/work/marci/graph_wrapper_test.cc	Thu Sep 16 14:27:27 2004 +0000
+++ b/src/work/marci/graph_wrapper_test.cc	Thu Sep 16 15:05:10 2004 +0000
@@ -5,8 +5,8 @@
 #include<hugo/full_graph.h>
 #include<hugo/graph_wrapper.h>
 
-#include"test_tools.h"
-#include"graph_test.h"
+#include"test/test_tools.h"
+#include"test/graph_test.h"
 
 /**
 \file
@@ -20,47 +20,47 @@
 
 using namespace hugo;
 
-template<class Graph> void bidirPetersen(Graph &G)
-{
-  typedef typename Graph::Edge Edge;
-  typedef typename Graph::EdgeIt EdgeIt;
+// template<class Graph> void bidirPetersen(Graph &G)
+// {
+//   typedef typename Graph::Edge Edge;
+//   typedef typename Graph::EdgeIt EdgeIt;
   
-  checkGraphEdgeList(G,15);
+//   checkGraphEdgeList(G,15);
   
-  std::vector<Edge> ee;
+//   std::vector<Edge> ee;
   
-  for(EdgeIt e(G);e!=INVALID;++e) ee.push_back(e);
+//   for(EdgeIt e(G);e!=INVALID;++e) ee.push_back(e);
 
-  for(typename std::vector<Edge>::iterator p=ee.begin();p!=ee.end();p++)
-    G.addEdge(G.head(*p),G.tail(*p));
-}
+//   for(typename std::vector<Edge>::iterator p=ee.begin();p!=ee.end();p++)
+//     G.addEdge(G.head(*p),G.tail(*p));
+// }
 
-template<class Graph> void checkPetersen(Graph &G)
-{
-  typedef typename Graph::Node Node;
+// template<class Graph> void checkPetersen(Graph &G)
+// {
+//   typedef typename Graph::Node Node;
 
-  typedef typename Graph::EdgeIt EdgeIt;
-  typedef typename Graph::NodeIt NodeIt;
+//   typedef typename Graph::EdgeIt EdgeIt;
+//   typedef typename Graph::NodeIt NodeIt;
 
-  checkGraphNodeList(G,10);
-  checkGraphEdgeList(G,30);
+//   checkGraphNodeList(G,10);
+//   checkGraphEdgeList(G,30);
 
-  for(NodeIt n(G);n!=INVALID;++n) {
-    checkGraphInEdgeList(G,n,3);
-    checkGraphOutEdgeList(G,n,3);
-    ++n;
-  }  
-}
+//   for(NodeIt n(G);n!=INVALID;++n) {
+//     checkGraphInEdgeList(G,n,3);
+//     checkGraphOutEdgeList(G,n,3);
+//     ++n;
+//   }  
+// }
 
-//Compile GraphSkeleton
-template void checkCompileStaticGraph<skeleton::StaticGraphSkeleton>
-(skeleton::StaticGraphSkeleton &);
+// //Compile GraphSkeleton
+// template void checkCompileStaticGraph<skeleton::StaticGraphSkeleton>
+// (skeleton::StaticGraphSkeleton &);
 
-template void checkCompileGraph<skeleton::GraphSkeleton>
-(skeleton::GraphSkeleton &);
+// template void checkCompileGraph<skeleton::GraphSkeleton>
+// (skeleton::GraphSkeleton &);
 
-template void checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>
-(skeleton::ErasableGraphSkeleton &);
+// template void checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>
+// (skeleton::ErasableGraphSkeleton &);
 
 //Compile SmartGraph
 typedef SmartGraph Graph;