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

array initialization can be optional

Browse Source
This commit is contained in:
Dennis Luxen 2011-07-07 07:40:49 +00:00
parent 108e1ad5e6
commit 6e8a1e0e31
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DataStructures/BinaryHeap.h
View File

@ -31,12 +31,12 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <google/sparse_hash_map>
#include <google/sparsetable>
template< typename NodeID, typename Key >
template< typename NodeID, typename Key, bool initialize = false >
class ArrayStorage {
public:
ArrayStorage( size_t size )
: positions( new Key[size] ) {}
: positions( new Key[size] ) { if(initialize) { memset(positions, 0, size*sizeof(Key));} }
~ArrayStorage() {
delete[] positions;
@ -120,6 +120,10 @@ struct _SimpleHeapData {
_SimpleHeapData( NodeID p ) : parent(p) { }
};
struct _NullHeapData {
_NullHeapData(NodeID p) {}
};
template < typename NodeID, typename Key, typename Weight, typename Data, typename IndexStorage = ArrayStorage<NodeID, NodeID> >
class BinaryHeap {
private:
@ -244,8 +248,7 @@ private:
Key nextKey = key << 1;
while ( nextKey < ( Key ) heap.size() ) {
const Key nextKeyOther = nextKey + 1;
if ( ( nextKeyOther < ( Key ) heap.size() ) )
if ( heap[nextKey].weight > heap[nextKeyOther].weight )
if ( ( nextKeyOther < ( Key ) heap.size() )&& ( heap[nextKey].weight > heap[nextKeyOther].weight) )
nextKey = nextKeyOther;
if ( weight <= heap[nextKey].weight )