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

Use highest different level with source but not parent node

Browse Source
This commit is contained in:
Michael Krasnyk 2017-07-02 15:36:56 +02:00 committed by Patrick Niklaus
parent e42c23686b
commit 359ab2b56e
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/engine/search_engine_data.hpp
View File

@ -80,14 +80,13 @@ struct MultiLayerDijkstraHeapData
struct ManyToManyMultiLayerDijkstraHeapData : MultiLayerDijkstraHeapData struct ManyToManyMultiLayerDijkstraHeapData : MultiLayerDijkstraHeapData
{ {
LevelID level;
EdgeWeight duration; EdgeWeight duration;
ManyToManyMultiLayerDijkstraHeapData(NodeID p, EdgeWeight duration) ManyToManyMultiLayerDijkstraHeapData(NodeID p, EdgeWeight duration)
: MultiLayerDijkstraHeapData(p), level(0), duration(duration) : MultiLayerDijkstraHeapData(p), duration(duration)
{ {
} }
ManyToManyMultiLayerDijkstraHeapData(NodeID p, bool from, LevelID level, EdgeWeight duration) ManyToManyMultiLayerDijkstraHeapData(NodeID p, bool from, EdgeWeight duration)
: MultiLayerDijkstraHeapData(p, from), level(level), duration(duration) : MultiLayerDijkstraHeapData(p, from), duration(duration)
{ {
} }
}; };

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

