1.1 --- a/test/adaptors_test.cc Fri Aug 24 15:41:46 2012 +0200
1.2 +++ b/test/adaptors_test.cc Wed Sep 12 17:51:20 2012 +0200
1.3 @@ -1377,9 +1377,10 @@
1.4 dir_map[graph.down(n4)] = graph.u(graph.down(n4)) != n4;
1.5
1.6 // Apply several adaptors on the grid graph
1.7 - typedef SplitNodes< ReverseDigraph< const Orienter<
1.8 - const GridGraph, GridGraph::EdgeMap<bool> > > >
1.9 - RevSplitGridGraph;
1.10 + typedef Orienter<const GridGraph, GridGraph::EdgeMap<bool> >
1.11 + OrientedGridGraph;
1.12 + typedef ReverseDigraph<const OrientedGridGraph> RevOrientedGridGraph;
1.13 + typedef SplitNodes<RevOrientedGridGraph> RevSplitGridGraph;
1.14 typedef ReverseDigraph<const RevSplitGridGraph> SplitGridGraph;
1.15 typedef Undirector<const SplitGridGraph> USplitGridGraph;
1.16 typedef Undirector<const USplitGridGraph> UUSplitGridGraph;
1.17 @@ -1388,8 +1389,10 @@
1.18 checkConcept<concepts::Graph, USplitGridGraph>();
1.19 checkConcept<concepts::Graph, UUSplitGridGraph>();
1.20
1.21 + OrientedGridGraph ori_adaptor = orienter(graph, dir_map);
1.22 + RevOrientedGridGraph rev_ori_adaptor = reverseDigraph(ori_adaptor);
1.23 RevSplitGridGraph rev_adaptor =
1.24 - splitNodes(reverseDigraph(orienter(graph, dir_map)));
1.25 + splitNodes(rev_ori_adaptor);
1.26 SplitGridGraph adaptor = reverseDigraph(rev_adaptor);
1.27 USplitGridGraph uadaptor = undirector(adaptor);
1.28 UUSplitGridGraph uuadaptor = undirector(uadaptor);