Commit 422b3dc6 authored by Hans-Christian Ebke's avatar Hans-Christian Ebke
Browse files

Tweaks to HeapT.hh.

parent daa256e3
Pipeline #91 failed with stage
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
#include "Config.hh" #include "Config.hh"
#include <vector> #include <vector>
#include <OpenMesh/Core/System/omstream.hh> #include <OpenMesh/Core/System/omstream.hh>
#include <utility>
//== NAMESPACE ================================================================ //== NAMESPACE ================================================================
...@@ -148,13 +149,20 @@ public: ...@@ -148,13 +149,20 @@ public:
HeapT() : HeapVector() {} HeapT() : HeapVector() {}
/// Construct with a given \c HeapIterface. /// Construct with a given \c HeapIterface.
HeapT(const HeapInterface& _interface) HeapT(HeapInterface _interface)
: HeapVector(), interface_(_interface) : HeapVector(), interface_(std::move(_interface))
{} {}
/// Destructor. /// Destructor.
~HeapT(){}; ~HeapT(){};
HeapInterface &getInterface() {
return interface_;
}
const HeapInterface &getInterface() const {
return interface_;
}
/// clear the heap /// clear the heap
void clear() { HeapVector::clear(); } void clear() { HeapVector::clear(); }
...@@ -187,14 +195,14 @@ public: ...@@ -187,14 +195,14 @@ public:
HeapEntry front() const HeapEntry front() const
{ {
assert(!empty()); assert(!empty());
return entry(0); return HeapVector::front();
} }
/// delete the first entry /// delete the first entry
void pop_front() void pop_front()
{ {
assert(!empty()); assert(!empty());
reset_heap_position(entry(0)); reset_heap_position(HeapVector::front());
if (size() > 1) if (size() > 1)
{ {
entry(0, entry(size()-1)); entry(0, entry(size()-1));
...@@ -338,9 +346,9 @@ void ...@@ -338,9 +346,9 @@ void
HeapT<HeapEntry, HeapInterface>:: HeapT<HeapEntry, HeapInterface>::
downheap(size_t _idx) downheap(size_t _idx)
{ {
HeapEntry h = entry(_idx); const HeapEntry h = entry(_idx);
size_t childIdx; size_t childIdx;
size_t s = size(); const size_t s = size();
while(_idx < s) while(_idx < s)
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment