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

Move duplicated code into insert_node lambda

Browse Source
This commit is contained in:
Michael Krasnyk 2017-09-28 15:02:02 +02:00
parent f2333eb31a
commit b3f59ab92c
1 changed files with 38 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/engine/routing_algorithms/many_to_many.cpp
View File

@ -465,6 +465,7 @@ manyToManySearch(SearchEngineData<mld::Algorithm> &engine_working_data,
namespace mld namespace mld
{ {
// Unidirectional multi-layer Dijkstra search for 1-to-N and N-to-1 matrices
template <bool DIRECTION> template <bool DIRECTION>
std::vector<EdgeDuration> oneToManySearch(SearchEngineData<Algorithm> &engine_working_data, std::vector<EdgeDuration> oneToManySearch(SearchEngineData<Algorithm> &engine_working_data,
const DataFacade<Algorithm> &facade, const DataFacade<Algorithm> &facade,
@ -518,6 +519,10 @@ std::vector<EdgeDuration> oneToManySearch(SearchEngineData<Algorithm> &engine_wo
} }
} }
// Initialize query heap
engine_working_data.InitializeOrClearManyToManyThreadLocalStorage(facade.GetNumberOfNodes());
auto &query_heap = *(engine_working_data.many_to_many_heap);
// Check if node is in the destinations list and update weights/durations // Check if node is in the destinations list and update weights/durations
auto update_values = [&](NodeID node, EdgeWeight weight, EdgeDuration duration) { auto update_values = [&](NodeID node, EdgeWeight weight, EdgeDuration duration) {
auto candidates = target_nodes_index.equal_range(node); auto candidates = target_nodes_index.equal_range(node);
@ -550,102 +555,53 @@ std::vector<EdgeDuration> oneToManySearch(SearchEngineData<Algorithm> &engine_wo
} }
}; };
// Place source (destination) adjacent nodes into the heap // Check a single path result and insert adjacent nodes into heap
engine_working_data.InitializeOrClearManyToManyThreadLocalStorage(facade.GetNumberOfNodes()); auto insert_node = [&](NodeID node, EdgeWeight initial_weight, EdgeDuration initial_duration) {
auto &query_heap = *(engine_working_data.many_to_many_heap);
{ // Update single node paths // Update single node paths
update_values(node, initial_weight, initial_duration);
// Place adjacent nodes into heap
for (auto edge : facade.GetAdjacentEdgeRange(node))
{
const auto &data = facade.GetEdgeData(edge);
if (DIRECTION == FORWARD_DIRECTION ? data.forward : data.backward)
{
query_heap.Insert(facade.GetTarget(edge),
data.weight + initial_weight,
{node, data.duration + initial_duration});
}
}
};
{ // Place source (destination) adjacent nodes into the heap
const auto &phantom_node = phantom_nodes[phantom_index]; const auto &phantom_node = phantom_nodes[phantom_index];
if (DIRECTION == FORWARD_DIRECTION) if (DIRECTION == FORWARD_DIRECTION)
{ {
if (phantom_node.IsValidForwardSource()) if (phantom_node.IsValidForwardSource())
update_values(phantom_node.forward_segment_id.id, insert_node(phantom_node.forward_segment_id.id,
-phantom_node.GetForwardWeightPlusOffset(), -phantom_node.GetForwardWeightPlusOffset(),
-phantom_node.GetForwardDuration()); -phantom_node.GetForwardDuration());
if (phantom_node.IsValidReverseSource()) if (phantom_node.IsValidReverseSource())
update_values(phantom_node.reverse_segment_id.id, insert_node(phantom_node.reverse_segment_id.id,
-phantom_node.GetReverseWeightPlusOffset(), -phantom_node.GetReverseWeightPlusOffset(),
-phantom_node.GetReverseDuration()); -phantom_node.GetReverseDuration());
} }
else if (DIRECTION == REVERSE_DIRECTION) else if (DIRECTION == REVERSE_DIRECTION)
{ {
if (phantom_node.IsValidForwardTarget()) if (phantom_node.IsValidForwardTarget())
update_values(phantom_node.forward_segment_id.id, insert_node(phantom_node.forward_segment_id.id,
phantom_node.GetForwardWeightPlusOffset(), phantom_node.GetForwardWeightPlusOffset(),
phantom_node.GetForwardDuration()); phantom_node.GetForwardDuration());
if (phantom_node.IsValidReverseTarget()) if (phantom_node.IsValidReverseTarget())
update_values(phantom_node.reverse_segment_id.id, insert_node(phantom_node.reverse_segment_id.id,
phantom_node.GetReverseWeightPlusOffset(), phantom_node.GetReverseWeightPlusOffset(),
phantom_node.GetReverseDuration()); phantom_node.GetReverseDuration());
} }
if (DIRECTION == FORWARD_DIRECTION)
{
if (phantom_node.IsValidForwardSource())
{
const auto parent = phantom_node.forward_segment_id.id;
for (auto edge : facade.GetAdjacentEdgeRange(parent))
{
const auto &data = facade.GetEdgeData(edge);
if (DIRECTION == FORWARD_DIRECTION ? data.forward : data.backward)
{
query_heap.Insert(
facade.GetTarget(edge),
data.weight - phantom_node.GetForwardWeightPlusOffset(),
{parent, data.duration - phantom_node.GetForwardDuration()});
}
}
}
if (phantom_node.IsValidReverseSource())
{
const auto parent = phantom_node.reverse_segment_id.id;
for (auto edge : facade.GetAdjacentEdgeRange(parent))
{
const auto &data = facade.GetEdgeData(edge);
if (DIRECTION == FORWARD_DIRECTION ? data.forward : data.backward)
{
query_heap.Insert(
facade.GetTarget(edge),
data.weight - phantom_node.GetReverseWeightPlusOffset(),
{parent, data.duration - phantom_node.GetReverseDuration()});
}
}
}
}
else if (DIRECTION == REVERSE_DIRECTION)
{
if (phantom_node.IsValidForwardTarget())
{
const auto parent = phantom_node.forward_segment_id.id;
for (auto edge : facade.GetAdjacentEdgeRange(parent))
{
const auto &data = facade.GetEdgeData(edge);
if (DIRECTION == FORWARD_DIRECTION ? data.forward : data.backward)
{
query_heap.Insert(
facade.GetTarget(edge),
data.weight + phantom_node.GetForwardWeightPlusOffset(),
{parent, data.duration + phantom_node.GetForwardDuration()});
}
}
}
if (phantom_node.IsValidReverseTarget())
{
const auto parent = phantom_node.reverse_segment_id.id;
for (auto edge : facade.GetAdjacentEdgeRange(parent))
{
const auto &data = facade.GetEdgeData(edge);
if (DIRECTION == FORWARD_DIRECTION ? data.forward : data.backward)
{
query_heap.Insert(
facade.GetTarget(edge),
data.weight + phantom_node.GetReverseWeightPlusOffset(),
{parent, data.duration + phantom_node.GetReverseDuration()});
}
}
}
}
} }
while (!query_heap.Empty() && !target_nodes_index.empty()) while (!query_heap.Empty() && !target_nodes_index.empty())