ffc39b8ad2
The change clarifies the conditions for forcing routing steps and simplifies the codebase to support it. - Makes explicity the search runtime condition for forcing a routing step. Namely, the node is a source of the forward and reverse searches, and it's one of the pre-identified nodes that requires a step to be forced. - Consolidate the two lists of force nodes into one. Not only is there no algorithmic value in separating the nodes by geometric direction, the improvements to via-routes with u-turns mean atleast one of these lists will be empty for any search. - Rename 'force loop' to 'force step'. This moves the code away from the original CH-specific language for checking for self-loops in the case where this condition is met. MLD does not have loops. Additional cucumber tests are added to cover the logic related to negative search weights and forcing routing steps on via-route paths.
115 lines
4.5 KiB
C++
115 lines
4.5 KiB
C++
#include "engine/routing_algorithms/routing_base.hpp"
|
|
|
|
namespace osrm::engine::routing_algorithms
|
|
{
|
|
|
|
bool requiresForwardForce(const PhantomNode &source, const PhantomNode &target)
|
|
{
|
|
// Conditions to force a routing step:
|
|
// - Valid source and target.
|
|
// - Source and target on same segment.
|
|
// - Source is "downstream" of target in the direction of the edge.
|
|
return source.IsValidForwardSource() && target.IsValidForwardTarget() &&
|
|
source.forward_segment_id.id == target.forward_segment_id.id &&
|
|
source.GetForwardWeightPlusOffset() > target.GetForwardWeightPlusOffset();
|
|
}
|
|
|
|
bool requiresBackwardForce(const PhantomNode &source, const PhantomNode &target)
|
|
{
|
|
// Conditions to force a routing step:
|
|
// - Valid source and target.
|
|
// - Source and target on same segment.
|
|
// - Source is "downstream" of target in the direction of the edge.
|
|
return source.IsValidReverseSource() && target.IsValidReverseTarget() &&
|
|
source.reverse_segment_id.id == target.reverse_segment_id.id &&
|
|
source.GetReverseWeightPlusOffset() > target.GetReverseWeightPlusOffset();
|
|
}
|
|
|
|
std::vector<NodeID> getForwardForceNodes(const PhantomEndpointCandidates &endpoint_candidates)
|
|
{
|
|
std::vector<NodeID> res;
|
|
for (const auto &source_phantom : endpoint_candidates.source_phantoms)
|
|
{
|
|
auto requires_loop =
|
|
std::any_of(endpoint_candidates.target_phantoms.begin(),
|
|
endpoint_candidates.target_phantoms.end(),
|
|
[&](const auto &target_phantom)
|
|
{ return requiresForwardForce(source_phantom, target_phantom); });
|
|
if (requires_loop)
|
|
{
|
|
res.push_back(source_phantom.forward_segment_id.id);
|
|
}
|
|
}
|
|
return res;
|
|
}
|
|
|
|
std::vector<NodeID> getForwardForceNodes(const PhantomCandidatesToTarget &endpoint_candidates)
|
|
{
|
|
std::vector<NodeID> res;
|
|
for (const auto &source_phantom : endpoint_candidates.source_phantoms)
|
|
{
|
|
if (requiresForwardForce(source_phantom, endpoint_candidates.target_phantom))
|
|
{
|
|
res.push_back(source_phantom.forward_segment_id.id);
|
|
}
|
|
}
|
|
return res;
|
|
}
|
|
|
|
std::vector<NodeID> getBackwardForceNodes(const PhantomEndpointCandidates &endpoint_candidates)
|
|
{
|
|
std::vector<NodeID> res;
|
|
for (const auto &source_phantom : endpoint_candidates.source_phantoms)
|
|
{
|
|
auto requires_loop =
|
|
std::any_of(endpoint_candidates.target_phantoms.begin(),
|
|
endpoint_candidates.target_phantoms.end(),
|
|
[&](const auto &target_phantom)
|
|
{ return requiresBackwardForce(source_phantom, target_phantom); });
|
|
if (requires_loop)
|
|
{
|
|
res.push_back(source_phantom.reverse_segment_id.id);
|
|
}
|
|
}
|
|
return res;
|
|
}
|
|
|
|
std::vector<NodeID> getBackwardForceNodes(const PhantomCandidatesToTarget &endpoint_candidates)
|
|
{
|
|
std::vector<NodeID> res;
|
|
for (const auto &source_phantom : endpoint_candidates.source_phantoms)
|
|
{
|
|
if (requiresBackwardForce(source_phantom, endpoint_candidates.target_phantom))
|
|
{
|
|
res.push_back(source_phantom.reverse_segment_id.id);
|
|
}
|
|
}
|
|
return res;
|
|
}
|
|
|
|
PhantomEndpoints endpointsFromCandidates(const PhantomEndpointCandidates &candidates,
|
|
const std::vector<NodeID> &path)
|
|
{
|
|
auto source_it = std::find_if(candidates.source_phantoms.begin(),
|
|
candidates.source_phantoms.end(),
|
|
[&path](const auto &source_phantom)
|
|
{
|
|
return path.front() == source_phantom.forward_segment_id.id ||
|
|
path.front() == source_phantom.reverse_segment_id.id;
|
|
});
|
|
BOOST_ASSERT(source_it != candidates.source_phantoms.end());
|
|
|
|
auto target_it = std::find_if(candidates.target_phantoms.begin(),
|
|
candidates.target_phantoms.end(),
|
|
[&path](const auto &target_phantom)
|
|
{
|
|
return path.back() == target_phantom.forward_segment_id.id ||
|
|
path.back() == target_phantom.reverse_segment_id.id;
|
|
});
|
|
BOOST_ASSERT(target_it != candidates.target_phantoms.end());
|
|
|
|
return PhantomEndpoints{*source_it, *target_it};
|
|
}
|
|
|
|
} // namespace osrm::engine::routing_algorithms
|