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

Avoid -> Exclude

Browse Source
This commit is contained in:
Patrick Niklaus
2017-08-16 20:21:19 +00:00
committed by Patrick Niklaus
parent 45140ca9f7
commit d09f5c0e3a
27 changed files with 145 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/routing_algorithms/alternative_path_mld.cpp
+2 -2
View File
@@ -518,8 +518,8 @@ void unpackPackedPaths(InputIt first,
forward_heap.Insert(source, 0, {source});
reverse_heap.Insert(target, 0, {target});
BOOST_ASSERT(!facade.AvoidNode(source));
BOOST_ASSERT(!facade.AvoidNode(target));
BOOST_ASSERT(!facade.ExcludeNode(source));
BOOST_ASSERT(!facade.ExcludeNode(target));
// TODO: when structured bindings will be allowed change to
// auto [subpath_weight, subpath_source, subpath_target, subpath] = ...
src/engine/routing_algorithms/many_to_many.cpp
+4 -4
View File
@@ -111,7 +111,7 @@ void relaxOutgoingEdges(const DataFacade<mld::Algorithm> &facade,
typename SearchEngineData<mld::Algorithm>::ManyToManyQueryHeap &query_heap,
const PhantomNode &phantom_node)
{
BOOST_ASSERT(!facade.AvoidNode(node));
BOOST_ASSERT(!facade.ExcludeNode(node));
const auto &partition = facade.GetMultiLevelPartition();
const auto &cells = facade.GetCellStorage();
@@ -140,7 +140,7 @@ void relaxOutgoingEdges(const DataFacade<mld::Algorithm> &facade,
BOOST_ASSERT(!shortcut_durations.empty());
const NodeID to = *destination;
if (facade.AvoidNode(to))
if (facade.ExcludeNode(to))
{
continue;
}
@@ -174,7 +174,7 @@ void relaxOutgoingEdges(const DataFacade<mld::Algorithm> &facade,
BOOST_ASSERT(!shortcut_durations.empty());
const NodeID to = *source;
if (facade.AvoidNode(to))
if (facade.ExcludeNode(to))
{
continue;
}
@@ -206,7 +206,7 @@ void relaxOutgoingEdges(const DataFacade<mld::Algorithm> &facade,
if (DIRECTION == FORWARD_DIRECTION ? data.forward : data.backward)
{
const NodeID to = facade.GetTarget(edge);
if (facade.AvoidNode(to))
if (facade.ExcludeNode(to))
{
continue;
}