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

Change edge_id to from_clique_arc in MultiLayerDijkstraHeapData

Browse Source
This commit is contained in:
Michael Krasnyk 2017-03-15 14:36:41 +01:00
parent f1b88adebe
commit 79ef204e1f
No known key found for this signature in database
GPG Key ID: 49C12AD0F43D2108
4 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/engine/datafacade/algorithm_datafacade.hpp
View File

@ -89,6 +89,9 @@ template <> class AlgorithmDataFacade<algorithm::MLD>
virtual const partition::MultiLevelPartitionView &GetMultiLevelPartition() const = 0; virtual const partition::MultiLevelPartitionView &GetMultiLevelPartition() const = 0;
virtual const partition::CellStorageView &GetCellStorage() const = 0; virtual const partition::CellStorageView &GetCellStorage() const = 0;
// searches for a specific edge
virtual EdgeID FindEdge(const NodeID from, const NodeID to) const = 0;
}; };
} }
} }

6
include/engine/datafacade/contiguous_internalmem_datafacade.hpp
View File

@ -1067,6 +1067,12 @@ class ContiguousInternalMemoryDataFacade<algorithm::MLD>
{ {
return m_query_graph->GetAdjacentEdgeRange(node); return m_query_graph->GetAdjacentEdgeRange(node);
} }
// searches for a specific edge
EdgeID FindEdge(const NodeID from, const NodeID to) const override final
{
return m_query_graph->FindEdge(from, to);
}
}; };
} }
} }

33
include/engine/routing_algorithms/routing_base_mld.hpp
View File

