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

Reordering initializations

Browse Source
This commit is contained in:
DennisOSRM 2012-06-29 15:32:22 +02:00
parent bddac87321
commit f01670db80
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Contractor/Contractor.h
View File

@ -44,7 +44,7 @@ class Contractor {
private: private:
struct _ContractorEdgeData { struct _ContractorEdgeData {
_ContractorEdgeData() : _ContractorEdgeData() :
distance(0), originalEdges(0), id(0), shortcut(0), forward(0), backward(0) {} distance(0), originalEdges(0), id(0), shortcut(0), forward(0), backward(0), originalViaNodeID(false) {}
_ContractorEdgeData( unsigned _distance, unsigned _originalEdges, unsigned _id, bool _shortcut, bool _forward, bool _backward) : _ContractorEdgeData( unsigned _distance, unsigned _originalEdges, unsigned _id, bool _shortcut, bool _forward, bool _backward) :
distance(_distance), id(_id), originalEdges(std::min((unsigned)1<<28, _originalEdges) ), shortcut(_shortcut), forward(_forward), backward(_backward), originalViaNodeID(false) {} distance(_distance), id(_id), originalEdges(std::min((unsigned)1<<28, _originalEdges) ), shortcut(_shortcut), forward(_forward), backward(_backward), originalViaNodeID(false) {}
unsigned distance; unsigned distance;
@ -267,7 +267,7 @@ public:
//Write dummy number of edges to temporary file //Write dummy number of edges to temporary file
std::ofstream temporaryEdgeStorage(temporaryEdgeStorageFilename.c_str(), std::ios::binary); std::ofstream temporaryEdgeStorage(temporaryEdgeStorageFilename.c_str(), std::ios::binary);
initialFilePosition = temporaryEdgeStorage.tellp(); long initialFilePosition = temporaryEdgeStorage.tellp();
unsigned numberOfTemporaryEdges = 0; unsigned numberOfTemporaryEdges = 0;
temporaryEdgeStorage.write((char*)&numberOfTemporaryEdges, sizeof(unsigned)); temporaryEdgeStorage.write((char*)&numberOfTemporaryEdges, sizeof(unsigned));
@ -782,7 +782,6 @@ private:
std::vector<_DynamicGraph::InputEdge> contractedEdges; std::vector<_DynamicGraph::InputEdge> contractedEdges;
std::string temporaryEdgeStorageFilename; std::string temporaryEdgeStorageFilename;
std::vector<NodeID> oldNodeIDFromNewNodeIDMap; std::vector<NodeID> oldNodeIDFromNewNodeIDMap;
long initialFilePosition;
XORFastHash fastHash; XORFastHash fastHash;
}; };