diff -r 6307bbbf285b -r da414906fe21 test/dijkstra_test.cc --- a/test/dijkstra_test.cc Tue Sep 23 18:42:49 2008 +0200 +++ b/test/dijkstra_test.cc Fri Sep 26 12:40:11 2008 +0200 @@ -22,6 +22,7 @@ #include #include #include +#include #include "graph_test.h" #include "test_tools.h" @@ -55,28 +56,54 @@ typedef concepts::Digraph Digraph; typedef concepts::ReadMap LengthMap; typedef Dijkstra DType; + typedef Digraph::Node Node; + typedef Digraph::Arc Arc; Digraph G; - Digraph::Node n; - Digraph::Arc e; + Node s, t; + Arc e; VType l; bool b; DType::DistMap d(G); DType::PredMap p(G); LengthMap length; + Path pp; - DType dijkstra_test(G,length); + { + DType dijkstra_test(G,length); - dijkstra_test.run(n); + dijkstra_test.run(s); + dijkstra_test.run(s,t); - l = dijkstra_test.dist(n); - e = dijkstra_test.predArc(n); - n = dijkstra_test.predNode(n); - d = dijkstra_test.distMap(); - p = dijkstra_test.predMap(); - b = dijkstra_test.reached(n); + l = dijkstra_test.dist(t); + e = dijkstra_test.predArc(t); + s = dijkstra_test.predNode(t); + b = dijkstra_test.reached(t); + d = dijkstra_test.distMap(); + p = dijkstra_test.predMap(); + pp = dijkstra_test.path(t); + } + { + DType + ::SetPredMap > + ::SetDistMap > + ::SetProcessedMap > + ::SetStandardProcessedMap + ::SetOperationTraits > + ::SetHeap > > + ::SetStandardHeap > > + ::Create dijkstra_test(G,length); - Path pp = dijkstra_test.path(n); + dijkstra_test.run(s); + dijkstra_test.run(s,t); + + l = dijkstra_test.dist(t); + e = dijkstra_test.predArc(t); + s = dijkstra_test.predNode(t); + b = dijkstra_test.reached(t); + pp = dijkstra_test.path(t); + } + } void checkDijkstraFunctionCompile()