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

Fixes issue #504

Browse Source
This commit is contained in:
DennisOSRM 2012-11-19 11:52:34 +01:00
parent f9d336ff88
commit c4be1d1423
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Extractor/ExtractionContainers.cpp
View File

@ -25,16 +25,6 @@ void ExtractionContainers::PrepareData(const std::string & outputFileName, const
unsigned usedNodeCounter = 0; unsigned usedNodeCounter = 0;
unsigned usedEdgeCounter = 0; unsigned usedEdgeCounter = 0;
double time = get_timestamp(); double time = get_timestamp();
// INFO("raw no. of names: " << nameVector.size());
// INFO("raw no. of nodes: " << allNodes.size());
// INFO("no. of used nodes: " << usedNodeIDs.size());
// INFO("raw no. of edges: " << allEdges.size());
// INFO("raw no. of ways: " << wayStartEndVector.size());
// INFO("raw no. of addresses: " << adressVector.size());
// INFO("raw no. of restrictions: " << restrictionsVector.size());
cout << "[extractor] parsing finished after " << get_timestamp() - time << " seconds" << endl;
time = get_timestamp();
boost::uint64_t memory_to_use = static_cast<boost::uint64_t>(amountOfRAM) * 1024 * 1024 * 1024; boost::uint64_t memory_to_use = static_cast<boost::uint64_t>(amountOfRAM) * 1024 * 1024 * 1024;
cout << "[extractor] Sorting used nodes ... " << flush; cout << "[extractor] Sorting used nodes ... " << flush;

6
extractor.cpp
View File

@ -170,15 +170,17 @@ int main (int argc, char *argv[]) {
parser->RegisterLUAState(myLuaState); parser->RegisterLUAState(myLuaState);
if(!parser->Init()) if(!parser->Init())
INFO("Parser not initialized!"); ERR("Parser not initialized!");
double time = get_timestamp();
parser->Parse(); parser->Parse();
INFO("parsing finished after " << get_timestamp() - time << " seconds");
externalMemory.PrepareData(outputFileName, restrictionsFileName, amountOfRAM); externalMemory.PrepareData(outputFileName, restrictionsFileName, amountOfRAM);
stringMap.clear(); stringMap.clear();
delete parser; delete parser;
delete extractCallBacks; delete extractCallBacks;
INFO("[extractor] finished."); INFO("finished");
std::cout << "\nRun:\n" std::cout << "\nRun:\n"
"./osrm-prepare " << outputFileName << " " << restrictionsFileName << std::endl; "./osrm-prepare " << outputFileName << " " << restrictionsFileName << std::endl;
return 0; return 0;