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

A bit of code-cleanup.

Browse Source
This commit is contained in:
Dennis Luxen 2011-08-04 17:07:51 +00:00
parent 79083e7585
commit ff3de43ec6
1 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Contractor/ContractionCleanup.h
View File

@ -36,16 +36,16 @@ or see http://www.gnu.org/licenses/agpl.txt.
class ContractionCleanup { class ContractionCleanup {
private: private:
struct _HeapData { struct _CleanupHeapData {
NodeID parent; NodeID parent;
_HeapData( NodeID p ) { _CleanupHeapData( NodeID p ) {
parent = p; parent = p;
} }
}; };
#ifdef _MANYCORES #ifdef _MANYCORES
typedef BinaryHeap< NodeID, NodeID, int, _HeapData, DenseStorage<NodeID, NodeID> > _Heap; typedef BinaryHeap< NodeID, NodeID, int, _HeapData, DenseStorage<NodeID, NodeID> > _Heap;
#else #else
typedef BinaryHeap< NodeID, NodeID, int, _HeapData > _Heap; typedef BinaryHeap< NodeID, NodeID, int, _CleanupHeapData > _Heap;
#endif #endif
struct _ThreadData { struct _ThreadData {
_Heap* _heapForward; _Heap* _heapForward;
@ -71,11 +71,11 @@ public:
NodeID source; NodeID source;
NodeID target; NodeID target;
struct EdgeData { struct EdgeData {
int distance : 29; int distance : 30;
bool shortcut : 1; bool shortcut : 1;
bool forward : 1; bool forward : 1;
bool backward : 1; bool backward : 1;
short type; short type:7;
_MiddleName middleName; _MiddleName middleName;
} data; } data;
@ -113,17 +113,13 @@ public:
template< class EdgeT > template< class EdgeT >
void GetData( std::vector< EdgeT >& edges ) { void GetData( std::vector< EdgeT >& edges ) {
for ( int edge = 0, endEdges = ( int ) _graph.size(); edge != endEdges; ++edge ) { for ( int edge = 0, endEdges = ( int ) _graph.size(); edge != endEdges; ++edge ) {
EdgeT newEdge; if(_graph[edge].data.forward || _graph[edge].data.backward) {
newEdge.source = _graph[edge].source; EdgeT newEdge;
newEdge.target = _graph[edge].target; newEdge.source = _graph[edge].source;
newEdge.target = _graph[edge].target;
newEdge.data.distance = _graph[edge].data.distance; newEdge.data = _graph[edge].data;
newEdge.data.shortcut = _graph[edge].data.shortcut; edges.push_back( newEdge );
newEdge.data.middleName = _graph[edge].data.middleName; }
newEdge.data.forward = _graph[edge].data.forward;
newEdge.data.backward = _graph[edge].data.backward;
newEdge.data.type = _graph[edge].data.type;
edges.push_back( newEdge );
} }
#ifdef _GLIBCXX_PARALLEL #ifdef _GLIBCXX_PARALLEL
__gnu_parallel::sort( edges.begin(), edges.end() ); __gnu_parallel::sort( edges.begin(), edges.end() );
@ -134,20 +130,6 @@ public:
private: private:
class AllowForwardEdge {
public:
bool operator()( const Edge& data ) const {
return data.data.forward;
}
};
class AllowBackwardEdge {
public:
bool operator()( const Edge& data ) const {
return data.data.backward;
}
};
double _Timestamp() { double _Timestamp() {
struct timeval tp; struct timeval tp;
gettimeofday(&tp, NULL); gettimeofday(&tp, NULL);
@ -165,6 +147,7 @@ private:
_firstEdge.resize( _numNodes + 1 ); _firstEdge.resize( _numNodes + 1 );
} catch(...) { } catch(...) {
cerr << "Not enough RAM on machine" << endl; cerr << "Not enough RAM on machine" << endl;
return;
} }
_firstEdge[0] = 0; _firstEdge[0] = 0;
for ( NodeID i = 0, node = 0; i < ( NodeID ) _graph.size(); i++ ) { for ( NodeID i = 0, node = 0; i < ( NodeID ) _graph.size(); i++ ) {
@ -222,21 +205,22 @@ private:
} }
cout << "Removing edges" << endl; cout << "Removing edges" << endl;
int usefull = 0; int useful = 0;
for ( int i = 0; i < ( int ) _graph.size(); i++ ) { for ( int i = 0; i < ( int ) _graph.size(); i++ ) {
if ( !_graph[i].data.forward && !_graph[i].data.backward && _graph[i].data.shortcut ) if ( !_graph[i].data.forward && !_graph[i].data.backward && _graph[i].data.shortcut )
continue; continue;
_graph[usefull] = _graph[i]; _graph[useful] = _graph[i];
usefull++; useful++;
} }
cout << "Removed " << _graph.size() - usefull << " useless shortcuts" << endl; cout << "Removed " << _graph.size() - useful << " useless shortcuts" << endl;
_graph.resize( usefull ); _graph.resize( useful );
for ( int threadNum = 0; threadNum < maxThreads; ++threadNum ) { for ( int threadNum = 0; threadNum < maxThreads; ++threadNum ) {
delete threadData[threadNum]; delete threadData[threadNum];
} }
} }
template< class EdgeAllowed, class StallEdgeAllowed > void _ComputeStep( _Heap* heapForward, _Heap* heapBackward, const EdgeAllowed& edgeAllowed, const StallEdgeAllowed& stallEdgeAllowed, NodeID* middle, int* targetDistance ) { void _ComputeStep( _Heap* heapForward, _Heap* heapBackward, bool forwardDirection, NodeID* middle, int* targetDistance ) {
const NodeID node = heapForward->DeleteMin(); const NodeID node = heapForward->DeleteMin();
const int distance = heapForward->GetKey( node ); const int distance = heapForward->GetKey( node );
@ -259,7 +243,7 @@ private:
assert( edgeWeight > 0 ); assert( edgeWeight > 0 );
const int toDistance = distance + edgeWeight; const int toDistance = distance + edgeWeight;
if ( edgeAllowed( _graph[edge] ) ) { if ( (forwardDirection ? _graph[edge].data.forward : _graph[edge].data.backward ) ) {
//New Node discovered -> Add to Heap + Node Info Storage //New Node discovered -> Add to Heap + Node Info Storage
if ( !heapForward->WasInserted( to ) ) if ( !heapForward->WasInserted( to ) )
heapForward->Insert( to, toDistance, node ); heapForward->Insert( to, toDistance, node );
@ -282,24 +266,17 @@ private:
data->_heapBackward->Insert( target, 0, target ); data->_heapBackward->Insert( target, 0, target );
int targetDistance = std::numeric_limits< int >::max(); int targetDistance = std::numeric_limits< int >::max();
NodeID middle = 0; NodeID middle = std::numeric_limits<NodeID>::max();
AllowForwardEdge forward;
AllowBackwardEdge backward;
while ( data->_heapForward->Size() + data->_heapBackward->Size() > 0 ) { while ( data->_heapForward->Size() + data->_heapBackward->Size() > 0 ) {
if ( data->_heapForward->Size() > 0 ) { if ( data->_heapForward->Size() > 0 ) {
_ComputeStep( data->_heapForward, data->_heapBackward, forward, backward, &middle, &targetDistance ); _ComputeStep( data->_heapForward, data->_heapBackward, true, &middle, &targetDistance );
} }
if ( data->_heapBackward->Size() > 0 ) { if ( data->_heapBackward->Size() > 0 ) {
_ComputeStep( data->_heapBackward, data->_heapForward, backward, forward, &middle, &targetDistance ); _ComputeStep( data->_heapBackward, data->_heapForward, false, &middle, &targetDistance );
} }
} }
if ( targetDistance == std::numeric_limits< int >::max() )
return std::numeric_limits< unsigned >::max();
return targetDistance; return targetDistance;
} }
NodeID _numNodes; NodeID _numNodes;