1.1 --- a/test/dfs_test.cc Tue Sep 23 18:42:49 2008 +0200
1.2 +++ b/test/dfs_test.cc Fri Sep 26 12:40:11 2008 +0200
1.3 @@ -56,27 +56,52 @@
1.4 {
1.5 typedef concepts::Digraph Digraph;
1.6 typedef Dfs<Digraph> DType;
1.7 + typedef Digraph::Node Node;
1.8 + typedef Digraph::Arc Arc;
1.9
1.10 Digraph G;
1.11 - Digraph::Node n;
1.12 - Digraph::Arc e;
1.13 + Node s, t;
1.14 + Arc e;
1.15 int l;
1.16 bool b;
1.17 DType::DistMap d(G);
1.18 DType::PredMap p(G);
1.19 + Path<Digraph> pp;
1.20
1.21 - DType dfs_test(G);
1.22 + {
1.23 + DType dfs_test(G);
1.24
1.25 - dfs_test.run(n);
1.26 + dfs_test.run(s);
1.27 + dfs_test.run(s,t);
1.28 + dfs_test.run();
1.29
1.30 - l = dfs_test.dist(n);
1.31 - e = dfs_test.predArc(n);
1.32 - n = dfs_test.predNode(n);
1.33 - d = dfs_test.distMap();
1.34 - p = dfs_test.predMap();
1.35 - b = dfs_test.reached(n);
1.36 + l = dfs_test.dist(t);
1.37 + e = dfs_test.predArc(t);
1.38 + s = dfs_test.predNode(t);
1.39 + b = dfs_test.reached(t);
1.40 + d = dfs_test.distMap();
1.41 + p = dfs_test.predMap();
1.42 + pp = dfs_test.path(t);
1.43 + }
1.44 + {
1.45 + DType
1.46 + ::SetPredMap<concepts::ReadWriteMap<Node,Arc> >
1.47 + ::SetDistMap<concepts::ReadWriteMap<Node,int> >
1.48 + ::SetReachedMap<concepts::ReadWriteMap<Node,bool> >
1.49 + ::SetProcessedMap<concepts::WriteMap<Node,bool> >
1.50 + ::SetStandardProcessedMap
1.51 + ::Create dfs_test(G);
1.52
1.53 - Path<Digraph> pp = dfs_test.path(n);
1.54 + dfs_test.run(s);
1.55 + dfs_test.run(s,t);
1.56 + dfs_test.run();
1.57 +
1.58 + l = dfs_test.dist(t);
1.59 + e = dfs_test.predArc(t);
1.60 + s = dfs_test.predNode(t);
1.61 + b = dfs_test.reached(t);
1.62 + pp = dfs_test.path(t);
1.63 + }
1.64 }
1.65
1.66 void checkDfsFunctionCompile()