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

Avoid -> Exclude

Browse Source
This commit is contained in:
Patrick Niklaus
2017-08-16 20:21:19 +00:00
committed by Patrick Niklaus
parent 45140ca9f7
commit d09f5c0e3a
27 changed files with 145 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_tests/customizer/cell_customization.cpp
+2 -2
View File
@@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE(four_levels_test)
storage_rec.GetCell(metric_rec, 2, 1).GetInWeight(12));
}
BOOST_AUTO_TEST_CASE(avoid_test)
BOOST_AUTO_TEST_CASE(exclude_test)
{
// 0 --- 1 --- 5 --- 6
// | / | | |
@@ -305,7 +305,7 @@ BOOST_AUTO_TEST_CASE(avoid_test)
BOOST_REQUIRE_EQUAL(mlp.GetNumberOfLevels(), 4);
auto graph = makeGraph(mlp, edges);
// avoid node 0, 3 and 7
// exclude node 0, 3 and 7
std::vector<bool> node_filter = {false, true, true, false, true, true, true, false};
CellCustomizer customizer(mlp);
unit_tests/engine/offline_facade.cpp
+1 -1
View File
@@ -340,7 +340,7 @@ class ContiguousInternalMemoryDataFacade<routing_algorithms::offline::Algorithm>
unsigned GetWeightPrecision() const override { return 0; }
double GetWeightMultiplier() const override { return 1; }
ComponentID GetComponentID(NodeID) const override { return ComponentID{}; }
bool AvoidNode(const NodeID) const override { return false; }
bool ExcludeNode(const NodeID) const override { return false; }
util::guidance::TurnBearing PreTurnBearing(const EdgeID /*eid*/) const override
{
unit_tests/mocks/mock_datafacade.hpp
+1 -1
View File
@@ -28,7 +28,7 @@ class MockBaseDataFacade : public engine::datafacade::BaseDataFacade
using StringView = util::StringView;
public:
bool AvoidNode(const NodeID) const override { return false; };
bool ExcludeNode(const NodeID) const override { return false; };
util::Coordinate GetCoordinateOfNode(const NodeID /* id */) const override
{
unit_tests/mocks/mock_scripting_environment.hpp
+1 -1
View File
@@ -27,7 +27,7 @@ class MockScriptingEnvironment : public extractor::ScriptingEnvironment
}
std::vector<std::string> GetNameSuffixList() override final { return {}; }
std::vector<std::vector<std::string>> GetAvoidableClasses() override final { return {}; };
std::vector<std::vector<std::string>> GetExcludableClasses() override final { return {}; };
std::vector<std::string> GetClassNames() override { return {}; };
std::vector<std::string> GetRestrictions() override final { return {}; }
unit_tests/server/parameters_parser.cpp
+4 -4
View File
@@ -472,11 +472,11 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
CHECK_EQUAL_RANGE(reference_20.coordinates, result_20->coordinates);
CHECK_EQUAL_RANGE(reference_20.hints, result_20->hints);
// avoid flags
// exclude flags
RouteParameters reference_21{};
reference_21.avoid = {"ferry", "motorway"};
reference_21.exclude = {"ferry", "motorway"};
reference_21.coordinates = coords_1;
auto result_21 = parseParameters<RouteParameters>("1,2;3,4?avoid=ferry,motorway");
auto result_21 = parseParameters<RouteParameters>("1,2;3,4?exclude=ferry,motorway");
BOOST_CHECK(result_21);
BOOST_CHECK_EQUAL(reference_21.steps, result_21->steps);
BOOST_CHECK_EQUAL(reference_21.alternatives, result_21->alternatives);
@@ -490,7 +490,7 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
CHECK_EQUAL_RANGE(reference_21.approaches, result_21->approaches);
CHECK_EQUAL_RANGE(reference_21.coordinates, result_21->coordinates);
CHECK_EQUAL_RANGE(reference_21.hints, result_21->hints);
CHECK_EQUAL_RANGE(reference_21.avoid, result_21->avoid);
CHECK_EQUAL_RANGE(reference_21.exclude, result_21->exclude);
}
BOOST_AUTO_TEST_CASE(valid_table_urls)