Changeset 878:86b42ec55f3e in lemon-0.x for src/test

Timestamp:

09/17/04 14:23:09 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Graph wrapper tests added.

Location:

src/test

Files:

• Makefile.am (modified) (2 diffs)
• graph_wrapper_test.cc (moved) (moved from src/work/marci/graph_wrapper_test.cc) (2 diffs)

src/test/Makefile.am

@@ -11 +11 @@
         error_test \
         graph_test \
+        graph_wrapper_test \
         kruskal_test \
         mincostflows_test \
@@ -30 +31 @@
 error_test_SOURCES = error_test.cc
 graph_test_SOURCES = graph_test.cc
+graph_wrapper_test_SOURCES = graph_wrapper_test.cc
 kruskal_test_SOURCES = kruskal_test.cc
 mincostflows_test_SOURCES = mincostflows_test.cc

src/test/graph_wrapper_test.cc

@@ -11 +11 @@
 /**
 \file
-This test makes consistency checks of list graph structures.
+This test makes consistency checks of graph wrappers.
 
-G.addNode(), G.addEdge(), G.tail(), G.head()
-
-\todo Checks for empty graphs and isolated points.
-conversion.
+\todo More extensive tests are needed 
 */
 
 using namespace hugo;
 
-// template<class Graph> void bidirPetersen(Graph &G)
-// {
-//   typedef typename Graph::Edge Edge;
-//   typedef typename Graph::EdgeIt EdgeIt;
-  
-//   checkGraphEdgeList(G,15);
-  
-//   std::vector<Edge> ee;
-  
-//   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));
-// }
-
-// template<class Graph> void checkPetersen(Graph &G)
-// {
-//   typedef typename Graph::Node Node;
-
-//   typedef typename Graph::EdgeIt EdgeIt;
-//   typedef typename Graph::NodeIt NodeIt;
-
-//   checkGraphNodeList(G,10);
-//   checkGraphEdgeList(G,30);
-
-//   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 &);
-
-// template void checkCompileGraph<skeleton::ExtendableGraphSkeleton>
-// (skeleton::ExtendableGraphSkeleton &);
-
-// template void checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>
-// (skeleton::ErasableGraphSkeleton &);
 
 //Compile SmartGraph
@@ -74 +30 @@
 //template void checkCompileGraphFindEdge<SymSmartGraph>(SymSmartGraph &);
 
-// //Compile ListGraph
-// template void checkCompileGraph<ListGraph>(ListGraph &);
-// template void checkCompileErasableGraph<ListGraph>(ListGraph &);
-// template void checkCompileGraphFindEdge<ListGraph>(ListGraph &);
-
-
-// //Compile SymListGraph
-// template void checkCompileGraph<SymListGraph>(SymListGraph &);
-// template void checkCompileErasableGraph<SymListGraph>(SymListGraph &);
-// template void checkCompileGraphFindEdge<SymListGraph>(SymListGraph &);
-
-// //Compile FullGraph
-// template void checkCompileStaticGraph<FullGraph>(FullGraph &);
-// template void checkCompileGraphFindEdge<FullGraph>(FullGraph &);
-
-// //Compile EdgeSet <ListGraph>
-// template void checkCompileGraph<EdgeSet <ListGraph> >(EdgeSet <ListGraph> &);
-// template void checkCompileGraphEraseEdge<EdgeSet <ListGraph> >
-// (EdgeSet <ListGraph> &);
-// template void checkCompileGraphFindEdge<EdgeSet <ListGraph> >
-// (EdgeSet <ListGraph> &);
-
-// //Compile EdgeSet <NodeSet>
-// template void checkCompileGraph<EdgeSet <NodeSet> >(EdgeSet <NodeSet> &);
-// template void checkCompileGraphEraseEdge<EdgeSet <NodeSet> >
-// (EdgeSet <NodeSet> &);
-// template void checkCompileGraphFindEdge<EdgeSet <NodeSet> >
-// (EdgeSet <NodeSet> &);
-
 
 int main() 
 {
- //  {
-//     SmartGraph G;
-//     addPetersen(G);
-//     bidirPetersen(G);
-//     checkPetersen(G);
-//   }
-//   {
-//     ListGraph G;
-//     addPetersen(G);
-//     bidirPetersen(G);
-//     checkPetersen(G);
-//   }
-//   {
-//     SymSmartGraph G;
-//     addPetersen(G);
-//     checkPetersen(G);
-//   }
-//   {
-//     SymListGraph G;
-//     addPetersen(G);
-//     checkPetersen(G);
-//   }
-
-  ///\file
-  ///\todo map tests.
-  ///\todo copy constr tests.
-
   std::cout << __FILE__ ": All tests passed.\n";