diff -r e9c203fb003d -r 994c7df296c9 test/graph_utils_test.cc --- a/test/graph_utils_test.cc Fri Nov 13 12:33:33 2009 +0100 +++ b/test/graph_utils_test.cc Thu Dec 10 17:05:35 2009 +0100 @@ -2,7 +2,7 @@ * * This file is a part of LEMON, a generic C++ optimization library. * - * Copyright (C) 2003-2008 + * Copyright (C) 2003-2009 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport * (Egervary Research Group on Combinatorial Optimization, EGRES). * @@ -38,15 +38,15 @@ for (int i = 0; i < 10; ++i) { digraph.addNode(); } - DescriptorMap nodes(digraph); - typename DescriptorMap::InverseMap invNodes(nodes); + RangeIdMap nodes(digraph); + typename RangeIdMap::InverseMap invNodes(nodes); for (int i = 0; i < 100; ++i) { int src = rnd[invNodes.size()]; int trg = rnd[invNodes.size()]; digraph.addArc(invNodes[src], invNodes[trg]); } typename Digraph::template ArcMap found(digraph, false); - DescriptorMap arcs(digraph); + RangeIdMap arcs(digraph); for (NodeIt src(digraph); src != INVALID; ++src) { for (NodeIt trg(digraph); trg != INVALID; ++trg) { for (ConArcIt con(digraph, src, trg); con != INVALID; ++con) { @@ -113,15 +113,15 @@ for (int i = 0; i < 10; ++i) { graph.addNode(); } - DescriptorMap nodes(graph); - typename DescriptorMap::InverseMap invNodes(nodes); + RangeIdMap nodes(graph); + typename RangeIdMap::InverseMap invNodes(nodes); for (int i = 0; i < 100; ++i) { int src = rnd[invNodes.size()]; int trg = rnd[invNodes.size()]; graph.addEdge(invNodes[src], invNodes[trg]); } typename Graph::template EdgeMap found(graph, 0); - DescriptorMap edges(graph); + RangeIdMap edges(graph); for (NodeIt src(graph); src != INVALID; ++src) { for (NodeIt trg(graph); trg != INVALID; ++trg) { for (ConEdgeIt con(graph, src, trg); con != INVALID; ++con) {