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

deprecation notices

Browse Source
This commit is contained in:
karenzshea 2017-10-12 16:35:12 +02:00 committed by Patrick Niklaus
parent 2d1ea7a3de
commit df79b5b4cc
8 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/contractor/contractor_config.hpp
View File

@ -65,7 +65,7 @@ struct ContractorConfig final : storage::IOConfig
unsigned requested_num_threads;
// Deprecated
// DEPRECATED to be removed in v6.0
// A percentage of vertices that will be contracted for the hierarchy.
// Offers a trade-off between preprocessing and query time.
// The remaining vertices form the core of the hierarchy

2
include/nodejs/node_osrm_support.hpp
View File

@ -158,7 +158,7 @@ inline engine_config_ptr argumentsToEngineConfig(const Nan::FunctionCallbackInfo
}
else if (*v8::String::Utf8Value(algorithm_str) == std::string("CoreCH"))
{
engine_config->algorithm = osrm::EngineConfig::Algorithm::CoreCH;
engine_config->algorithm = osrm::EngineConfig::Algorithm::CH;
}
else if (*v8::String::Utf8Value(algorithm_str) == std::string("MLD"))
{

1
scripts/gdb_printers.py
View File

@ -144,7 +144,6 @@ class SVGPrinter (gdb.Command):
self.re_bbox = None
self.to_svg = {
'const osrm::engine::datafacade::ContiguousInternalMemoryDataFacade<osrm::engine::routing_algorithms::ch::Algorithm> &': self.Facade,
'const osrm::engine::datafacade::ContiguousInternalMemoryDataFacade<osrm::engine::routing_algorithms::corech::Algorithm> &': self.Facade,
'const osrm::engine::datafacade::ContiguousInternalMemoryDataFacade<osrm::engine::routing_algorithms::mld::Algorithm> &': self.Facade,
'osrm::engine::routing_algorithms::Facade': self.Facade,
'osrm::engine::DataFacade': self.Facade}

3
src/contractor/contractor.cpp
View File

@ -44,7 +44,8 @@ int Contractor::Run()
{
if (config.core_factor)
{
util::Log(logWARNING) << "Using core factor is deprecated and will be ignored. Falling back to CH.";
util::Log(logWARNING)
<< "Using core factor is deprecated and will be ignored. Falling back to CH.";
config.core_factor = 1.0;
}

2
src/tools/contract.cpp
View File

@ -49,7 +49,7 @@ return_code parseArguments(int argc,
"Number of threads to use")(
"core,k",
boost::program_options::value<double>(&contractor_config.core_factor)->default_value(1.0),
"Percentage of the graph (in vertices) to contract [0..1]. Will always be 1.0")(
"DEPRECATED: Will always be 1.0. Percentage of the graph (in vertices) to contract [0..1].")(
"segment-speed-file",
boost::program_options::value<std::vector<std::string>>(
&contractor_config.updater_config.segment_speed_lookup_paths)

4
src/tools/routed.cpp
View File

@ -62,10 +62,8 @@ std::istream &operator>>(std::istream &in, EngineConfig::Algorithm &algorithm)
in >> token;
boost::to_lower(token);
if (token == "ch")
if (token == "ch" || token == "corech")
algorithm = EngineConfig::Algorithm::CH;
else if (token == "corech")
algorithm = EngineConfig::Algorithm::CoreCH;
else if (token == "mld")
algorithm = EngineConfig::Algorithm::MLD;
else

6
test/nodejs/index.js
View File

@ -93,9 +93,9 @@ test('constructor: autoswitches to CoreCH for a CH dataset if capable', function
test('constructor: throws if data doesn\'t match algorithm', function(assert) {
assert.plan(3);
assert.throws(function() { new OSRM({algorithm: 'CoreCH', path: monaco_mld_path}); });
assert.throws(function() { new OSRM({algorithm: 'CoreCH', path: monaco_path}); });
assert.throws(function() { new OSRM({algorithm: 'MLD', path: monaco_path}); });
assert.throws(function() { new OSRM({algorithm: 'CoreCH', path: monaco_mld_path}); }, 'CoreCH with MLD data');
assert.ok(function() { new OSRM({algorithm: 'CoreCH', path: monaco_path}); }, 'CoreCH with CH data');
assert.throws(function() { new OSRM({algorithm: 'MLD', path: monaco_path}); }, 'MLD with CH data');
});
test('constructor: parses custom limits', function(assert) {

18
unit_tests/library/tile.cpp
View File

@ -724,15 +724,6 @@ BOOST_AUTO_TEST_CASE(test_tile_speeds_ch)
test_tile_speeds(osrm);
}
BOOST_AUTO_TEST_CASE(test_tile_speeds_corech)
{
using namespace osrm;
auto osrm =
getOSRM(OSRM_TEST_DATA_DIR "/corech/monaco.osrm", osrm::EngineConfig::Algorithm::CoreCH);
test_tile_speeds(osrm);
}
BOOST_AUTO_TEST_CASE(test_tile_speeds_mld)
{
using namespace osrm;
@ -829,15 +820,6 @@ BOOST_AUTO_TEST_CASE(test_tile_nodes_ch)
test_tile_nodes(osrm);
}
BOOST_AUTO_TEST_CASE(test_tile_nodes_corech)
{
using namespace osrm;
auto osrm =
getOSRM(OSRM_TEST_DATA_DIR "/corech/monaco.osrm", osrm::EngineConfig::Algorithm::CoreCH);
test_tile_nodes(osrm);
}
BOOST_AUTO_TEST_CASE(test_tile_nodes_mld)
{
using namespace osrm;