From 0a4aa11d094c8bc66488256c2e32e1b64d4a0b1c Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Thu, 3 May 2012 11:59:58 +0200 Subject: [PATCH] Moving verbosity to debug mode --- Contractor/EdgeBasedGraphFactory.cpp | 4 ---- DataStructures/DynamicGraph.h | 4 ---- DataStructures/NodeInformationHelpDesk.h | 8 ++++---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp index 0fc0470dd..a81e87a56 100644 --- a/Contractor/EdgeBasedGraphFactory.cpp +++ b/Contractor/EdgeBasedGraphFactory.cpp @@ -256,14 +256,10 @@ void EdgeBasedGraphFactory::Run(const char * originalEdgeDataFilename) { //distance += ComputeTurnPenalty(u, v, w); assert(edgeData1.edgeBasedNodeID != edgeData2.edgeBasedNodeID); if(edgeBasedEdges.size() == edgeBasedEdges.capacity()-3) { - INFO("old edge capacity: " << edgeBasedEdges.capacity()); edgeBasedEdges.reserve(edgeBasedEdges.size()*1.1); - INFO("new edge capacity: " << edgeBasedEdges.capacity()); } if(originalEdgeData.size() == originalEdgeData.capacity()-3) { - INFO("old oed capacity: " << originalEdgeData.capacity()); originalEdgeData.reserve(originalEdgeData.size()*1.1); - INFO("new oed capacity: " << originalEdgeData.capacity()); } OriginalEdgeData oed(v,edgeData2.nameID, turnInstruction); EdgeBasedEdge newEdge(edgeData1.edgeBasedNodeID, edgeData2.edgeBasedNodeID, edgeBasedEdges.size(), distance, true, false ); diff --git a/DataStructures/DynamicGraph.h b/DataStructures/DynamicGraph.h index b188af4dd..41430a7db 100644 --- a/DataStructures/DynamicGraph.h +++ b/DataStructures/DynamicGraph.h @@ -58,9 +58,7 @@ class DynamicGraph { m_numNodes = nodes; m_numEdges = ( EdgeIterator ) graph.size(); m_nodes.reserve( m_numNodes ); - INFO("reserved nodes"); m_nodes.resize( m_numNodes ); - INFO("resized nodes"); EdgeIterator edge = 0; EdgeIterator position = 0; for ( NodeIterator node = 0; node < m_numNodes; ++node ) { @@ -73,9 +71,7 @@ class DynamicGraph { position += m_nodes[node].edges; } m_edges.reserve( position * 1.1 ); - INFO("reserced edges"); m_edges.resize( position ); - INFO("resized edges"); edge = 0; for ( NodeIterator node = 0; node < m_numNodes; ++node ) { for ( EdgeIterator i = m_nodes[node].firstEdge, e = m_nodes[node].firstEdge + m_nodes[node].edges; i != e; ++i ) { diff --git a/DataStructures/NodeInformationHelpDesk.h b/DataStructures/NodeInformationHelpDesk.h index bd01441da..f01e6f3c0 100644 --- a/DataStructures/NodeInformationHelpDesk.h +++ b/DataStructures/NodeInformationHelpDesk.h @@ -46,7 +46,7 @@ public: delete readOnlyGrid; } void initNNGrid(std::ifstream& nodesInstream, std::ifstream& edgesInStream) { - INFO("Loading node data"); + DEBUG("Loading node data"); NodeInfo b; while(!nodesInstream.eof()) { nodesInstream.read((char *)&b, sizeof(NodeInfo)); @@ -56,14 +56,14 @@ public: numberOfNodes = coordinateVector.size(); nodesInstream.close(); - INFO("Loading edge data"); + DEBUG("Loading edge data"); unsigned numberOfOrigEdges(0); edgesInStream.read((char*)&numberOfOrigEdges, sizeof(unsigned)); origEdgeData.resize(numberOfOrigEdges); edgesInStream.read((char*)&(origEdgeData[0]), numberOfOrigEdges*sizeof(OriginalEdgeData)); edgesInStream.close(); - INFO("Loaded " << numberOfOrigEdges << " orig edges"); - INFO("Opening NN indices"); + DEBUG("Loaded " << numberOfOrigEdges << " orig edges"); + DEBUG("Opening NN indices"); readOnlyGrid->OpenIndexFiles(); }