Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Change interface of Tarjan get_component_size to take component id

Browse Source
This commit is contained in:
Patrick Niklaus
2015-07-07 18:24:18 +02:00
parent c80c2233c5
commit 35542e5823
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contractor/processing_chain.cpp
+21 -6
View File
@@ -137,7 +137,11 @@ void Prepare::FindComponents(unsigned max_edge_id, const DeallocatingVector<Edge
std::vector<EdgeBasedNode>& input_nodes) const
{
struct UncontractedEdgeData { };
using InputEdge = StaticGraph<UncontractedEdgeData>::InputEdge;
struct InputEdge {
unsigned source;
unsigned target;
UncontractedEdgeData data;
};
using UncontractedGraph = StaticGraph<UncontractedEdgeData>;
std::vector<InputEdge> edges;
edges.reserve(input_edge_list.size() * 2);
@@ -148,12 +152,12 @@ void Prepare::FindComponents(unsigned max_edge_id, const DeallocatingVector<Edge
"edge distance < 1");
if (edge.forward)
{
edges.emplace_back(edge.source, edge.target);
edges.push_back({edge.source, edge.target, {}});
}
if (edge.backward)
{
edges.emplace_back(edge.target, edge.source);
edges.push_back({edge.target, edge.source, {}});
}
}
@@ -162,12 +166,23 @@ void Prepare::FindComponents(unsigned max_edge_id, const DeallocatingVector<Edge
{
if (node.reverse_edge_based_node_id != SPECIAL_NODEID)
{
edges.emplace_back(node.forward_edge_based_node_id, node.reverse_edge_based_node_id);
edges.emplace_back(node.reverse_edge_based_node_id, node.forward_edge_based_node_id);
edges.push_back({node.forward_edge_based_node_id, node.reverse_edge_based_node_id, {}});
edges.push_back({node.reverse_edge_based_node_id, node.forward_edge_based_node_id, {}});
}
}
tbb::parallel_sort(edges.begin(), edges.end());
tbb::parallel_sort(edges.begin(), edges.end(),
[](const InputEdge& lhs, const InputEdge& rhs)
{
return lhs.source < rhs.source || (lhs.source == rhs.source && lhs.target < rhs.target);
});
auto new_end = std::unique(edges.begin(), edges.end(),
[](const InputEdge& lhs, const InputEdge& rhs)
{
return lhs.source == rhs.source && lhs.target == rhs.target;
});
edges.resize(new_end - edges.begin());
auto uncontractor_graph = std::make_shared<UncontractedGraph>(max_edge_id+1, edges);
TarjanSCC<UncontractedGraph> component_search(std::const_pointer_cast<const UncontractedGraph>(uncontractor_graph));