@ -60,7 +60,8 @@ void relaxOutgoingEdges(const datafacade::ContiguousInternalMemoryDataFacade<ch:
const NodeID node, const NodeID node,
const EdgeWeight weight, const EdgeWeight weight,
const EdgeDuration duration, const EdgeDuration duration,
typename SearchEngineData<ch::Algorithm>::ManyToManyQueryHeap &query_heap) typename SearchEngineData<ch::Algorithm>::ManyToManyQueryHeap &query_heap,
const PhantomNode &)
{ {
if (ch::stallAtNode<DIRECTION>(facade, node, weight, query_heap)) if (ch::stallAtNode<DIRECTION>(facade, node, weight, query_heap))
{ {
@ -96,7 +97,6 @@ void relaxOutgoingEdges(const datafacade::ContiguousInternalMemoryDataFacade<ch:
} }
} }
inline bool addLoopWeight(const datafacade::ContiguousInternalMemoryDataFacade<mld::Algorithm> &, inline bool addLoopWeight(const datafacade::ContiguousInternalMemoryDataFacade<mld::Algorithm> &,
const NodeID, const NodeID,
EdgeWeight &, EdgeWeight &,
@ -111,14 +111,21 @@ void relaxOutgoingEdges(
const NodeID node, const NodeID node,
const EdgeWeight weight, const EdgeWeight weight,
const EdgeDuration duration, const EdgeDuration duration,
typename SearchEngineData<mld::Algorithm>::ManyToManyQueryHeap &query_heap) typename SearchEngineData<mld::Algorithm>::ManyToManyQueryHeap &query_heap,
const PhantomNode &phantom_node)
{ {
const auto &partition = facade.GetMultiLevelPartition(); const auto &partition = facade.GetMultiLevelPartition();
const auto &cells = facade.GetCellStorage(); const auto &cells = facade.GetCellStorage();
auto highest_diffrent_level = [&partition, node](const SegmentID &phantom_node) {
if (phantom_node.enabled)
return partition.GetHighestDifferentLevel(phantom_node.id, node);
return INVALID_LEVEL_ID;
};
const auto level = std::min(highest_diffrent_level(phantom_node.forward_segment_id),
highest_diffrent_level(phantom_node.reverse_segment_id));
const auto &node_data = query_heap.GetData(node); const auto &node_data = query_heap.GetData(node);
const auto level =
std::max(node_data.level, partition.GetHighestDifferentLevel(node_data.parent, node));
if (level >= 1 && !node_data.from_clique_arc) if (level >= 1 && !node_data.from_clique_arc)
{ {
@ -138,11 +145,11 @@ void relaxOutgoingEdges(
const auto to_duration = duration + shortcut_durations.front(); const auto to_duration = duration + shortcut_durations.front();
if (!query_heap.WasInserted(to)) if (!query_heap.WasInserted(to))
{ {
query_heap.Insert(to, to_weight, {node, true, level, to_duration}); query_heap.Insert(to, to_weight, {node, true, to_duration});
} }
else if (to_weight < query_heap.GetKey(to)) else if (to_weight < query_heap.GetKey(to))
{ {
query_heap.GetData(to) = {node, true, level, to_duration}; query_heap.GetData(to) = {node, true, to_duration};
query_heap.DecreaseKey(to, to_weight); query_heap.DecreaseKey(to, to_weight);
} }
} }
@ -166,11 +173,11 @@ void relaxOutgoingEdges(
const auto to_duration = duration + shortcut_durations.front(); const auto to_duration = duration + shortcut_durations.front();
if (!query_heap.WasInserted(to)) if (!query_heap.WasInserted(to))
{ {
query_heap.Insert(to, to_weight, {node, true, level, to_duration}); query_heap.Insert(to, to_weight, {node, true, to_duration});
} }
else if (to_weight < query_heap.GetKey(to)) else if (to_weight < query_heap.GetKey(to))
{ {
query_heap.GetData(to) = {node, true, level, to_duration}; query_heap.GetData(to) = {node, true, to_duration};
query_heap.DecreaseKey(to, to_weight); query_heap.DecreaseKey(to, to_weight);
} }
} }
@ -197,13 +204,13 @@ void relaxOutgoingEdges(
// New Node discovered -> Add to Heap + Node Info Storage // New Node discovered -> Add to Heap + Node Info Storage
if (!query_heap.WasInserted(to)) if (!query_heap.WasInserted(to))
{ {
query_heap.Insert(to, to_weight, {node, false, level, to_duration}); query_heap.Insert(to, to_weight, {node, false, to_duration});
} }
// Found a shorter Path -> Update weight // Found a shorter Path -> Update weight
else if (to_weight < query_heap.GetKey(to)) else if (to_weight < query_heap.GetKey(to))
{ {
// new parent // new parent
query_heap.GetData(to) = {node, false, level, to_duration}; query_heap.GetData(to) = {node, false, to_duration};
query_heap.DecreaseKey(to, to_weight); query_heap.DecreaseKey(to, to_weight);
} }
} }
@ -217,7 +224,8 @@ void forwardRoutingStep(const datafacade::ContiguousInternalMemoryDataFacade<Alg
typename SearchEngineData<Algorithm>::ManyToManyQueryHeap &query_heap, typename SearchEngineData<Algorithm>::ManyToManyQueryHeap &query_heap,
const SearchSpaceWithBuckets &search_space_with_buckets, const SearchSpaceWithBuckets &search_space_with_buckets,
std::vector<EdgeWeight> &weights_table, std::vector<EdgeWeight> &weights_table,
std::vector<EdgeWeight> &durations_table) std::vector<EdgeWeight> &durations_table,
const PhantomNode &phantom_node)
{ {
const NodeID node = query_heap.DeleteMin(); const NodeID node = query_heap.DeleteMin();
const EdgeWeight source_weight = query_heap.GetKey(node); const EdgeWeight source_weight = query_heap.GetKey(node);
@ -259,14 +267,16 @@ void forwardRoutingStep(const datafacade::ContiguousInternalMemoryDataFacade<Alg
} }
} }
relaxOutgoingEdges<FORWARD_DIRECTION>(facade, node, source_weight, source_duration, query_heap); relaxOutgoingEdges<FORWARD_DIRECTION>(
facade, node, source_weight, source_duration, query_heap, phantom_node);
} }
template <typename Algorithm> template <typename Algorithm>
void backwardRoutingStep(const datafacade::ContiguousInternalMemoryDataFacade<Algorithm> &facade, void backwardRoutingStep(const datafacade::ContiguousInternalMemoryDataFacade<Algorithm> &facade,
const unsigned column_idx, const unsigned column_idx,
typename SearchEngineData<Algorithm>::ManyToManyQueryHeap &query_heap, typename SearchEngineData<Algorithm>::ManyToManyQueryHeap &query_heap,
SearchSpaceWithBuckets &search_space_with_buckets) SearchSpaceWithBuckets &search_space_with_buckets,
const PhantomNode &phantom_node)
{ {
const NodeID node = query_heap.DeleteMin(); const NodeID node = query_heap.DeleteMin();
const EdgeWeight target_weight = query_heap.GetKey(node); const EdgeWeight target_weight = query_heap.GetKey(node);
@ -275,7 +285,8 @@ void backwardRoutingStep(const datafacade::ContiguousInternalMemoryDataFacade<Al
// store settled nodes in search space bucket // store settled nodes in search space bucket
search_space_with_buckets[node].emplace_back(column_idx, target_weight, target_duration); search_space_with_buckets[node].emplace_back(column_idx, target_weight, target_duration);
relaxOutgoingEdges<REVERSE_DIRECTION>(facade, node, target_weight, target_duration, query_heap); relaxOutgoingEdges<REVERSE_DIRECTION>(
facade, node, target_weight, target_duration, query_heap, phantom_node);
} }
} }
@ -311,7 +322,7 @@ manyToManySearch(SearchEngineData<Algorithm> &engine_working_data,
// explore search space // explore search space
while (!query_heap.Empty()) while (!query_heap.Empty())
{ {
backwardRoutingStep(facade, column_idx, query_heap, search_space_with_buckets); backwardRoutingStep(facade, column_idx, query_heap, search_space_with_buckets, phantom);
} }
++column_idx; ++column_idx;
}; };
@ -332,7 +343,8 @@ manyToManySearch(SearchEngineData<Algorithm> &engine_working_data,
query_heap, query_heap,
search_space_with_buckets, search_space_with_buckets,
weights_table, weights_table,
durations_table); durations_table,
phantom);
} }
++row_idx; ++row_idx;
}; };