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

Using boost spirit conversions

Browse Source
This commit is contained in:
DennisOSRM 2012-11-22 17:22:40 +01:00
parent 3c6121d192
commit 6003ae7406
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
createHierarchy.cpp
View File

@ -54,6 +54,7 @@ extern "C" {
#include "Util/BaseConfiguration.h" #include "Util/BaseConfiguration.h"
#include "Util/InputFileUtil.h" #include "Util/InputFileUtil.h"
#include "Util/GraphLoader.h" #include "Util/GraphLoader.h"
#include "Util/StringUtil.h"
using namespace std; using namespace std;
@ -74,16 +75,12 @@ int main (int argc, char *argv[]) {
double startupTime = get_timestamp(); double startupTime = get_timestamp();
unsigned numberOfThreads = omp_get_num_procs(); unsigned numberOfThreads = omp_get_num_procs();
// std::string SRTM_ROOT;
if(testDataFile("contractor.ini")) { if(testDataFile("contractor.ini")) {
ContractorConfiguration contractorConfig("contractor.ini"); ContractorConfiguration contractorConfig("contractor.ini");
if(atoi(contractorConfig.GetParameter("Threads").c_str()) != 0 && (unsigned)atoi(contractorConfig.GetParameter("Threads").c_str()) <= numberOfThreads) unsigned rawNumber = stringToInt(contractorConfig.GetParameter("Threads"));
numberOfThreads = (unsigned)atoi( contractorConfig.GetParameter("Threads").c_str() ); if(rawNumber != 0 && rawNumber <= numberOfThreads)
// if(0 < contractorConfig.GetParameter("SRTM").size() ) numberOfThreads = rawNumber;
// SRTM_ROOT = contractorConfig.GetParameter("SRTM");
} }
// if(0 != SRTM_ROOT.size())
// INFO("Loading SRTM from/to " << SRTM_ROOT);
omp_set_num_threads(numberOfThreads); omp_set_num_threads(numberOfThreads);
INFO("Using restrictions from file: " << argv[2]); INFO("Using restrictions from file: " << argv[2]);