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

itroduce ADL via algorithm specific ch, corech and mld namespaces

Browse Source
This commit is contained in:
Michael Krasnyk
2017-03-31 12:52:04 +02:00
parent 2566f64c34
commit 8c64b01d67
23 changed files with 501 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_tests/engine/base64.cpp
+2 -2
View File
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(hint_encoding_decoding_roundtrip)
const Coordinate coordinate;
const PhantomNode phantom;
const osrm::test::MockDataFacade<osrm::engine::algorithm::CH> facade{};
const osrm::test::MockDataFacade<osrm::engine::datafacade::CH> facade{};
const Hint hint{phantom, facade.GetCheckSum()};
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(hint_encoding_decoding_roundtrip_bytewise)
const Coordinate coordinate;
const PhantomNode phantom;
const osrm::test::MockDataFacade<osrm::engine::algorithm::CH> facade{};
const osrm::test::MockDataFacade<osrm::engine::datafacade::CH> facade{};
const Hint hint{phantom, facade.GetCheckSum()};
unit_tests/mocks/mock_datafacade.hpp
+7 -7
View File
@@ -238,8 +238,8 @@ class MockBaseDataFacade : public engine::datafacade::BaseDataFacade
template <typename AlgorithmT> class MockAlgorithmDataFacade;
template <>
class MockAlgorithmDataFacade<engine::algorithm::CH>
: public engine::datafacade::AlgorithmDataFacade<engine::algorithm::CH>
class MockAlgorithmDataFacade<engine::datafacade::CH>
: public engine::datafacade::AlgorithmDataFacade<engine::datafacade::CH>
{
private:
EdgeData foo;
@@ -281,8 +281,8 @@ class MockAlgorithmDataFacade<engine::algorithm::CH>
};
template <>
class MockAlgorithmDataFacade<engine::algorithm::CoreCH>
: public engine::datafacade::AlgorithmDataFacade<engine::algorithm::CoreCH>
class MockAlgorithmDataFacade<engine::datafacade::CoreCH>
: public engine::datafacade::AlgorithmDataFacade<engine::datafacade::CoreCH>
{
private:
EdgeData foo;
@@ -297,10 +297,10 @@ class MockDataFacade final : public MockBaseDataFacade, public MockAlgorithmData
};
template <>
class MockDataFacade<engine::algorithm::CoreCH> final
class MockDataFacade<engine::datafacade::CoreCH> final
: public MockBaseDataFacade,
public MockAlgorithmDataFacade<engine::algorithm::CH>,
public MockAlgorithmDataFacade<engine::algorithm::CoreCH>
public MockAlgorithmDataFacade<engine::datafacade::CH>,
public MockAlgorithmDataFacade<engine::datafacade::CoreCH>
{
};
unit_tests/util/static_rtree.cpp
+6 -6
View File
@@ -360,8 +360,8 @@ BOOST_AUTO_TEST_CASE(radius_regression_test)
std::string nodes_path;
build_rtree<GraphFixture, MiniStaticRTree>("test_angle", &fixture, leaves_path, nodes_path);
MiniStaticRTree rtree(nodes_path, leaves_path, fixture.coords);
MockDataFacade<engine::algorithm::CH> mockfacade;
engine::GeospatialQuery<MiniStaticRTree, MockDataFacade<engine::algorithm::CH>> query(
MockDataFacade<engine::datafacade::CH> mockfacade;
engine::GeospatialQuery<MiniStaticRTree, MockDataFacade<engine::datafacade::CH>> query(
rtree, fixture.coords, mockfacade);
Coordinate input(FloatLongitude{5.2}, FloatLatitude{5.0});
@@ -387,8 +387,8 @@ BOOST_AUTO_TEST_CASE(bearing_tests)
std::string nodes_path;
build_rtree<GraphFixture, MiniStaticRTree>("test_bearing", &fixture, leaves_path, nodes_path);
MiniStaticRTree rtree(nodes_path, leaves_path, fixture.coords);
MockDataFacade<engine::algorithm::CH> mockfacade;
engine::GeospatialQuery<MiniStaticRTree, MockDataFacade<engine::algorithm::CH>> query(
MockDataFacade<engine::datafacade::CH> mockfacade;
engine::GeospatialQuery<MiniStaticRTree, MockDataFacade<engine::datafacade::CH>> query(
rtree, fixture.coords, mockfacade);
Coordinate input(FloatLongitude{5.1}, FloatLatitude{5.0});
@@ -461,8 +461,8 @@ BOOST_AUTO_TEST_CASE(bbox_search_tests)
std::string nodes_path;
build_rtree<GraphFixture, MiniStaticRTree>("test_bbox", &fixture, leaves_path, nodes_path);
MiniStaticRTree rtree(nodes_path, leaves_path, fixture.coords);
MockDataFacade<engine::algorithm::CH> mockfacade;
engine::GeospatialQuery<MiniStaticRTree, MockDataFacade<engine::algorithm::CH>> query(
MockDataFacade<engine::datafacade::CH> mockfacade;
engine::GeospatialQuery<MiniStaticRTree, MockDataFacade<engine::datafacade::CH>> query(
rtree, fixture.coords, mockfacade);
{