1.1 --- a/test/graph_adaptor_test.cc Sun Nov 30 18:57:18 2008 +0100
1.2 +++ b/test/graph_adaptor_test.cc Sun Nov 30 19:00:30 2008 +0100
1.3 @@ -37,42 +37,6 @@
1.4
1.5 using namespace lemon;
1.6
1.7 -void checkDigraphAdaptor() {
1.8 - checkConcept<concepts::Digraph, DigraphAdaptor<concepts::Digraph> >();
1.9 -
1.10 - typedef ListDigraph Digraph;
1.11 - typedef DigraphAdaptor<Digraph> Adaptor;
1.12 -
1.13 - Digraph digraph;
1.14 - Adaptor adaptor(digraph);
1.15 -
1.16 - Digraph::Node n1 = digraph.addNode();
1.17 - Digraph::Node n2 = digraph.addNode();
1.18 - Digraph::Node n3 = digraph.addNode();
1.19 -
1.20 - Digraph::Arc a1 = digraph.addArc(n1, n2);
1.21 - Digraph::Arc a2 = digraph.addArc(n1, n3);
1.22 - Digraph::Arc a3 = digraph.addArc(n2, n3);
1.23 -
1.24 - checkGraphNodeList(adaptor, 3);
1.25 - checkGraphArcList(adaptor, 3);
1.26 - checkGraphConArcList(adaptor, 3);
1.27 -
1.28 - checkGraphOutArcList(adaptor, n1, 2);
1.29 - checkGraphOutArcList(adaptor, n2, 1);
1.30 - checkGraphOutArcList(adaptor, n3, 0);
1.31 -
1.32 - checkGraphInArcList(adaptor, n1, 0);
1.33 - checkGraphInArcList(adaptor, n2, 1);
1.34 - checkGraphInArcList(adaptor, n3, 2);
1.35 -
1.36 - checkNodeIds(adaptor);
1.37 - checkArcIds(adaptor);
1.38 -
1.39 - checkGraphNodeMap(adaptor);
1.40 - checkGraphArcMap(adaptor);
1.41 -}
1.42 -
1.43 void checkRevDigraphAdaptor() {
1.44 checkConcept<concepts::Digraph, RevDigraphAdaptor<concepts::Digraph> >();
1.45
1.46 @@ -585,56 +549,6 @@
1.47 }
1.48 }
1.49
1.50 -void checkGraphAdaptor() {
1.51 - checkConcept<concepts::Graph, GraphAdaptor<concepts::Graph> >();
1.52 -
1.53 - typedef ListGraph Graph;
1.54 - typedef GraphAdaptor<Graph> Adaptor;
1.55 -
1.56 - Graph graph;
1.57 - Adaptor adaptor(graph);
1.58 -
1.59 - Graph::Node n1 = graph.addNode();
1.60 - Graph::Node n2 = graph.addNode();
1.61 - Graph::Node n3 = graph.addNode();
1.62 - Graph::Node n4 = graph.addNode();
1.63 -
1.64 - Graph::Edge a1 = graph.addEdge(n1, n2);
1.65 - Graph::Edge a2 = graph.addEdge(n1, n3);
1.66 - Graph::Edge a3 = graph.addEdge(n2, n3);
1.67 - Graph::Edge a4 = graph.addEdge(n3, n4);
1.68 -
1.69 - checkGraphNodeList(adaptor, 4);
1.70 - checkGraphArcList(adaptor, 8);
1.71 - checkGraphEdgeList(adaptor, 4);
1.72 - checkGraphConArcList(adaptor, 8);
1.73 - checkGraphConEdgeList(adaptor, 4);
1.74 -
1.75 - checkGraphOutArcList(adaptor, n1, 2);
1.76 - checkGraphOutArcList(adaptor, n2, 2);
1.77 - checkGraphOutArcList(adaptor, n3, 3);
1.78 - checkGraphOutArcList(adaptor, n4, 1);
1.79 -
1.80 - checkGraphInArcList(adaptor, n1, 2);
1.81 - checkGraphInArcList(adaptor, n2, 2);
1.82 - checkGraphInArcList(adaptor, n3, 3);
1.83 - checkGraphInArcList(adaptor, n4, 1);
1.84 -
1.85 - checkGraphIncEdgeList(adaptor, n1, 2);
1.86 - checkGraphIncEdgeList(adaptor, n2, 2);
1.87 - checkGraphIncEdgeList(adaptor, n3, 3);
1.88 - checkGraphIncEdgeList(adaptor, n4, 1);
1.89 -
1.90 -
1.91 - checkNodeIds(adaptor);
1.92 - checkArcIds(adaptor);
1.93 - checkEdgeIds(adaptor);
1.94 -
1.95 - checkGraphNodeMap(adaptor);
1.96 - checkGraphArcMap(adaptor);
1.97 - checkGraphEdgeMap(adaptor);
1.98 -}
1.99 -
1.100 void checkSubGraphAdaptor() {
1.101 checkConcept<concepts::Graph,
1.102 SubGraphAdaptor<concepts::Graph,
1.103 @@ -1053,7 +967,6 @@
1.104
1.105 int main(int, const char **) {
1.106
1.107 - checkDigraphAdaptor();
1.108 checkRevDigraphAdaptor();
1.109 checkSubDigraphAdaptor();
1.110 checkNodeSubDigraphAdaptor();
1.111 @@ -1062,7 +975,6 @@
1.112 checkResDigraphAdaptor();
1.113 checkSplitDigraphAdaptor();
1.114
1.115 - checkGraphAdaptor();
1.116 checkSubGraphAdaptor();
1.117 checkNodeSubGraphAdaptor();
1.118 checkEdgeSubGraphAdaptor();