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

Refactor CustomizeCell::RelaxNode to move level check inside function

Browse Source
This commit is contained in:
Patrick Niklaus 2017-08-18 21:46:38 +00:00 committed by Patrick Niklaus
parent 27324d0270
commit 00e243b23b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/customizer/cell_customizer.hpp
View File

@ -68,12 +68,7 @@ class CellCustomizer
const EdgeWeight weight = heap.GetKey(node);
const EdgeDuration duration = heap.GetData(node).duration;
if (level == 1)
RelaxNode<true>(
graph, cells, allowed_nodes, metric, heap, level, node, weight, duration);
else
RelaxNode<false>(
graph, cells, allowed_nodes, metric, heap, level, node, weight, duration);
RelaxNode(graph, cells, allowed_nodes, metric, heap, level, node, weight, duration);
destinations_set.erase(node);
}
@ -123,7 +118,7 @@ class CellCustomizer
}
private:
template <bool first_level, typename GraphT>
template <typename GraphT>
void RelaxNode(const GraphT &graph,
const partition::CellStorage &cells,
const std::vector<bool> &allowed_nodes,
@ -134,6 +129,7 @@ class CellCustomizer
EdgeWeight weight,
EdgeDuration duration) const
{
auto first_level = level == 1;
BOOST_ASSERT(heap.WasInserted(node));
if (!first_level)