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

Moving verbosity to debug mode

Browse Source
This commit is contained in:
DennisOSRM 2012-05-03 11:59:58 +02:00
parent 200028f328
commit 0a4aa11d09
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Contractor/EdgeBasedGraphFactory.cpp
View File

@ -256,14 +256,10 @@ void EdgeBasedGraphFactory::Run(const char * originalEdgeDataFilename) {
//distance += ComputeTurnPenalty(u, v, w); //distance += ComputeTurnPenalty(u, v, w);
assert(edgeData1.edgeBasedNodeID != edgeData2.edgeBasedNodeID); assert(edgeData1.edgeBasedNodeID != edgeData2.edgeBasedNodeID);
if(edgeBasedEdges.size() == edgeBasedEdges.capacity()-3) { if(edgeBasedEdges.size() == edgeBasedEdges.capacity()-3) {
INFO("old edge capacity: " << edgeBasedEdges.capacity());
edgeBasedEdges.reserve(edgeBasedEdges.size()*1.1); edgeBasedEdges.reserve(edgeBasedEdges.size()*1.1);
INFO("new edge capacity: " << edgeBasedEdges.capacity());
} }
if(originalEdgeData.size() == originalEdgeData.capacity()-3) { if(originalEdgeData.size() == originalEdgeData.capacity()-3) {
INFO("old oed capacity: " << originalEdgeData.capacity());
originalEdgeData.reserve(originalEdgeData.size()*1.1); originalEdgeData.reserve(originalEdgeData.size()*1.1);
INFO("new oed capacity: " << originalEdgeData.capacity());
} }
OriginalEdgeData oed(v,edgeData2.nameID, turnInstruction); OriginalEdgeData oed(v,edgeData2.nameID, turnInstruction);
EdgeBasedEdge newEdge(edgeData1.edgeBasedNodeID, edgeData2.edgeBasedNodeID, edgeBasedEdges.size(), distance, true, false ); EdgeBasedEdge newEdge(edgeData1.edgeBasedNodeID, edgeData2.edgeBasedNodeID, edgeBasedEdges.size(), distance, true, false );

4
DataStructures/DynamicGraph.h
View File

@ -58,9 +58,7 @@ class DynamicGraph {
m_numNodes = nodes; m_numNodes = nodes;
m_numEdges = ( EdgeIterator ) graph.size(); m_numEdges = ( EdgeIterator ) graph.size();
m_nodes.reserve( m_numNodes ); m_nodes.reserve( m_numNodes );
INFO("reserved nodes");
m_nodes.resize( m_numNodes ); m_nodes.resize( m_numNodes );
INFO("resized nodes");
EdgeIterator edge = 0; EdgeIterator edge = 0;
EdgeIterator position = 0; EdgeIterator position = 0;
for ( NodeIterator node = 0; node < m_numNodes; ++node ) { for ( NodeIterator node = 0; node < m_numNodes; ++node ) {
@ -73,9 +71,7 @@ class DynamicGraph {
position += m_nodes[node].edges; position += m_nodes[node].edges;
} }
m_edges.reserve( position * 1.1 ); m_edges.reserve( position * 1.1 );
INFO("reserced edges");
m_edges.resize( position ); m_edges.resize( position );
INFO("resized edges");
edge = 0; edge = 0;
for ( NodeIterator node = 0; node < m_numNodes; ++node ) { 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 ) { for ( EdgeIterator i = m_nodes[node].firstEdge, e = m_nodes[node].firstEdge + m_nodes[node].edges; i != e; ++i ) {

8
DataStructures/NodeInformationHelpDesk.h
View File

@ -46,7 +46,7 @@ public:
delete readOnlyGrid; delete readOnlyGrid;
} }
void initNNGrid(std::ifstream& nodesInstream, std::ifstream& edgesInStream) { void initNNGrid(std::ifstream& nodesInstream, std::ifstream& edgesInStream) {
INFO("Loading node data"); DEBUG("Loading node data");
NodeInfo b; NodeInfo b;
while(!nodesInstream.eof()) { while(!nodesInstream.eof()) {
nodesInstream.read((char *)&b, sizeof(NodeInfo)); nodesInstream.read((char *)&b, sizeof(NodeInfo));
@ -56,14 +56,14 @@ public:
numberOfNodes = coordinateVector.size(); numberOfNodes = coordinateVector.size();
nodesInstream.close(); nodesInstream.close();
INFO("Loading edge data"); DEBUG("Loading edge data");
unsigned numberOfOrigEdges(0); unsigned numberOfOrigEdges(0);
edgesInStream.read((char*)&numberOfOrigEdges, sizeof(unsigned)); edgesInStream.read((char*)&numberOfOrigEdges, sizeof(unsigned));
origEdgeData.resize(numberOfOrigEdges); origEdgeData.resize(numberOfOrigEdges);
edgesInStream.read((char*)&(origEdgeData[0]), numberOfOrigEdges*sizeof(OriginalEdgeData)); edgesInStream.read((char*)&(origEdgeData[0]), numberOfOrigEdges*sizeof(OriginalEdgeData));
edgesInStream.close(); edgesInStream.close();
INFO("Loaded " << numberOfOrigEdges << " orig edges"); DEBUG("Loaded " << numberOfOrigEdges << " orig edges");
INFO("Opening NN indices"); DEBUG("Opening NN indices");
readOnlyGrid->OpenIndexFiles(); readOnlyGrid->OpenIndexFiles();
} }