expose mandatory / optional / output files in io_config; config files to use new io_config constructor

This commit is contained in:
Pepijn Schoen
2017-06-05 08:34:44 +02:00
committed by Daniel J. H
parent 5a6dee80ac
commit e208485c17
8 changed files with 158 additions and 96 deletions
+5 -1
View File
@@ -44,7 +44,8 @@ struct ContractorConfig final : storage::IOConfig
{
ContractorConfig() : requested_num_threads(0) {}
ContractorConfig(const boost::filesystem::path &base) : requested_num_threads(0), IOConfig(base)
ContractorConfig(const boost::filesystem::path &base) : requested_num_threads(0),
IOConfig({".osrm", }, {}, {".osrm.level", ".osrm.core", ".osrm.hsgr", ".osrm.enw"})
{
}
@@ -56,6 +57,9 @@ struct ContractorConfig final : storage::IOConfig
updater_config.UseDefaultOutputNames();
}
// TODO override IsValid to also check updater_config validity
// TODO remove direct access to osrm_path to allow passing osrm_path to underlying configs
updater::UpdaterConfig updater_config;
bool use_cached_priority;