From c4be1d1423b09e16a18540910bcd180867e85b69 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Mon, 19 Nov 2012 11:52:34 +0100 Subject: [PATCH] Fixes issue #504 --- Extractor/ExtractionContainers.cpp | 10 ---------- extractor.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Extractor/ExtractionContainers.cpp b/Extractor/ExtractionContainers.cpp index 33452e6b5..b4a2fe060 100644 --- a/Extractor/ExtractionContainers.cpp +++ b/Extractor/ExtractionContainers.cpp @@ -25,16 +25,6 @@ void ExtractionContainers::PrepareData(const std::string & outputFileName, const unsigned usedNodeCounter = 0; unsigned usedEdgeCounter = 0; 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(amountOfRAM) * 1024 * 1024 * 1024; cout << "[extractor] Sorting used nodes ... " << flush; diff --git a/extractor.cpp b/extractor.cpp index ecee22302..e041b4d5c 100644 --- a/extractor.cpp +++ b/extractor.cpp @@ -170,15 +170,17 @@ int main (int argc, char *argv[]) { parser->RegisterLUAState(myLuaState); if(!parser->Init()) - INFO("Parser not initialized!"); + ERR("Parser not initialized!"); + double time = get_timestamp(); parser->Parse(); + INFO("parsing finished after " << get_timestamp() - time << " seconds"); externalMemory.PrepareData(outputFileName, restrictionsFileName, amountOfRAM); stringMap.clear(); delete parser; delete extractCallBacks; - INFO("[extractor] finished."); + INFO("finished"); std::cout << "\nRun:\n" "./osrm-prepare " << outputFileName << " " << restrictionsFileName << std::endl; return 0;