1.1 --- a/test/kruskal_test.cc Thu Apr 19 15:09:08 2007 +0000
1.2 +++ b/test/kruskal_test.cc Thu Apr 19 15:11:58 2007 +0000
1.3 @@ -23,8 +23,10 @@
1.4 #include <lemon/maps.h>
1.5 #include <lemon/kruskal.h>
1.6 #include <lemon/list_graph.h>
1.7 +
1.8 #include <lemon/concepts/maps.h>
1.9 #include <lemon/concepts/graph.h>
1.10 +#include <lemon/concepts/ugraph.h>
1.11
1.12
1.13 using namespace std;
1.14 @@ -33,21 +35,56 @@
1.15 void checkCompileKruskal()
1.16 {
1.17 concepts::WriteMap<concepts::Graph::Edge,bool> w;
1.18 + concepts::WriteMap<concepts::UGraph::UEdge,bool> uw;
1.19 +
1.20 + concepts::ReadMap<concepts::Graph::Edge,int> r;
1.21 + concepts::ReadMap<concepts::UGraph::UEdge,int> ur;
1.22
1.23 concepts::Graph g;
1.24 - kruskal(g,
1.25 - concepts::ReadMap<concepts::Graph::Edge,int>(),
1.26 - w);
1.27 + concepts::UGraph ug;
1.28 +
1.29 + kruskal(g, r, w);
1.30 + kruskal(ug, ur, uw);
1.31 +
1.32 + std::vector<std::pair<concepts::Graph::Edge, int> > rs;
1.33 + std::vector<std::pair<concepts::UGraph::UEdge, int> > urs;
1.34 +
1.35 + kruskal(g, rs, w);
1.36 + kruskal(ug, urs, uw);
1.37 +
1.38 + std::vector<concepts::Graph::Edge> ws;
1.39 + std::vector<concepts::UGraph::UEdge> uws;
1.40 +
1.41 + kruskal(g, r, ws.begin());
1.42 + kruskal(ug, ur, uws.begin());
1.43 +
1.44 + Kruskal<concepts::UGraph,concepts::ReadMap<concepts::UGraph::UEdge,int> >
1.45 + alg(ug, ur);
1.46 +
1.47 + alg.init();
1.48 + alg.initPresorted(uws.begin(), uws.end());
1.49 + alg.reinit();
1.50 +
1.51 + alg.emptyQueue();
1.52 +
1.53 + alg.nextEdge();
1.54 + alg.processNextEdge();
1.55 + alg.processEdge(concepts::UGraph::UEdge());
1.56 +
1.57 + alg.run();
1.58 +
1.59 + alg.treeMap();
1.60 + alg.tree(concepts::UGraph::UEdge());
1.61 }
1.62
1.63 int main() {
1.64
1.65 - typedef ListGraph::Node Node;
1.66 - typedef ListGraph::Edge Edge;
1.67 - typedef ListGraph::NodeIt NodeIt;
1.68 - typedef ListGraph::EdgeIt EdgeIt;
1.69 + typedef ListUGraph::Node Node;
1.70 + typedef ListUGraph::UEdge UEdge;
1.71 + typedef ListUGraph::NodeIt NodeIt;
1.72 + typedef ListUGraph::EdgeIt EdgeIt;
1.73
1.74 - ListGraph G;
1.75 + ListUGraph G;
1.76
1.77 Node s=G.addNode();
1.78 Node v1=G.addNode();
1.79 @@ -56,26 +93,26 @@
1.80 Node v4=G.addNode();
1.81 Node t=G.addNode();
1.82
1.83 - Edge e1 = G.addEdge(s, v1);
1.84 - Edge e2 = G.addEdge(s, v2);
1.85 - Edge e3 = G.addEdge(v1, v2);
1.86 - Edge e4 = G.addEdge(v2, v1);
1.87 - Edge e5 = G.addEdge(v1, v3);
1.88 - Edge e6 = G.addEdge(v3, v2);
1.89 - Edge e7 = G.addEdge(v2, v4);
1.90 - Edge e8 = G.addEdge(v4, v3);
1.91 - Edge e9 = G.addEdge(v3, t);
1.92 - Edge e10 = G.addEdge(v4, t);
1.93 + UEdge e1 = G.addEdge(s, v1);
1.94 + UEdge e2 = G.addEdge(s, v2);
1.95 + UEdge e3 = G.addEdge(v1, v2);
1.96 + UEdge e4 = G.addEdge(v2, v1);
1.97 + UEdge e5 = G.addEdge(v1, v3);
1.98 + UEdge e6 = G.addEdge(v3, v2);
1.99 + UEdge e7 = G.addEdge(v2, v4);
1.100 + UEdge e8 = G.addEdge(v4, v3);
1.101 + UEdge e9 = G.addEdge(v3, t);
1.102 + UEdge e10 = G.addEdge(v4, t);
1.103
1.104 - typedef ListGraph::EdgeMap<int> ECostMap;
1.105 - typedef ListGraph::EdgeMap<bool> EBoolMap;
1.106 + typedef ListUGraph::UEdgeMap<int> ECostMap;
1.107 + typedef ListUGraph::UEdgeMap<bool> EBoolMap;
1.108
1.109 ECostMap edge_cost_map(G, 2);
1.110 EBoolMap tree_map(G);
1.111
1.112
1.113 //Test with const map.
1.114 - check(kruskal(G, ConstMap<ListGraph::Edge,int>(2), tree_map)==10,
1.115 + check(kruskal(G, ConstMap<ListUGraph::UEdge,int>(2), tree_map)==10,
1.116 "Total cost should be 10");
1.117 //Test with a edge map (filled with uniform costs).
1.118 check(kruskal(G, edge_cost_map, tree_map)==10,
1.119 @@ -92,7 +129,7 @@
1.120 edge_cost_map.set(e9, -2);
1.121 edge_cost_map.set(e10, -1);
1.122
1.123 - vector<Edge> tree_edge_vec(5);
1.124 + vector<UEdge> tree_edge_vec(5);
1.125
1.126 //Test with a edge map and inserter.
1.127 check(kruskal(G, edge_cost_map,
1.128 @@ -107,14 +144,14 @@
1.129 ==-31,
1.130 "Total cost should be -31.");
1.131
1.132 - tree_edge_vec.clear();
1.133 +// tree_edge_vec.clear();
1.134
1.135 - //The above test could also be coded like this:
1.136 - check(kruskal(G,
1.137 - makeKruskalMapInput(G, edge_cost_map),
1.138 - makeKruskalSequenceOutput(back_inserter(tree_edge_vec)))
1.139 - ==-31,
1.140 - "Total cost should be -31.");
1.141 +// //The above test could also be coded like this:
1.142 +// check(kruskal(G,
1.143 +// makeKruskalMapInput(G, edge_cost_map),
1.144 +// makeKruskalSequenceOutput(back_inserter(tree_edge_vec)))
1.145 +// ==-31,
1.146 +// "Total cost should be -31.");
1.147
1.148 check(tree_edge_vec.size()==5,"The tree should have 5 edges.");
1.149
1.150 @@ -125,5 +162,19 @@
1.151 tree_edge_vec[4]==e9,
1.152 "Wrong tree.");
1.153
1.154 + Kruskal<ListUGraph, ECostMap> ka(G, edge_cost_map);
1.155 +
1.156 + ka.run();
1.157 +
1.158 + check(ka.tree(e1) &&
1.159 + ka.tree(e2) &&
1.160 + ka.tree(e5) &&
1.161 + ka.tree(e7) &&
1.162 + ka.tree(e9),
1.163 + "Wrong tree.");
1.164 +
1.165 + check(ka.treeValue() == -31,
1.166 + "Total cost should be -31.");
1.167 +
1.168 return 0;
1.169 }