Changeset 870:9bde6cd8e3da in lemon-0.x

Timestamp:

09/16/04 17:05:10 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1170

Message:

 

Location:

src

Files:

• hugo/graph_wrapper.h (modified) (2 diffs)
• work/marci/graph_wrapper_test.cc (modified) (2 diffs)

src/hugo/graph_wrapper.h

@@ -230 +230 @@
       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) { }
     };
 
@@ -240 +240 @@
       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) { }
     };
   };

src/work/marci/graph_wrapper_test.cc

@@ -6 +6 @@
 #include<hugo/graph_wrapper.h>
 
-#include"test_tools.h"
-#include"graph_test.h"
+#include"test/test_tools.h"
+#include"test/graph_test.h"
 
 /**
@@ -21 +21 @@
 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