Merge bugfix #448
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 12 Sep 2012 17:34:01 +0200
changeset 996b6347aae6575
parent 994 20ae244b4779
parent 995 4bb9e72e1a41
child 1000 404b98971e1f
Merge bugfix #448
     1.1 --- a/test/adaptors_test.cc	Fri Aug 24 16:10:31 2012 +0200
     1.2 +++ b/test/adaptors_test.cc	Wed Sep 12 17:34:01 2012 +0200
     1.3 @@ -1377,13 +1377,15 @@
     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<Orienter< const GridGraph, GridGraph::EdgeMap<bool> > >
     1.8 -    SplitGridGraph;
     1.9 +  typedef Orienter< const GridGraph, GridGraph::EdgeMap<bool> >
    1.10 +    OrientedGridGraph;
    1.11 +  typedef SplitNodes<OrientedGridGraph> SplitGridGraph;
    1.12    typedef Undirector<const SplitGridGraph> USplitGridGraph;
    1.13    checkConcept<concepts::Digraph, SplitGridGraph>();
    1.14    checkConcept<concepts::Graph, USplitGridGraph>();
    1.15  
    1.16 -  SplitGridGraph adaptor = splitNodes(orienter(graph, dir_map));
    1.17 +  OrientedGridGraph oadaptor = orienter(graph, dir_map);
    1.18 +  SplitGridGraph adaptor = splitNodes(oadaptor);
    1.19    USplitGridGraph uadaptor = undirector(adaptor);
    1.20  
    1.21    // Check adaptor