diff -r 50a153b08f07 -r 186aa53d2802 src/test/suurballe_test.cc --- a/src/test/suurballe_test.cc Thu Oct 07 17:21:27 2004 +0000 +++ b/src/test/suurballe_test.cc Fri Oct 08 13:07:51 2004 +0000 @@ -20,21 +20,19 @@ //#include #include "test_tools.h" -using namespace std; using namespace lemon; - bool passed = true; int main() { + typedef ListGraph Graph; + typedef Graph::Node Node; + typedef Graph::Edge Edge; - typedef ListGraph::Node Node; - typedef ListGraph::Edge Edge; - - ListGraph graph; + Graph graph; //Ahuja könyv példája @@ -56,7 +54,7 @@ Edge v5_t=graph.addEdge(v5, t); - ListGraph::EdgeMap length(graph); + Graph::EdgeMap length(graph); length.set(s_v1, 6); length.set(v1_v2, 4); @@ -71,29 +69,29 @@ int k=3; - Suurballe< ListGraph, ListGraph::EdgeMap > - surb_test(graph, length); + Suurballe< Graph, Graph::EdgeMap > + surb_test(graph, length, s, t); - check( surb_test.run(s,t,k) == 2 && surb_test.totalLength() == 46, + check( surb_test.run(k) == 2 && surb_test.totalLength() == 46, "Two paths, total length should be 46"); check( surb_test.checkComplementarySlackness(), "Complementary slackness conditions are not met."); - // typedef DirPath DPath; + // typedef DirPath DPath; // DPath P(graph); /* surb_test.getPath(P,0); check(P.length() == 4, "First path should contain 4 edges."); - cout<