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

PR review adjustments

Browse Source
This commit is contained in:
Michael Krasnyk 2017-04-05 17:54:18 +02:00
parent 0972ec9115
commit cf17a3a4c3
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,7 +318,7 @@ inline void search(const datafacade::ContiguousInternalMemoryDataFacade<Algorith
const PhantomNodes &phantom_nodes, const PhantomNodes &phantom_nodes,
const int duration_upper_bound = INVALID_EDGE_WEIGHT) const int duration_upper_bound = INVALID_EDGE_WEIGHT)
{ {
(void)duration_upper_bound; (void)duration_upper_bound; // TODO: limiting search radius is not implemented for MLD
NodeID source_node, target_node; NodeID source_node, target_node;
std::vector<EdgeID> unpacked_edges; std::vector<EdgeID> unpacked_edges;

4
unit_tests/engine/base64.cpp
View File

@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(hint_encoding_decoding_roundtrip)
const Coordinate coordinate; const Coordinate coordinate;
const PhantomNode phantom; const PhantomNode phantom;
const osrm::test::MockDataFacade<osrm::engine::datafacade::CH> facade{}; const osrm::test::MockDataFacade<osrm::engine::routing_algorithms::ch::Algorithm> facade{};
const Hint hint{phantom, facade.GetCheckSum()}; const Hint hint{phantom, facade.GetCheckSum()};
@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(hint_encoding_decoding_roundtrip_bytewise)
const Coordinate coordinate; const Coordinate coordinate;
const PhantomNode phantom; const PhantomNode phantom;
const osrm::test::MockDataFacade<osrm::engine::datafacade::CH> facade{}; const osrm::test::MockDataFacade<osrm::engine::routing_algorithms::ch::Algorithm> facade{};
const Hint hint{phantom, facade.GetCheckSum()}; const Hint hint{phantom, facade.GetCheckSum()};

13
unit_tests/util/static_rtree.cpp
View File

@ -47,6 +47,7 @@ using TestStaticRTree = StaticRTree<TestData,
TEST_LEAF_NODE_SIZE>; TEST_LEAF_NODE_SIZE>;
using MiniStaticRTree = using MiniStaticRTree =
StaticRTree<TestData, std::vector<Coordinate>, osrm::storage::Ownership::Container, 2, 128>; StaticRTree<TestData, std::vector<Coordinate>, osrm::storage::Ownership::Container, 2, 128>;
using TestDataFacade = MockDataFacade<osrm::engine::routing_algorithms::ch::Algorithm>;
// Choosen by a fair W20 dice roll (this value is completely arbitrary) // Choosen by a fair W20 dice roll (this value is completely arbitrary)
constexpr unsigned RANDOM_SEED = 42; constexpr unsigned RANDOM_SEED = 42;
@ -360,8 +361,8 @@ BOOST_AUTO_TEST_CASE(radius_regression_test)
std::string nodes_path; std::string nodes_path;
build_rtree<GraphFixture, MiniStaticRTree>("test_angle", &fixture, leaves_path, nodes_path); build_rtree<GraphFixture, MiniStaticRTree>("test_angle", &fixture, leaves_path, nodes_path);
MiniStaticRTree rtree(nodes_path, leaves_path, fixture.coords); MiniStaticRTree rtree(nodes_path, leaves_path, fixture.coords);
MockDataFacade<engine::datafacade::CH> mockfacade; TestDataFacade mockfacade;
engine::GeospatialQuery<MiniStaticRTree, MockDataFacade<engine::datafacade::CH>> query( engine::GeospatialQuery<MiniStaticRTree, TestDataFacade> query(
rtree, fixture.coords, mockfacade); rtree, fixture.coords, mockfacade);
Coordinate input(FloatLongitude{5.2}, FloatLatitude{5.0}); Coordinate input(FloatLongitude{5.2}, FloatLatitude{5.0});
@ -387,8 +388,8 @@ BOOST_AUTO_TEST_CASE(bearing_tests)
std::string nodes_path; std::string nodes_path;
build_rtree<GraphFixture, MiniStaticRTree>("test_bearing", &fixture, leaves_path, nodes_path); build_rtree<GraphFixture, MiniStaticRTree>("test_bearing", &fixture, leaves_path, nodes_path);
MiniStaticRTree rtree(nodes_path, leaves_path, fixture.coords); MiniStaticRTree rtree(nodes_path, leaves_path, fixture.coords);
MockDataFacade<engine::datafacade::CH> mockfacade; TestDataFacade mockfacade;
engine::GeospatialQuery<MiniStaticRTree, MockDataFacade<engine::datafacade::CH>> query( engine::GeospatialQuery<MiniStaticRTree, TestDataFacade> query(
rtree, fixture.coords, mockfacade); rtree, fixture.coords, mockfacade);
Coordinate input(FloatLongitude{5.1}, FloatLatitude{5.0}); Coordinate input(FloatLongitude{5.1}, FloatLatitude{5.0});
@ -461,8 +462,8 @@ BOOST_AUTO_TEST_CASE(bbox_search_tests)
std::string nodes_path; std::string nodes_path;
build_rtree<GraphFixture, MiniStaticRTree>("test_bbox", &fixture, leaves_path, nodes_path); build_rtree<GraphFixture, MiniStaticRTree>("test_bbox", &fixture, leaves_path, nodes_path);
MiniStaticRTree rtree(nodes_path, leaves_path, fixture.coords); MiniStaticRTree rtree(nodes_path, leaves_path, fixture.coords);
MockDataFacade<engine::datafacade::CH> mockfacade; TestDataFacade mockfacade;
engine::GeospatialQuery<MiniStaticRTree, MockDataFacade<engine::datafacade::CH>> query( engine::GeospatialQuery<MiniStaticRTree, TestDataFacade> query(
rtree, fixture.coords, mockfacade); rtree, fixture.coords, mockfacade);
{ {