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

Merge branch 'minor_fixes' of https://github.com/seemoritz/osrm-backend into seemoritz-minor_fixes

Browse Source
This commit is contained in:
Patrick Niklaus
2017-02-07 11:28:42 +00:00
parent 1e9e420d91 bb0b03bbce
commit bf690df97a
7 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/contractor/graph_contractor.cpp
+9 -6
View File
@@ -237,7 +237,7 @@ void GraphContractor::Run(double core_factor)
unsigned current_level = 0;
bool flushed_contractor = false;
while (number_of_nodes > 2 &&
while (remaining_nodes.size() > 1 &&
number_of_contracted_nodes < static_cast<NodeID>(number_of_nodes * core_factor))
{
if (!flushed_contractor && (number_of_contracted_nodes >
@@ -341,16 +341,19 @@ void GraphContractor::Run(double core_factor)
for (const ContractorEdge &edge : data->inserted_edges)
{
const EdgeID current_edge_ID = contractor_graph->FindEdge(edge.source, edge.target);
if (current_edge_ID < contractor_graph->EndEdges(edge.source))
if (current_edge_ID != SPECIAL_EDGEID)
{
ContractorGraph::EdgeData &current_data =
contractor_graph->GetEdgeData(current_edge_ID);
if (current_data.shortcut && edge.data.forward == current_data.forward &&
edge.data.backward == current_data.backward &&
edge.data.weight < current_data.weight)
edge.data.backward == current_data.backward)
{
// found a duplicate edge with smaller weight, update it.
current_data = edge.data;
if (edge.data.weight < current_data.weight)
{
current_data = edge.data;
}
// don't insert duplicates
continue;
}
}
@@ -387,7 +390,7 @@ void GraphContractor::Run(double core_factor)
if (remaining_nodes.size() > 2)
{
if (orig_node_id_from_new_node_id_map.size() > 0)
if (flushed_contractor)
{
tbb::parallel_for(tbb::blocked_range<NodeID>(0, remaining_nodes.size(), InitGrainSize),
[this, &remaining_nodes](const tbb::blocked_range<NodeID> &range) {