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

more debug output added

Browse Source
This commit is contained in:
DennisOSRM 2012-04-26 09:59:39 +02:00
parent 7baef59b79
commit 3c08b89923
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Contractor/EdgeBasedGraphFactory.cpp
View File

@ -122,9 +122,10 @@ EdgeBasedGraphFactory::EdgeBasedGraphFactory(int nodes, std::vector<NodeBasedEdg
edges.push_back( edge ); edges.push_back( edge );
} }
} }
INFO("Expanded " << inputEdges.size() << " node-based edges into " << nodes << " edge-based nodes.");
std::vector<NodeBasedEdge>().swap(inputEdges); std::vector<NodeBasedEdge>().swap(inputEdges);
std::vector<_NodeBasedEdge>(edges).swap(edges);
std::sort( edges.begin(), edges.end() ); std::sort( edges.begin(), edges.end() );
INFO("edges size: " << edges.size() << ", capacity: " << edges.capacity());
_nodeBasedGraph.reset(new _NodeBasedDynamicGraph( nodes, edges )); _nodeBasedGraph.reset(new _NodeBasedDynamicGraph( nodes, edges ));
} }
@ -252,10 +253,16 @@ void EdgeBasedGraphFactory::Run() {
//distance += heightPenalty; //distance += heightPenalty;
//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) {
// edgeBasedEdges.reserve(edgeBasedEdges.size()*1.1); INFO("old edge capacity: " << edgeBasedEdges.capacity());
if(originalEdgeData.size() == originalEdgeData.capacity()-3) 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); 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 );
originalEdgeData.push_back(oed); originalEdgeData.push_back(oed);