From 94d7fd911289078e3bd01c128781441e37278f39 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Fri, 17 Apr 2015 00:25:01 +0200 Subject: [PATCH] Adapt osrm-components to new FindEdge interface --- tools/components.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/components.cpp b/tools/components.cpp index 565fb2f48..7ac64f8d9 100644 --- a/tools/components.cpp +++ b/tools/components.cpp @@ -64,8 +64,8 @@ struct TarjanEdgeData unsigned name_id; }; -using TarjanDynamicGraph = StaticGraph; -using TarjanEdge = TarjanDynamicGraph::InputEdge; +using TarjanGraph = StaticGraph; +using TarjanEdge = TarjanGraph::InputEdge; void DeleteFileIfExists(const std::string &file_name) { @@ -174,14 +174,14 @@ int main(int argc, char *argv[]) "input edge vector not properly deallocated"); tbb::parallel_sort(graph_edge_list.begin(), graph_edge_list.end()); - const auto graph = std::make_shared(number_of_nodes, graph_edge_list); + const auto graph = std::make_shared(number_of_nodes, graph_edge_list); graph_edge_list.clear(); graph_edge_list.shrink_to_fit(); SimpleLogger().Write() << "Starting SCC graph traversal"; RestrictionMap restriction_map(restriction_list); - auto tarjan = osrm::make_unique>(graph, + auto tarjan = osrm::make_unique>(graph, restriction_map, bollard_node_list); tarjan->run(); @@ -236,9 +236,9 @@ int main(int argc, char *argv[]) percentage.printIncrement(); for (const auto current_edge : graph->GetAdjacentEdgeRange(source)) { - const TarjanDynamicGraph::NodeIterator target = graph->GetTarget(current_edge); + const TarjanGraph::NodeIterator target = graph->GetTarget(current_edge); - if (source < target || graph->EndEdges(target) >= graph->FindEdge(target, source)) + if (source < target || SPECIAL_EDGEID == graph->FindEdge(target, source)) { total_network_length += 100 * coordinate_calculation::euclidean_distance(