diff -r 9147b013331a -r 939d747055cd test/adaptors_test.cc --- a/test/adaptors_test.cc Fri Aug 24 15:41:46 2012 +0200 +++ b/test/adaptors_test.cc Wed Sep 12 17:51:20 2012 +0200 @@ -1377,9 +1377,10 @@ dir_map[graph.down(n4)] = graph.u(graph.down(n4)) != n4; // Apply several adaptors on the grid graph - typedef SplitNodes< ReverseDigraph< const Orienter< - const GridGraph, GridGraph::EdgeMap > > > - RevSplitGridGraph; + typedef Orienter > + OrientedGridGraph; + typedef ReverseDigraph RevOrientedGridGraph; + typedef SplitNodes RevSplitGridGraph; typedef ReverseDigraph SplitGridGraph; typedef Undirector USplitGridGraph; typedef Undirector UUSplitGridGraph; @@ -1388,8 +1389,10 @@ checkConcept(); checkConcept(); + OrientedGridGraph ori_adaptor = orienter(graph, dir_map); + RevOrientedGridGraph rev_ori_adaptor = reverseDigraph(ori_adaptor); RevSplitGridGraph rev_adaptor = - splitNodes(reverseDigraph(orienter(graph, dir_map))); + splitNodes(rev_ori_adaptor); SplitGridGraph adaptor = reverseDigraph(rev_adaptor); USplitGridGraph uadaptor = undirector(adaptor); UUSplitGridGraph uuadaptor = undirector(uadaptor);