1.1 --- a/test/graph_utils_test.cc	Fri Nov 13 12:33:33 2009 +0100
     1.2 +++ b/test/graph_utils_test.cc	Thu Dec 10 17:05:35 2009 +0100
     1.3 @@ -2,7 +2,7 @@
     1.4   *
     1.5   * This file is a part of LEMON, a generic C++ optimization library.
     1.6   *
     1.7 - * Copyright (C) 2003-2008
     1.8 + * Copyright (C) 2003-2009
     1.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    1.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    1.11   *
    1.12 @@ -38,15 +38,15 @@
    1.13      for (int i = 0; i < 10; ++i) {
    1.14        digraph.addNode();
    1.15      }
    1.16 -    DescriptorMap<Digraph, Node> nodes(digraph);
    1.17 -    typename DescriptorMap<Digraph, Node>::InverseMap invNodes(nodes);
    1.18 +    RangeIdMap<Digraph, Node> nodes(digraph);
    1.19 +    typename RangeIdMap<Digraph, Node>::InverseMap invNodes(nodes);
    1.20      for (int i = 0; i < 100; ++i) {
    1.21        int src = rnd[invNodes.size()];
    1.22        int trg = rnd[invNodes.size()];
    1.23        digraph.addArc(invNodes[src], invNodes[trg]);
    1.24      }
    1.25      typename Digraph::template ArcMap<bool> found(digraph, false);
    1.26 -    DescriptorMap<Digraph, Arc> arcs(digraph);
    1.27 +    RangeIdMap<Digraph, Arc> arcs(digraph);
    1.28      for (NodeIt src(digraph); src != INVALID; ++src) {
    1.29        for (NodeIt trg(digraph); trg != INVALID; ++trg) {
    1.30          for (ConArcIt<Digraph> con(digraph, src, trg); con != INVALID; ++con) {
    1.31 @@ -113,15 +113,15 @@
    1.32    for (int i = 0; i < 10; ++i) {
    1.33      graph.addNode();
    1.34    }
    1.35 -  DescriptorMap<Graph, Node> nodes(graph);
    1.36 -  typename DescriptorMap<Graph, Node>::InverseMap invNodes(nodes);
    1.37 +  RangeIdMap<Graph, Node> nodes(graph);
    1.38 +  typename RangeIdMap<Graph, Node>::InverseMap invNodes(nodes);
    1.39    for (int i = 0; i < 100; ++i) {
    1.40      int src = rnd[invNodes.size()];
    1.41      int trg = rnd[invNodes.size()];
    1.42      graph.addEdge(invNodes[src], invNodes[trg]);
    1.43    }
    1.44    typename Graph::template EdgeMap<int> found(graph, 0);
    1.45 -  DescriptorMap<Graph, Edge> edges(graph);
    1.46 +  RangeIdMap<Graph, Edge> edges(graph);
    1.47    for (NodeIt src(graph); src != INVALID; ++src) {
    1.48      for (NodeIt trg(graph); trg != INVALID; ++trg) {
    1.49        for (ConEdgeIt<Graph> con(graph, src, trg); con != INVALID; ++con) {