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

Saving 3 bytes per original edge.

Browse Source
This commit is contained in:
DennisOSRM 2013-01-06 19:38:03 +01:00
parent fd79e81fe5
commit 2af9fcad68
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
DataStructures/NodeInformationHelpDesk.h
View File

@ -25,13 +25,15 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <boost/noncopyable.hpp>
#include "../typedefs.h" #include "../typedefs.h"
#include "../DataStructures/QueryEdge.h" #include "../DataStructures/QueryEdge.h"
#include "NNGrid.h" #include "NNGrid.h"
#include "PhantomNodes.h" #include "PhantomNodes.h"
#include "NodeCoords.h" #include "NodeCoords.h"
class NodeInformationHelpDesk{ class NodeInformationHelpDesk : boost::noncopyable{
public: public:
NodeInformationHelpDesk(const char* ramIndexInput, const char* fileIndexInput, const unsigned _numberOfNodes, const unsigned crc) : numberOfNodes(_numberOfNodes), checkSum(crc) { NodeInformationHelpDesk(const char* ramIndexInput, const char* fileIndexInput, const unsigned _numberOfNodes, const unsigned crc) : numberOfNodes(_numberOfNodes), checkSum(crc) {
readOnlyGrid = new ReadOnlyGrid(ramIndexInput,fileIndexInput); readOnlyGrid = new ReadOnlyGrid(ramIndexInput,fileIndexInput);
@ -59,34 +61,43 @@ public:
DEBUG("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_viaNode.resize(numberOfOrigEdges);
edgesInStream.read((char*)&(origEdgeData[0]), numberOfOrigEdges*sizeof(OriginalEdgeData)); origEdgeData_nameID.resize(numberOfOrigEdges);
origEdgeData_turnInstruction.resize(numberOfOrigEdges);
OriginalEdgeData deserialized_originalEdgeData;
for(unsigned i = 0; i < numberOfOrigEdges; ++i) {
edgesInStream.read((char*)&(deserialized_originalEdgeData), sizeof(OriginalEdgeData));
origEdgeData_viaNode[i] = deserialized_originalEdgeData.viaNode;
origEdgeData_nameID[i] = deserialized_originalEdgeData.nameID;
origEdgeData_turnInstruction[i] = deserialized_originalEdgeData.turnInstruction;
}
edgesInStream.close(); edgesInStream.close();
DEBUG("Loaded " << numberOfOrigEdges << " orig edges"); DEBUG("Loaded " << numberOfOrigEdges << " orig edges");
DEBUG("Opening NN indices"); DEBUG("Opening NN indices");
readOnlyGrid->OpenIndexFiles(); readOnlyGrid->OpenIndexFiles();
} }
void initNNGrid() { // void initNNGrid() {
readOnlyGrid->OpenIndexFiles(); // readOnlyGrid->OpenIndexFiles();
} // }
inline int getLatitudeOfNode(const unsigned id) const { inline int getLatitudeOfNode(const unsigned id) const {
const NodeID node = origEdgeData.at(id).viaNode; const NodeID node = origEdgeData_viaNode.at(id);
return coordinateVector.at(node).lat; return coordinateVector.at(node).lat;
} }
inline int getLongitudeOfNode(const unsigned id) const { inline int getLongitudeOfNode(const unsigned id) const {
const NodeID node = origEdgeData.at(id).viaNode; const NodeID node = origEdgeData_viaNode.at(id);
return coordinateVector.at(node).lon; return coordinateVector.at(node).lon;
} }
inline unsigned getNameIndexFromEdgeID(const unsigned id) const { inline unsigned getNameIndexFromEdgeID(const unsigned id) const {
return origEdgeData.at(id).nameID; return origEdgeData_nameID.at(id);
} }
inline TurnInstruction getTurnInstructionFromEdgeID(const unsigned id) const { inline TurnInstruction getTurnInstructionFromEdgeID(const unsigned id) const {
return origEdgeData.at(id).turnInstruction; return origEdgeData_turnInstruction.at(id);
} }
inline NodeID getNumberOfNodes() const { return numberOfNodes; } inline NodeID getNumberOfNodes() const { return numberOfNodes; }
@ -114,7 +125,9 @@ public:
private: private:
std::vector<_Coordinate> coordinateVector; std::vector<_Coordinate> coordinateVector;
std::vector<OriginalEdgeData> origEdgeData; std::vector<NodeID> origEdgeData_viaNode;
std::vector<unsigned> origEdgeData_nameID;
std::vector<TurnInstruction> origEdgeData_turnInstruction;
ReadOnlyGrid * readOnlyGrid; ReadOnlyGrid * readOnlyGrid;
const unsigned numberOfNodes; const unsigned numberOfNodes;