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
{
unit_tests/library/table.cpp
+2 -2
View File
@@ -271,8 +271,8 @@ void test_table_no_segment_for_some_coordinates(bool use_json_only_api)
params.coordinates.push_back(get_dummy_location());
params.coordinates.push_back(get_dummy_location());
// resembles query option: `&radiuses=0;`
params.radiuses.push_back(boost::make_optional(0.));
params.radiuses.push_back(boost::none);
params.radiuses.push_back(std::make_optional(0.));
params.radiuses.push_back(std::nullopt);
json::Object json_result;
const auto rc = run_table_json(osrm, params, json_result, use_json_only_api);
unit_tests/mocks/mock_datafacade.hpp
+5 -5
View File
@@ -107,7 +107,7 @@ class MockBaseDataFacade : public engine::datafacade::BaseDataFacade
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
{
@@ -117,8 +117,8 @@ class MockBaseDataFacade : public engine::datafacade::BaseDataFacade
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 {};
@@ -126,8 +126,8 @@ class MockBaseDataFacade : public engine::datafacade::BaseDataFacade
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
{
unit_tests/server/parameters_parser.cpp
+29 -23
View File
@@ -32,6 +32,11 @@
(R2)[i]->segment_hints.end()); \
} \
}
// TODO: we should be able to somehow make Boost.Test to print std::optional types
BOOST_TEST_DONT_PRINT_LOG_VALUE(std::optional<double>)
BOOST_TEST_DONT_PRINT_LOG_VALUE(std::optional<osrm::engine::Approach>)
BOOST_TEST_DONT_PRINT_LOG_VALUE(std::optional<osrm::engine::Bearing>)
BOOST_TEST_DONT_PRINT_LOG_VALUE(std::optional<bool>)
BOOST_AUTO_TEST_SUITE(api_parameters_parser)
@@ -216,7 +221,7 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
phantom_1.input_location = coords_1[0];
engine::PhantomNode phantom_2;
phantom_2.input_location = coords_1[1];
std::vector<boost::optional<engine::Hint>> hints_4 = {
std::vector<std::optional<engine::Hint>> hints_4 = {
engine::Hint{{engine::SegmentHint{phantom_1, 0x1337}}},
engine::Hint{{engine::SegmentHint{phantom_2, 0x1337}}}};
RouteParameters reference_4{false,
@@ -224,11 +229,11 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
false,
RouteParameters::GeometriesType::Polyline,
RouteParameters::OverviewType::Simplified,
boost::optional<bool>{},
std::optional<bool>{},
coords_1,
hints_4,
std::vector<boost::optional<double>>{},
std::vector<boost::optional<engine::Bearing>>{}};
std::vector<std::optional<double>>{},
std::vector<std::optional<engine::Bearing>>{}};
auto result_4 = parseParameters<RouteParameters>(
"1,2;3,4?steps=false&hints=" + hints_4[0]->ToBase64() + ";" + hints_4[1]->ToBase64());
BOOST_CHECK(result_4);
@@ -244,8 +249,8 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
CHECK_EQUAL_RANGE(reference_4.coordinates, result_4->coordinates);
CHECK_EQUAL_RANGE_OF_HINTS(reference_4.hints, result_4->hints);
std::vector<boost::optional<engine::Bearing>> bearings_4 = {
boost::none,
std::vector<std::optional<engine::Bearing>> bearings_4 = {
std::nullopt,
engine::Bearing{200, 10},
engine::Bearing{100, 5},
};
@@ -254,10 +259,10 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
false,
RouteParameters::GeometriesType::Polyline,
RouteParameters::OverviewType::Simplified,
boost::optional<bool>{},
std::optional<bool>{},
coords_1,
std::vector<boost::optional<engine::Hint>>{},
std::vector<boost::optional<double>>{},
std::vector<std::optional<engine::Hint>>{},
std::vector<std::optional<double>>{},
bearings_4};
auto result_5 = parseParameters<RouteParameters>("1,2;3,4?steps=false&bearings=;200,10;100,5");
BOOST_CHECK(result_5);
@@ -296,8 +301,8 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
auto result_7 = parseParameters<RouteParameters>("1,2;3,4?radiuses=;unlimited");
RouteParameters reference_7{};
reference_7.coordinates = coords_1;
reference_7.radiuses = {boost::none,
boost::make_optional(std::numeric_limits<double>::infinity())};
reference_7.radiuses = {std::nullopt,
std::make_optional(std::numeric_limits<double>::infinity())};
BOOST_CHECK(result_7);
BOOST_CHECK_EQUAL(reference_7.steps, result_7->steps);
BOOST_CHECK_EQUAL(reference_7.alternatives, result_7->alternatives);
@@ -314,14 +319,14 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
auto result_8 = parseParameters<RouteParameters>("1,2;3,4?radiuses=;");
RouteParameters reference_8{};
reference_8.coordinates = coords_1;
reference_8.radiuses = {boost::none, boost::none};
reference_8.radiuses = {std::nullopt, std::nullopt};
BOOST_CHECK(result_8);
CHECK_EQUAL_RANGE(reference_8.radiuses, result_8->radiuses);
auto result_9 = parseParameters<RouteParameters>("1,2?radiuses=");
RouteParameters reference_9{};
reference_9.coordinates = coords_1;
reference_9.radiuses = {boost::none};
reference_9.radiuses = {std::nullopt};
BOOST_CHECK(result_9);
CHECK_EQUAL_RANGE(reference_9.radiuses, result_9->radiuses);
@@ -335,7 +340,7 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
phantom_3.input_location = coords_3[0];
engine::PhantomNode phantom_4;
phantom_4.input_location = coords_3[2];
std::vector<boost::optional<engine::Hint>> hints_10 = {
std::vector<std::optional<engine::Hint>> hints_10 = {
engine::Hint{{engine::SegmentHint{phantom_3, 0x1337}}},
{},
engine::Hint{{engine::SegmentHint{phantom_4, 0x1337}}},
@@ -346,11 +351,11 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
false,
RouteParameters::GeometriesType::Polyline,
RouteParameters::OverviewType::Simplified,
boost::optional<bool>{},
std::optional<bool>{},
coords_3,
hints_10,
std::vector<boost::optional<double>>{},
std::vector<boost::optional<engine::Bearing>>{}};
std::vector<std::optional<double>>{},
std::vector<std::optional<engine::Bearing>>{}};
auto result_10 = parseParameters<RouteParameters>(
"1,2;3,4;5,6;7,8?steps=false&hints=" + hints_10[0]->ToBase64() + ";;" +
hints_10[2]->ToBase64() + ";");
@@ -447,8 +452,8 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
BOOST_CHECK_EQUAL(result_2->annotations_type == RouteParameters::AnnotationsType::All, true);
BOOST_CHECK_EQUAL(result_17->annotations, true);
std::vector<boost::optional<engine::Approach>> approaches_18 = {
boost::none,
std::vector<std::optional<engine::Approach>> approaches_18 = {
std::nullopt,
engine::Approach::CURB,
engine::Approach::UNRESTRICTED,
engine::Approach::OPPOSITE,
@@ -458,11 +463,11 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
false,
RouteParameters::GeometriesType::Polyline,
RouteParameters::OverviewType::Simplified,
boost::optional<bool>{},
std::optional<bool>{},
coords_3,
std::vector<boost::optional<engine::Hint>>{},
std::vector<boost::optional<double>>{},
std::vector<boost::optional<engine::Bearing>>{},
std::vector<std::optional<engine::Hint>>{},
std::vector<std::optional<double>>{},
std::vector<std::optional<engine::Bearing>>{},
approaches_18};
auto result_18 = parseParameters<RouteParameters>(
@@ -778,6 +783,7 @@ BOOST_AUTO_TEST_CASE(valid_trip_urls)
reference_1.coordinates = coords_1;
auto result_1 = parseParameters<TripParameters>("1,2;3,4");
BOOST_CHECK(result_1);
CHECK_EQUAL_RANGE(reference_1.radiuses, result_1->radiuses);
CHECK_EQUAL_RANGE(reference_1.coordinates, result_1->coordinates);
unit_tests/util/static_rtree.cpp
+11 -11
View File
@@ -332,13 +332,13 @@ BOOST_AUTO_TEST_CASE(radius_regression_test)
{
auto results = query.NearestPhantomNodes(
input, osrm::engine::Approach::UNRESTRICTED, 0.01, boost::none, true);
input, osrm::engine::Approach::UNRESTRICTED, 0.01, std::nullopt, true);
BOOST_CHECK_EQUAL(results.size(), 0);
}
{
auto results = query.NearestPhantomNodes(
input, osrm::engine::Approach::UNRESTRICTED, 1, 0.01, boost::none, true);
input, osrm::engine::Approach::UNRESTRICTED, 1, 0.01, std::nullopt, true);
BOOST_CHECK_EQUAL(results.size(), 0);
}
}
@@ -364,25 +364,25 @@ BOOST_AUTO_TEST_CASE(permissive_edge_snapping)
{
auto results = query.NearestPhantomNodes(
input, osrm::engine::Approach::UNRESTRICTED, 1000, boost::none, false);
input, osrm::engine::Approach::UNRESTRICTED, 1000, std::nullopt, false);
BOOST_CHECK_EQUAL(results.size(), 1);
}
{
auto results = query.NearestPhantomNodes(
input, osrm::engine::Approach::UNRESTRICTED, 1000, boost::none, true);
input, osrm::engine::Approach::UNRESTRICTED, 1000, std::nullopt, true);
BOOST_CHECK_EQUAL(results.size(), 2);
}
{
auto results = query.NearestPhantomNodes(
input, osrm::engine::Approach::UNRESTRICTED, 10, 1000, boost::none, false);
input, osrm::engine::Approach::UNRESTRICTED, 10, 1000, std::nullopt, false);
BOOST_CHECK_EQUAL(results.size(), 1);
}
{
auto results = query.NearestPhantomNodes(
input, osrm::engine::Approach::UNRESTRICTED, 10, 1000, boost::none, true);
input, osrm::engine::Approach::UNRESTRICTED, 10, 1000, std::nullopt, true);
BOOST_CHECK_EQUAL(results.size(), 2);
}
}
@@ -408,7 +408,7 @@ BOOST_AUTO_TEST_CASE(bearing_tests)
{
auto results = query.NearestPhantomNodes(
input, osrm::engine::Approach::UNRESTRICTED, 5, boost::none, boost::none, false);
input, osrm::engine::Approach::UNRESTRICTED, 5, std::nullopt, std::nullopt, false);
BOOST_CHECK_EQUAL(results.size(), 2);
BOOST_CHECK_EQUAL(results.back().phantom_node.forward_segment_id.id, 0);
BOOST_CHECK_EQUAL(results.back().phantom_node.reverse_segment_id.id, 1);
@@ -418,7 +418,7 @@ BOOST_AUTO_TEST_CASE(bearing_tests)
auto results = query.NearestPhantomNodes(input,
osrm::engine::Approach::UNRESTRICTED,
5,
boost::none,
std::nullopt,
engine::Bearing{270, 10},
false);
BOOST_CHECK_EQUAL(results.size(), 0);
@@ -428,7 +428,7 @@ BOOST_AUTO_TEST_CASE(bearing_tests)
auto results = query.NearestPhantomNodes(input,
osrm::engine::Approach::UNRESTRICTED,
5,
boost::none,
std::nullopt,
engine::Bearing{45, 10},
false);
BOOST_CHECK_EQUAL(results.size(), 2);
@@ -444,13 +444,13 @@ BOOST_AUTO_TEST_CASE(bearing_tests)
{
auto results = query.NearestPhantomNodes(
input, osrm::engine::Approach::UNRESTRICTED, 11000, boost::none, true);
input, osrm::engine::Approach::UNRESTRICTED, 11000, std::nullopt, true);
BOOST_CHECK_EQUAL(results.size(), 2);
}
{
auto results = query.NearestPhantomNodes(
input, osrm::engine::Approach::UNRESTRICTED, 10, 11000, boost::none, true);
input, osrm::engine::Approach::UNRESTRICTED, 10, 11000, std::nullopt, true);
BOOST_CHECK_EQUAL(results.size(), 2);
}