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

Get rid of boost::optional leftovers (#6977)

Browse Source
This commit is contained in:
Siarhei Fedartsou
2024-07-02 22:37:09 +02:00
committed by GitHub
parent d0ed29adb7
commit 57b792c768
49 changed files with 232 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_tests/engine/collapse_internal_route_result.cpp
+13 -13
View File
@@ -19,8 +19,8 @@ BOOST_AUTO_TEST_CASE(unchanged_collapse_route_result)
PhantomNode target;
source.forward_segment_id = {1, true};
target.forward_segment_id = {6, true};
PathData pathy{0, 2, {2}, {3}, {4}, {5}, 2, boost::none};
PathData kathy{0, 1, {1}, {2}, {3}, {4}, 1, boost::none};
PathData pathy{0, 2, {2}, {3}, {4}, {5}, 2, std::nullopt};
PathData kathy{0, 1, {1}, {2}, {3}, {4}, 1, std::nullopt};
InternalRouteResult one_leg_result;
one_leg_result.unpacked_path_segments = {{pathy, kathy}};
one_leg_result.leg_endpoints = {PhantomEndpoints{source, target}};
@@ -39,9 +39,9 @@ BOOST_AUTO_TEST_CASE(two_legs_to_one_leg)
{
// from_edge_based_node, turn_via_node, weight_until_turn, weight_of_turn,
// duration_until_turn, duration_of_turn, datasource_id, turn_edge
PathData pathy{0, 2, {2}, {3}, {4}, {5}, 2, boost::none};
PathData kathy{0, 1, {1}, {2}, {3}, {4}, 1, boost::none};
PathData cathy{0, 3, {1}, {2}, {3}, {4}, 1, boost::none};
PathData pathy{0, 2, {2}, {3}, {4}, {5}, 2, std::nullopt};
PathData kathy{0, 1, {1}, {2}, {3}, {4}, 1, std::nullopt};
PathData cathy{0, 3, {1}, {2}, {3}, {4}, 1, std::nullopt};
PhantomNode node_1;
PhantomNode node_2;
PhantomNode node_3;
@@ -74,11 +74,11 @@ BOOST_AUTO_TEST_CASE(two_legs_to_one_leg)
BOOST_AUTO_TEST_CASE(three_legs_to_two_legs)
{
PathData pathy{0, 2, {2}, {3}, {4}, {5}, 2, boost::none};
PathData kathy{0, 1, {1}, {2}, {3}, {4}, 1, boost::none};
PathData qathy{0, 5, {1}, {2}, {3}, {4}, 1, boost::none};
PathData cathy{0, 3, {1}, {2}, {3}, {4}, 1, boost::none};
PathData mathy{0, 4, {8}, {9}, {13}, {4}, 2, boost::none};
PathData pathy{0, 2, {2}, {3}, {4}, {5}, 2, std::nullopt};
PathData kathy{0, 1, {1}, {2}, {3}, {4}, 1, std::nullopt};
PathData qathy{0, 5, {1}, {2}, {3}, {4}, 1, std::nullopt};
PathData cathy{0, 3, {1}, {2}, {3}, {4}, 1, std::nullopt};
PathData mathy{0, 4, {8}, {9}, {13}, {4}, 2, std::nullopt};
PhantomNode node_1;
PhantomNode node_2;
PhantomNode node_3;
@@ -131,9 +131,9 @@ BOOST_AUTO_TEST_CASE(three_legs_to_two_legs)
BOOST_AUTO_TEST_CASE(two_legs_to_two_legs)
{
PathData pathy{0, 2, {2}, {3}, {4}, {5}, 2, boost::none};
PathData kathy{0, 1, {1}, {2}, {3}, {4}, 1, boost::none};
PathData cathy{0, 3, {1}, {2}, {3}, {4}, 1, boost::none};
PathData pathy{0, 2, {2}, {3}, {4}, {5}, 2, std::nullopt};
PathData kathy{0, 1, {1}, {2}, {3}, {4}, 1, std::nullopt};
PathData cathy{0, 3, {1}, {2}, {3}, {4}, 1, std::nullopt};
PhantomNode node_1;
PhantomNode node_2;
PhantomNode node_3;
unit_tests/engine/offline_facade.cpp
+5 -5
View File
@@ -219,7 +219,7 @@ class ContiguousInternalMemoryDataFacade<routing_algorithms::offline::Algorithm>
std::vector<engine::PhantomNodeWithDistance>
NearestPhantomNodesInRange(const util::Coordinate /*input_coordinate*/,
const double /*max_distance*/,
const boost::optional<engine::Bearing> /*bearing*/,
const std::optional<engine::Bearing> /*bearing*/,
const engine::Approach /*approach*/,
const bool /*use_all_edges*/) const override
{
@@ -229,8 +229,8 @@ class ContiguousInternalMemoryDataFacade<routing_algorithms::offline::Algorithm>
std::vector<engine::PhantomNodeWithDistance>
NearestPhantomNodes(const util::Coordinate /*input_coordinate*/,
const size_t /*max_results*/,
const boost::optional<double> /*max_distance*/,
const boost::optional<engine::Bearing> /*bearing*/,
const std::optional<double> /*max_distance*/,
const std::optional<engine::Bearing> /*bearing*/,
const engine::Approach /*approach*/) const override
{
return {};
@@ -238,8 +238,8 @@ class ContiguousInternalMemoryDataFacade<routing_algorithms::offline::Algorithm>
engine::PhantomCandidateAlternatives NearestCandidatesWithAlternativeFromBigComponent(
const util::Coordinate /*input_coordinate*/,
const boost::optional<double> /*max_distance*/,
const boost::optional<engine::Bearing> /*bearing*/,
const std::optional<double> /*max_distance*/,
const std::optional<engine::Bearing> /*bearing*/,
const engine::Approach /*approach*/,
const bool /*use_all_edges*/) const override
{