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

Removed superflous member that saves about 10 percent of RAM

Browse Source
This commit is contained in:
DennisOSRM 2011-12-01 14:48:06 +01:00
parent fb661ab6f6
commit 5236fb8c0e
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Contractor/ContractionCleanup.h
View File

@ -66,8 +66,7 @@ public:
NodeID target; NodeID target;
struct EdgeData { struct EdgeData {
NodeID via; NodeID via;
unsigned nameID1; unsigned nameID;
unsigned nameID2;
int distance; int distance;
bool shortcut; bool shortcut;
bool forward; bool forward;
@ -91,7 +90,7 @@ public:
bool operator== ( const Edge& right ) const { bool operator== ( const Edge& right ) const {
return ( source == right.source && target == right.target && data.distance == right.data.distance && return ( source == right.source && target == right.target && data.distance == right.data.distance &&
data.shortcut == right.data.shortcut && data.forward == right.data.forward && data.backward == right.data.backward data.shortcut == right.data.shortcut && data.forward == right.data.forward && data.backward == right.data.backward
&& data.via == right.data.via && data.nameID1 == right.data.nameID1 && data.nameID2 == right.data.nameID2 && data.via == right.data.via && data.nameID == right.data.nameID
); );
} }
}; };

2
Contractor/Contractor.h
View File

@ -304,7 +304,7 @@ public:
newEdge.data.distance = data.distance; newEdge.data.distance = data.distance;
newEdge.data.shortcut = data.shortcut; newEdge.data.shortcut = data.shortcut;
newEdge.data.via = data.via; newEdge.data.via = data.via;
newEdge.data.nameID1 = 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;
newEdge.data.backward = data.backward; newEdge.data.backward = data.backward;

2
DataStructures/ExtractorCallBacks.h
View File

@ -164,7 +164,7 @@ public:
w.type = 1; w.type = 1;
//Get the unique identifier for the street name //Get the unique identifier for the street name
StringMap::const_iterator strit = stringMap->find(w.name); const StringMap::const_iterator strit = stringMap->find(w.name);
if(strit == stringMap->end()) { if(strit == stringMap->end()) {
w.nameID = externalMemory->nameVector.size(); w.nameID = externalMemory->nameVector.size();
externalMemory->nameVector.push_back(w.name); externalMemory->nameVector.push_back(w.name);

2
DataStructures/SearchEngine.h
View File

@ -256,7 +256,7 @@ private:
return false; return false;
} else { } else {
assert(!ed.shortcut); assert(!ed.shortcut);
path.push_back(_PathData(ed.via, ed.nameID1, ed.turnInstruction, ed.distance) ); path.push_back(_PathData(ed.via, ed.nameID, ed.turnInstruction, ed.distance) );
return true; return true;
} }
} }