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

Preparing data structures for turn directions

Browse Source
This commit is contained in:
Dennis Luxen
2010-09-23 15:34:22 +00:00
parent 586e8b4c4b
commit 76488c58e8
7 changed files with 58 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Contractor/ContractionCleanup.h
+9 -5
View File
@@ -60,6 +60,10 @@ private:
delete _heapForward;
}
};
union _MiddleName {
NodeID nameID;
NodeID middle;
};
public:
@@ -71,7 +75,7 @@ public:
bool shortcut : 1;
bool forward : 1;
bool backward : 1;
NodeID middle;
_MiddleName middleName;
} data;
//sorts by source and other attributes
@@ -88,7 +92,7 @@ public:
}
bool operator== ( const Edge& right ) const {
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.middle == right.data.middle );
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.middleName.middle == right.data.middleName.middle );
}
};
@@ -118,7 +122,7 @@ public:
newEdge.data.distance = _graph[edge].data.distance;
newEdge.data.shortcut = _graph[edge].data.shortcut;
if ( newEdge.data.shortcut )
newEdge.data.middle = _graph[edge].data.middle;
newEdge.data.middleName = _graph[edge].data.middleName;
newEdge.data.forward = _graph[edge].data.forward;
newEdge.data.backward = _graph[edge].data.backward;
edges.push_back( newEdge );
@@ -211,7 +215,7 @@ private:
Contractor::Witness temp;
temp.source = _graph[i].source;
temp.target = _graph[i].target;
temp.middle = _graph[i].data.middle;
temp.middleName.middle = _graph[i].data.middleName.middle;
}
}
if ( _graph[i].data.backward ) {
@@ -222,7 +226,7 @@ private:
Contractor::Witness temp;
temp.source = _graph[i].target;
temp.target = _graph[i].source;
temp.middle = _graph[i].data.middle;
temp.middleName.middle = _graph[i].data.middleName.middle;
}
}
}