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

**BREAKING CHANGE ** Removing unnecessary information at edge objects. saves roughly 10% of space. **BREAKING CHANGE ** Please redo all preprocessing.

Browse Source
This commit is contained in:
Dennis Luxen 2011-05-18 11:38:09 +00:00
parent 0d3e8914ae
commit 3bfb274d24
4 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Contractor/ContractionCleanup.h
View File

@ -75,9 +75,7 @@ public:
bool shortcut : 1; bool shortcut : 1;
bool forward : 1; bool forward : 1;
bool backward : 1; bool backward : 1;
short type:6; short type;
bool forwardTurn:1;
bool backwardTurn:1;
_MiddleName middleName; _MiddleName middleName;
} data; } data;
@ -125,8 +123,6 @@ public:
newEdge.data.forward = _graph[edge].data.forward; newEdge.data.forward = _graph[edge].data.forward;
newEdge.data.backward = _graph[edge].data.backward; newEdge.data.backward = _graph[edge].data.backward;
newEdge.data.type = _graph[edge].data.type; newEdge.data.type = _graph[edge].data.type;
newEdge.data.forwardTurn = _graph[edge].data.forwardTurn;
newEdge.data.backwardTurn = _graph[edge].data.backwardTurn;
edges.push_back( newEdge ); edges.push_back( newEdge );
} }
#ifdef _GLIBCXX_PARALLEL #ifdef _GLIBCXX_PARALLEL

2
Contractor/Contractor.h
View File

@ -370,8 +370,6 @@ public:
} }
newEdge.data.forward = data.forward; newEdge.data.forward = data.forward;
newEdge.data.forwardTurn = data.forwardTurn;
newEdge.data.backwardTurn = data.backwardTurn;
newEdge.data.backward = data.backward; newEdge.data.backward = data.backward;
edges.push_back( newEdge ); edges.push_back( newEdge );
} }

5
Util/GraphLoader.h
View File

@ -355,8 +355,6 @@ unsigned readHSGRFromStream(istream &in, vector<EdgeT> * edgeList) {
bool shortcut; bool shortcut;
bool forward; bool forward;
bool backward; bool backward;
bool forwardTurn;
bool backwardTurn;
short type; short type;
NodeID middle; NodeID middle;
NodeID source; NodeID source;
@ -364,8 +362,6 @@ unsigned readHSGRFromStream(istream &in, vector<EdgeT> * edgeList) {
in.read((char *)&(distance), sizeof(int)); in.read((char *)&(distance), sizeof(int));
assert(distance > 0); assert(distance > 0);
in.read((char *)&(forwardTurn), sizeof(bool));
in.read((char *)&(backwardTurn), sizeof(bool));
in.read((char *)&(shortcut), sizeof(bool)); in.read((char *)&(shortcut), sizeof(bool));
in.read((char *)&(forward), sizeof(bool)); in.read((char *)&(forward), sizeof(bool));
in.read((char *)&(backward), sizeof(bool)); in.read((char *)&(backward), sizeof(bool));
@ -374,7 +370,6 @@ unsigned readHSGRFromStream(istream &in, vector<EdgeT> * edgeList) {
in.read((char *)&(source), sizeof(NodeID)); in.read((char *)&(source), sizeof(NodeID));
in.read((char *)&(target), sizeof(NodeID)); in.read((char *)&(target), sizeof(NodeID));
e.backward = backward; e.distance = distance; e.forward = forward; e.middleName.middle = middle; e.shortcut = shortcut; e.type = type; e.backward = backward; e.distance = distance; e.forward = forward; e.middleName.middle = middle; e.shortcut = shortcut; e.type = type;
e.forwardTurn = forwardTurn; e.backwardTurn = backwardTurn;
g.data = e; g.source = source; g.target = target; g.data = e; g.source = source; g.target = target;
if(source > numberOfNodes) if(source > numberOfNodes)

12
createHierarchy.cpp
View File

@ -46,7 +46,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include "DataStructures/BinaryHeap.h" #include "DataStructures/BinaryHeap.h"
#include "DataStructures/LevelInformation.h" #include "DataStructures/LevelInformation.h"
#include "DataStructures/NNGrid.h" #include "DataStructures/NNGrid.h"
#include "DataStructures/TurnInfoFactory.h"
#include "Util/BaseConfiguration.h" #include "Util/BaseConfiguration.h"
#include "Util/InputFileUtil.h" #include "Util/InputFileUtil.h"
#include "Util/GraphLoader.h" #include "Util/GraphLoader.h"
@ -90,12 +89,6 @@ int main (int argc, char *argv[]) {
const NodeID n = readBinaryOSRMGraphFromStream(in, edgeList, int2ExtNodeMap); const NodeID n = readBinaryOSRMGraphFromStream(in, edgeList, int2ExtNodeMap);
in.close(); in.close();
// cout << "computing turn vector info ..." << flush;
// TurnInfoFactory * infoFactory = new TurnInfoFactory(n, edgeList);
// infoFactory->Run();
// delete infoFactory;
// cout << "ok" << endl;
char nodeOut[1024]; char nodeOut[1024];
char edgeOut[1024]; char edgeOut[1024];
char ramIndexOut[1024]; char ramIndexOut[1024];
@ -172,12 +165,7 @@ int main (int argc, char *argv[]) {
NodeID target = it->target; NodeID target = it->target;
short type = it->data.type; short type = it->data.type;
bool forwardTurn = it->data.forwardTurn;
bool backwardTurn = it->data.backwardTurn;
edgeOutFile.write((char *)&(distance), sizeof(int)); edgeOutFile.write((char *)&(distance), sizeof(int));
edgeOutFile.write((char *)&(forwardTurn), sizeof(bool));
edgeOutFile.write((char *)&(backwardTurn), sizeof(bool));
edgeOutFile.write((char *)&(shortcut), sizeof(bool)); edgeOutFile.write((char *)&(shortcut), sizeof(bool));
edgeOutFile.write((char *)&(forward), sizeof(bool)); edgeOutFile.write((char *)&(forward), sizeof(bool));
edgeOutFile.write((char *)&(backward), sizeof(bool)); edgeOutFile.write((char *)&(backward), sizeof(bool));