test/graph_utils_test.cc
changeset 572 be6646ac5d89
parent 440 88ed40ad0d4f
     1.1 --- a/test/graph_utils_test.cc	Wed Apr 01 14:18:35 2009 +0100
     1.2 +++ b/test/graph_utils_test.cc	Sat Apr 04 07:30:58 2009 +0100
     1.3 @@ -38,15 +38,15 @@
     1.4      for (int i = 0; i < 10; ++i) {
     1.5        digraph.addNode();
     1.6      }
     1.7 -    DescriptorMap<Digraph, Node> nodes(digraph);
     1.8 -    typename DescriptorMap<Digraph, Node>::InverseMap invNodes(nodes);
     1.9 +    RangeIdMap<Digraph, Node> nodes(digraph);
    1.10 +    typename RangeIdMap<Digraph, Node>::InverseMap invNodes(nodes);
    1.11      for (int i = 0; i < 100; ++i) {
    1.12        int src = rnd[invNodes.size()];
    1.13        int trg = rnd[invNodes.size()];
    1.14        digraph.addArc(invNodes[src], invNodes[trg]);
    1.15      }
    1.16      typename Digraph::template ArcMap<bool> found(digraph, false);
    1.17 -    DescriptorMap<Digraph, Arc> arcs(digraph);
    1.18 +    RangeIdMap<Digraph, Arc> arcs(digraph);
    1.19      for (NodeIt src(digraph); src != INVALID; ++src) {
    1.20        for (NodeIt trg(digraph); trg != INVALID; ++trg) {
    1.21          for (ConArcIt<Digraph> con(digraph, src, trg); con != INVALID; ++con) {
    1.22 @@ -113,15 +113,15 @@
    1.23    for (int i = 0; i < 10; ++i) {
    1.24      graph.addNode();
    1.25    }
    1.26 -  DescriptorMap<Graph, Node> nodes(graph);
    1.27 -  typename DescriptorMap<Graph, Node>::InverseMap invNodes(nodes);
    1.28 +  RangeIdMap<Graph, Node> nodes(graph);
    1.29 +  typename RangeIdMap<Graph, Node>::InverseMap invNodes(nodes);
    1.30    for (int i = 0; i < 100; ++i) {
    1.31      int src = rnd[invNodes.size()];
    1.32      int trg = rnd[invNodes.size()];
    1.33      graph.addEdge(invNodes[src], invNodes[trg]);
    1.34    }
    1.35    typename Graph::template EdgeMap<int> found(graph, 0);
    1.36 -  DescriptorMap<Graph, Edge> edges(graph);
    1.37 +  RangeIdMap<Graph, Edge> edges(graph);
    1.38    for (NodeIt src(graph); src != INVALID; ++src) {
    1.39      for (NodeIt trg(graph); trg != INVALID; ++trg) {
    1.40        for (ConEdgeIt<Graph> con(graph, src, trg); con != INVALID; ++con) {