From 96a5e594b3e22cdbb370020c62bbc79ce6c81717 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Mon, 8 Feb 2016 12:18:16 -0800 Subject: [PATCH] Removes profiles from osrm-prepare, only needed in osrm-extract. Fixes #1950. --- include/contractor/contractor_config.hpp | 1 - src/tools/contract.cpp | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/include/contractor/contractor_config.hpp b/include/contractor/contractor_config.hpp index 595dfecd9..846a99e55 100644 --- a/include/contractor/contractor_config.hpp +++ b/include/contractor/contractor_config.hpp @@ -28,7 +28,6 @@ struct ContractorConfig boost::filesystem::path config_file_path; boost::filesystem::path osrm_input_path; - boost::filesystem::path profile_path; std::string level_output_path; std::string core_output_path; diff --git a/src/tools/contract.cpp b/src/tools/contract.cpp index 685f36213..41add3c04 100644 --- a/src/tools/contract.cpp +++ b/src/tools/contract.cpp @@ -32,10 +32,6 @@ return_code parseArguments(int argc, char *argv[], contractor::ContractorConfig // declare a group of options that will be allowed on command line boost::program_options::options_description config_options("Configuration"); config_options.add_options()( - "profile,p", - boost::program_options::value(&contractor_config.profile_path) - ->default_value("profile.lua"), - "Path to LUA routing profile")( "threads,t", boost::program_options::value(&contractor_config.requested_num_threads) ->default_value(tbb::task_scheduler_init::default_num_threads()), @@ -147,17 +143,8 @@ int main(int argc, char *argv[]) try return EXIT_FAILURE; } - if (!boost::filesystem::is_regular_file(contractor_config.profile_path)) - { - util::SimpleLogger().Write(logWARNING) - << "Profile " << contractor_config.profile_path.string() << " not found!"; - return EXIT_FAILURE; - } - util::SimpleLogger().Write() << "Input file: " << contractor_config.osrm_input_path.filename().string(); - util::SimpleLogger().Write() << "Profile: " - << contractor_config.profile_path.filename().string(); util::SimpleLogger().Write() << "Threads: " << contractor_config.requested_num_threads; tbb::task_scheduler_init init(contractor_config.requested_num_threads);