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

Merge with master

Browse Source
This commit is contained in:
Siarhei Fedartsou 2024-05-21 20:48:24 +02:00
parent 8b806cb7bd
commit 5ec2712fe1
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/engine/routing_algorithms/routing_base_ch.hpp
View File

@ -122,7 +122,7 @@ void routingStep(const DataFacade<Algorithm> &facade,
const EdgeWeight new_weight = reverseHeapNode->weight + heapNode.weight; const EdgeWeight new_weight = reverseHeapNode->weight + heapNode.weight;
if (new_weight < upper_bound) if (new_weight < upper_bound)
{ {
if (shouldForceStep(force_step_nodes, heapNode, reverseHeapNode.get()) || if (shouldForceStep(force_step_nodes, heapNode, *reverseHeapNode) ||
// in this case we are looking at a bi-directional way where the source // in this case we are looking at a bi-directional way where the source
// and target phantom are on the same edge based node // and target phantom are on the same edge based node
new_weight < EdgeWeight{0}) new_weight < EdgeWeight{0})

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

@ -408,7 +408,7 @@ void routingStep(const DataFacade<Algorithm> &facade,
auto reverse_weight = reverseHeapNode->weight; auto reverse_weight = reverseHeapNode->weight;
auto path_weight = weight + reverse_weight; auto path_weight = weight + reverse_weight;
if (!shouldForceStep(force_step_nodes, heapNode, reverseHeapNode.get()) && if (!shouldForceStep(force_step_nodes, heapNode, *reverseHeapNode) &&
(path_weight >= EdgeWeight{0}) && (path_weight < path_upper_bound)) (path_weight >= EdgeWeight{0}) && (path_weight < path_upper_bound))
{ {
middle_node = heapNode.node; middle_node = heapNode.node;

1
include/updater/source.hpp
View File

@ -14,7 +14,6 @@ template <typename Key, typename Value> struct LookupTable
std::optional<Value> operator()(const Key &key) const std::optional<Value> operator()(const Key &key) const
{ {
using Result = std::optional<Value>; using Result = std::optional<Value>;
using Result = boost::optional<Value>;
const auto it = const auto it =
std::lower_bound(lookup.begin(), std::lower_bound(lookup.begin(),
lookup.end(), lookup.end(),