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

Remove warnings and fix tests

Browse Source
This commit is contained in:
Patrick Niklaus 2015-12-09 23:01:28 +01:00
parent b41af5f580
commit 4950e044ba
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/data_structures/internal_datafacade.hpp
View File

@ -393,7 +393,7 @@ template <class EdgeDataT> class InternalDataFacade final : public BaseDataFacad
std::pair<PhantomNode, PhantomNode> std::pair<PhantomNode, PhantomNode>
NearestPhantomNodeWithAlternativeFromBigComponent(const FixedPointCoordinate &input_coordinate, NearestPhantomNodeWithAlternativeFromBigComponent(const FixedPointCoordinate &input_coordinate,
const int bearing = 0, const int bearing = 0,
const int bearing_range = 180) const int bearing_range = 180) override final
{ {
if (!m_static_rtree.get()) if (!m_static_rtree.get())
{ {

2
server/data_structures/shared_datafacade.hpp
View File

@ -417,7 +417,7 @@ template <class EdgeDataT> class SharedDataFacade final : public BaseDataFacade<
std::pair<PhantomNode, PhantomNode> std::pair<PhantomNode, PhantomNode>
NearestPhantomNodeWithAlternativeFromBigComponent(const FixedPointCoordinate &input_coordinate, NearestPhantomNodeWithAlternativeFromBigComponent(const FixedPointCoordinate &input_coordinate,
const int bearing = 0, const int bearing = 0,
const int bearing_range = 180) const int bearing_range = 180) override final
{ {
if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first) if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
{ {

20
unit_tests/data_structures/static_rtree.cpp
View File

@ -439,8 +439,8 @@ BOOST_AUTO_TEST_CASE(bearing_tests)
{ {
auto results = query.NearestPhantomNodes(input, 5); auto results = query.NearestPhantomNodes(input, 5);
BOOST_CHECK_EQUAL(results.size(), 2); BOOST_CHECK_EQUAL(results.size(), 2);
BOOST_CHECK_EQUAL(results.back().second.forward_node_id, 0); BOOST_CHECK_EQUAL(results.back().phantom_node.forward_node_id, 0);
BOOST_CHECK_EQUAL(results.back().second.reverse_node_id, 1); BOOST_CHECK_EQUAL(results.back().phantom_node.reverse_node_id, 1);
} }
{ {
@ -451,10 +451,10 @@ BOOST_AUTO_TEST_CASE(bearing_tests)
{ {
auto results = query.NearestPhantomNodes(input, 5, 45, 10); auto results = query.NearestPhantomNodes(input, 5, 45, 10);
BOOST_CHECK_EQUAL(results.size(), 2); BOOST_CHECK_EQUAL(results.size(), 2);
BOOST_CHECK_EQUAL(results[0].second.forward_node_id, 1); BOOST_CHECK_EQUAL(results[0].phantom_node.forward_node_id, 1);
BOOST_CHECK_EQUAL(results[0].second.reverse_node_id, SPECIAL_NODEID); BOOST_CHECK_EQUAL(results[0].phantom_node.reverse_node_id, SPECIAL_NODEID);
BOOST_CHECK_EQUAL(results[1].second.forward_node_id, SPECIAL_NODEID); BOOST_CHECK_EQUAL(results[1].phantom_node.forward_node_id, SPECIAL_NODEID);
BOOST_CHECK_EQUAL(results[1].second.reverse_node_id, 1); BOOST_CHECK_EQUAL(results[1].phantom_node.reverse_node_id, 1);
} }
{ {
@ -470,10 +470,10 @@ BOOST_AUTO_TEST_CASE(bearing_tests)
{ {
auto results = query.NearestPhantomNodesInRange(input, 11000, 45, 10); auto results = query.NearestPhantomNodesInRange(input, 11000, 45, 10);
BOOST_CHECK_EQUAL(results.size(), 2); BOOST_CHECK_EQUAL(results.size(), 2);
BOOST_CHECK_EQUAL(results[0].second.forward_node_id, 1); BOOST_CHECK_EQUAL(results[0].phantom_node.forward_node_id, 1);
BOOST_CHECK_EQUAL(results[0].second.reverse_node_id, SPECIAL_NODEID); BOOST_CHECK_EQUAL(results[0].phantom_node.reverse_node_id, SPECIAL_NODEID);
BOOST_CHECK_EQUAL(results[1].second.forward_node_id, SPECIAL_NODEID); BOOST_CHECK_EQUAL(results[1].phantom_node.forward_node_id, SPECIAL_NODEID);
BOOST_CHECK_EQUAL(results[1].second.reverse_node_id, 1); BOOST_CHECK_EQUAL(results[1].phantom_node.reverse_node_id, 1);
} }
} }