lemon-0.x: comparison src/test/graph

equal deleted inserted replaced

-:b214fb62ac29
+:70bdc65e269f
 #include<iostream>
 #include<hugo/smart_graph.h>
-//#include<hugo/skeletons/graph.h>
+#include<hugo/skeletons/graph.h>
 //#include<../work/alpar/list_graph.h>
 /*
 This test makes consistency checks of list graph structures.
 m=dm; //Copy to another type
 }
 }
+template<class Graph> struct PetNodes
-template<class Graph> void addPetersen(Graph &G)
 {
 std::vector<typename Graph::Node> outer, inner;
+std::vector<typename Graph::Edge> outcir, incir, cons;
-for(int i=0;i<5;i++) {
+};
-outer.push_back(G.addNode());
-inner.push_back(G.addNode());
+template<class Graph> PetNodes<Graph> addPetersen(Graph &G,int num=5)
-}
+{
+//std::vector<typename Graph::Node> outer, inner;
-for(int i=0;i<5;i++) {
-G.addEdge(outer[i],inner[i]);
+PetNodes<Graph> n;
-G.addEdge(outer[i],outer[(i+1)%5]);
-G.addEdge(inner[i],inner[(i+2)%5]);
+for(int i=0;i<num;i++) {
-}
+n.outer.push_back(G.addNode());
+n.inner.push_back(G.addNode());
+}
+for(int i=0;i<num;i++) {
+n.cons.push_back(G.addEdge(n.outer[i],n.inner[i]));
+n.outcir.push_back(G.addEdge(n.outer[i],n.outer[(i+1)%5]));
+n.incir.push_back(G.addEdge(n.inner[i],n.inner[(i+2)%5]));
+}
+return n;
 }
 template<class Graph> void checkNodeList(Graph &G, int nn)
 {
 typename Graph::NodeIt n(G);
 checkOutEdgeList(G,n,3);
 G.next(n);
 }
 }
-//template void checkCompile<GraphSkeleton>(GraphSkeleton &);
+template void checkCompile<GraphSkeleton>(GraphSkeleton &);
 template void checkCompile<SmartGraph>(SmartGraph &);
 template void checkCompile<SymSmartGraph>(SymSmartGraph &);
 //template void checkCompile<ListGraph>(ListGraph &);
 //template void checkCompile<SymListGraph>(SymListGraph &);
 SmartGraph G;
 addPetersen(G);
 bidirPetersen(G);
 checkPetersen(G);
 }
-{
+//   {
-ListGraph G;
+//     ListGraph G;
-addPetersen(G);
+//     addPetersen(G);
-bidirPetersen(G);
+//     bidirPetersen(G);
-checkPetersen(G);
+//     checkPetersen(G);
-}
+//   }
 {
 SymSmartGraph G;
 addPetersen(G);
 checkPetersen(G);
 }
-{
+//   {
-SymListGraph G;
+//     SymListGraph G;
-addPetersen(G);
+//     addPetersen(G);
-checkPetersen(G);
+//     checkPetersen(G);
-}
+//   }
 //\todo map tests.
 //\todo copy constr tests.
 std::cout << __FILE__ ": All tests passed.\n";

changeset 564	f84611a14a33
parent 550	9e7613fa6d27
child 567	efaa79ee8d14