@ -87,13 +87,8 @@ void routingStep(const datafacade::ContiguousInternalMemoryDataFacade<algorithm:
} }
const auto level = getNodeQureyLevel(partition, node, args...); const auto level = getNodeQureyLevel(partition, node, args...);
const auto &node_data = forward_heap.GetData(node);
const auto check_overlay_edges =
(level >= 1) && // only if at least the first level and
(node_data.parent == node || // is the first point of the path
node_data.edge_id != SPECIAL_EDGEID); // or an overlay entreé point
if (check_overlay_edges) if (level >= 1 && !forward_heap.GetData(node).from_clique_arc)
{ {
if (DIRECTION == FORWARD_DIRECTION) if (DIRECTION == FORWARD_DIRECTION)
{ {
@ -109,11 +104,11 @@ void routingStep(const datafacade::ContiguousInternalMemoryDataFacade<algorithm:
const EdgeWeight to_weight = weight + shortcut_weight; const EdgeWeight to_weight = weight + shortcut_weight;
if (!forward_heap.WasInserted(to)) if (!forward_heap.WasInserted(to))
{ {
forward_heap.Insert(to, to_weight, {node}); forward_heap.Insert(to, to_weight, {node, true});
} }
else if (to_weight < forward_heap.GetKey(to)) else if (to_weight < forward_heap.GetKey(to))
{ {
forward_heap.GetData(to) = {node}; forward_heap.GetData(to) = {node, true};
forward_heap.DecreaseKey(to, to_weight); forward_heap.DecreaseKey(to, to_weight);
} }
} }
@ -134,11 +129,11 @@ void routingStep(const datafacade::ContiguousInternalMemoryDataFacade<algorithm:
const EdgeWeight to_weight = weight + shortcut_weight; const EdgeWeight to_weight = weight + shortcut_weight;
if (!forward_heap.WasInserted(to)) if (!forward_heap.WasInserted(to))
{ {
forward_heap.Insert(to, to_weight, {node}); forward_heap.Insert(to, to_weight, {node, true});
} }
else if (to_weight < forward_heap.GetKey(to)) else if (to_weight < forward_heap.GetKey(to))
{ {
forward_heap.GetData(to) = {node}; forward_heap.GetData(to) = {node, true};
forward_heap.DecreaseKey(to, to_weight); forward_heap.DecreaseKey(to, to_weight);
} }
} }
@ -163,11 +158,11 @@ void routingStep(const datafacade::ContiguousInternalMemoryDataFacade<algorithm:
if (!forward_heap.WasInserted(to)) if (!forward_heap.WasInserted(to))
{ {
forward_heap.Insert(to, to_weight, {node, edge}); forward_heap.Insert(to, to_weight, {node, false});
} }
else if (to_weight < forward_heap.GetKey(to)) else if (to_weight < forward_heap.GetKey(to))
{ {
forward_heap.GetData(to) = {node, edge}; forward_heap.GetData(to) = {node, false};
forward_heap.DecreaseKey(to, to_weight); forward_heap.DecreaseKey(to, to_weight);
} }
} }
@ -220,12 +215,12 @@ search(const datafacade::ContiguousInternalMemoryDataFacade<algorithm::MLD> &fac
} }
// Get packed path as edges {from node ID, to node ID, edge ID} // Get packed path as edges {from node ID, to node ID, edge ID}
std::vector<std::tuple<NodeID, NodeID, EdgeID>> packed_path; std::vector<std::tuple<NodeID, NodeID, bool>> packed_path;
NodeID current_node = middle, parent_node = forward_heap.GetData(middle).parent; NodeID current_node = middle, parent_node = forward_heap.GetData(middle).parent;
while (parent_node != current_node) while (parent_node != current_node)
{ {
const auto &data = forward_heap.GetData(current_node); const auto &data = forward_heap.GetData(current_node);
packed_path.push_back(std::make_tuple(parent_node, current_node, data.edge_id)); packed_path.push_back(std::make_tuple(parent_node, current_node, data.from_clique_arc));
current_node = parent_node; current_node = parent_node;
parent_node = forward_heap.GetData(parent_node).parent; parent_node = forward_heap.GetData(parent_node).parent;
} }
@ -236,7 +231,7 @@ search(const datafacade::ContiguousInternalMemoryDataFacade<algorithm::MLD> &fac
while (parent_node != current_node) while (parent_node != current_node)
{ {
const auto &data = reverse_heap.GetData(current_node); const auto &data = reverse_heap.GetData(current_node);
packed_path.push_back(std::make_tuple(current_node, parent_node, data.edge_id)); packed_path.push_back(std::make_tuple(current_node, parent_node, data.from_clique_arc));
current_node = parent_node; current_node = parent_node;
parent_node = reverse_heap.GetData(parent_node).parent; parent_node = reverse_heap.GetData(parent_node).parent;
} }
@ -248,11 +243,11 @@ search(const datafacade::ContiguousInternalMemoryDataFacade<algorithm::MLD> &fac
for (auto const &packed_edge : packed_path) for (auto const &packed_edge : packed_path)
{ {
NodeID source, target; NodeID source, target;
EdgeID edge_id; bool overlay_edge;
std::tie(source, target, edge_id) = packed_edge; std::tie(source, target, overlay_edge) = packed_edge;
if (edge_id != SPECIAL_EDGEID) if (!overlay_edge)
{ // a base graph edge { // a base graph edge
unpacked_path.push_back(edge_id); unpacked_path.push_back(facade.FindEdge(source, target));
} }
else else
{ // an overlay graph edge { // an overlay graph edge

6
include/engine/search_engine_data.hpp
View File

@ -26,9 +26,9 @@ struct ManyToManyHeapData : HeapData
struct MultiLayerDijkstraHeapData : HeapData struct MultiLayerDijkstraHeapData : HeapData
{ {
EdgeID edge_id; // edge id if parent -> node is a boundary edge bool from_clique_arc;
MultiLayerDijkstraHeapData(NodeID p) : HeapData(p), edge_id(SPECIAL_EDGEID) {} MultiLayerDijkstraHeapData(NodeID p) : HeapData(p), from_clique_arc(false) {}
MultiLayerDijkstraHeapData(NodeID p, EdgeID edge_id) : HeapData(p), edge_id(edge_id) {} MultiLayerDijkstraHeapData(NodeID p, bool from) : HeapData(p), from_clique_arc(from) {}
}; };
struct SearchEngineData struct SearchEngineData