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

Cleaning up debug outputs

Browse Source
This commit is contained in:
DennisOSRM 2012-04-04 13:08:13 +02:00
parent 0a78a50eff
commit b9e0cb6be1
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Contractor/Contractor.h
View File

@ -192,12 +192,11 @@ public:
//Create temporary file //Create temporary file
GetTemporaryFileName(temporaryEdgeStorageFilename); GetTemporaryFileName(temporaryEdgeStorageFilename);
INFO("75% Storage at " << temporaryEdgeStorageFilename);
} }
~Contractor() { ~Contractor() {
//Delete temporary file //Delete temporary file
// remove(temporaryEdgeStorageFilename.c_str()); remove(temporaryEdgeStorageFilename.c_str());
} }
void Run() { void Run() {
@ -290,10 +289,8 @@ public:
//node is not yet contracted. //node is not yet contracted.
//add (renumbered) outgoing edges to new DynamicGraph. //add (renumbered) outgoing edges to new DynamicGraph.
data.originalViaNodeID = true; data.originalViaNodeID = true;
if(newNodeIDFromOldNodeIDMap[start] == UINT_MAX) assert(UINT_MAX != newNodeIDFromOldNodeIDMap[start] );
ERR("Could not resolve start"); assert(UINT_MAX != newNodeIDFromOldNodeIDMap[target]);
if(UINT_MAX == newNodeIDFromOldNodeIDMap[target])
ERR("Could not resolve target");
_newGraph->InsertEdge(newNodeIDFromOldNodeIDMap[start], newNodeIDFromOldNodeIDMap[target], data ); _newGraph->InsertEdge(newNodeIDFromOldNodeIDMap[start], newNodeIDFromOldNodeIDMap[target], data );
} }
} }
@ -302,7 +299,7 @@ public:
temporaryEdgeStorage.seekp(initialFilePosition); temporaryEdgeStorage.seekp(initialFilePosition);
temporaryEdgeStorage.write((char*)&numberOfTemporaryEdges, sizeof(unsigned)); temporaryEdgeStorage.write((char*)&numberOfTemporaryEdges, sizeof(unsigned));
temporaryEdgeStorage.close(); temporaryEdgeStorage.close();
INFO("Flushed " << numberOfTemporaryEdges << " edges to disk"); // INFO("Flushed " << numberOfTemporaryEdges << " edges to disk");
//Delete map from old NodeIDs to new ones. //Delete map from old NodeIDs to new ones.
std::vector<NodeID>().swap(newNodeIDFromOldNodeIDMap); std::vector<NodeID>().swap(newNodeIDFromOldNodeIDMap);
@ -435,13 +432,9 @@ public:
newEdge.source = oldNodeIDFromNewNodeIDMap[node]; newEdge.source = oldNodeIDFromNewNodeIDMap[node];
newEdge.target = oldNodeIDFromNewNodeIDMap[target]; newEdge.target = oldNodeIDFromNewNodeIDMap[target];
if(UINT_MAX == newEdge.source)
ERR("Could not resolve start");
if(UINT_MAX == newEdge.target)
ERR("Could not resolve target");
assert(UINT_MAX != newEdge.source); assert(UINT_MAX != newEdge.source);
assert(UINT_MAX != newEdge.target); assert(UINT_MAX != newEdge.target);
newEdge.data.distance = data.distance; newEdge.data.distance = data.distance;
newEdge.data.shortcut = data.shortcut; newEdge.data.shortcut = data.shortcut;
if(!data.originalViaNodeID) if(!data.originalViaNodeID)
@ -449,8 +442,7 @@ public:
else else
newEdge.data.via = data.via; newEdge.data.via = data.via;
if(newEdge.data.via == UINT_MAX) assert(newEdge.data.via != UINT_MAX);
ERR("could not resolve via node");
newEdge.data.nameID = data.nameID; newEdge.data.nameID = data.nameID;
newEdge.data.turnInstruction = data.turnInstruction; newEdge.data.turnInstruction = data.turnInstruction;
newEdge.data.forward = data.forward; newEdge.data.forward = data.forward;
@ -462,7 +454,6 @@ public:
//Also get the edges from temporary storage //Also get the edges from temporary storage
unsigned numberOfTemporaryEdges = 0; unsigned numberOfTemporaryEdges = 0;
temporaryEdgeStorage.read((char*)&numberOfTemporaryEdges, sizeof(unsigned)); temporaryEdgeStorage.read((char*)&numberOfTemporaryEdges, sizeof(unsigned));
INFO("loading " << numberOfTemporaryEdges << " back from disk");
//loads edges of graph before renumbering, no need for further numbering action. //loads edges of graph before renumbering, no need for further numbering action.
NodeID start; NodeID start;
NodeID target; NodeID target;