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

BinaryHeap should handle negative keys as well. Thanks Christian for pointing out the obviuos!

Browse Source
This commit is contained in:
Dennis Luxen 2011-07-22 15:33:57 +00:00
parent 4f23dfef64
commit 11dbf03467
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DataStructures/BinaryHeap.h
View File

@ -24,6 +24,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
//Not compatible with non contiguous node ids //Not compatible with non contiguous node ids
#include <cassert> #include <cassert>
#include <limits>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <map> #include <map>
@ -107,6 +108,7 @@ private:
google::sparse_hash_map< NodeID, Key > nodes; google::sparse_hash_map< NodeID, Key > nodes;
}; };
template< typename NodeID, typename Key >
class SparseTableStorage : public google::sparsetable<NodeID> { class SparseTableStorage : public google::sparsetable<NodeID> {
public: public:
SparseTableStorage(size_t n) : google::sparsetable<NodeID>(n){ } SparseTableStorage(size_t n) : google::sparsetable<NodeID>(n){ }
@ -115,14 +117,15 @@ public:
} }
}; };
template<typename NodeID = unsigned>
struct _SimpleHeapData { struct _SimpleHeapData {
NodeID parent; NodeID parent;
_SimpleHeapData( NodeID p ) : parent(p) { } _SimpleHeapData( NodeID p ) : parent(p) { }
}; };
struct _NullHeapData { //struct _NullHeapData {
_NullHeapData(NodeID p) {} // _NullHeapData(NodeID p) {}
}; //};
template < typename NodeID, typename Key, typename Weight, typename Data, typename IndexStorage = ArrayStorage<NodeID, NodeID> > template < typename NodeID, typename Key, typename Weight, typename Data, typename IndexStorage = ArrayStorage<NodeID, NodeID> >
class BinaryHeap { class BinaryHeap {
@ -141,7 +144,7 @@ public:
void Clear() { void Clear() {
heap.resize( 1 ); heap.resize( 1 );
insertedNodes.clear(); insertedNodes.clear();
heap[0].weight = 0; heap[0].weight = std::numeric_limits< Weight >::min();
nodeIndex.Clear(); nodeIndex.Clear();
} }
@ -205,7 +208,7 @@ public:
for ( typename std::vector< HeapElement >::iterator i = heap.begin() + 1, iend = heap.end(); i != iend; ++i ) for ( typename std::vector< HeapElement >::iterator i = heap.begin() + 1, iend = heap.end(); i != iend; ++i )
insertedNodes[i->index].key = 0; insertedNodes[i->index].key = 0;
heap.resize( 1 ); heap.resize( 1 );
heap[0].weight = 0; heap[0].weight = std::numeric_limits< Weight >::min();
} }
void DecreaseKey( NodeID node, Weight weight ) { void DecreaseKey( NodeID node, Weight weight ) {
@ -250,7 +253,7 @@ private:
while ( nextKey < ( Key ) heap.size() ) { while ( nextKey < ( Key ) heap.size() ) {
const Key nextKeyOther = nextKey + 1; const Key nextKeyOther = nextKey + 1;
if ( ( nextKeyOther < ( Key ) heap.size() )&& ( heap[nextKey].weight > heap[nextKeyOther].weight) ) if ( ( nextKeyOther < ( Key ) heap.size() )&& ( heap[nextKey].weight > heap[nextKeyOther].weight) )
nextKey = nextKeyOther; nextKey = nextKeyOther;
if ( weight <= heap[nextKey].weight ) if ( weight <= heap[nextKey].weight )
break; break;
@ -282,9 +285,12 @@ private:
} }
void CheckHeap() { void CheckHeap() {
/*for ( Key i = 2; i < heap.size(); ++i ) { #ifndef NDEBUG
assert( heap[i].weight >= heap[i >> 1].weight ); for ( Key i = 2; i < (Key) heap.size(); ++i ) {
}*/ assert( heap[i].weight >= heap[i >> 1].weight );
std::cout << "checked" << std::endl;
}
#endif
} }
}; };