songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plug pairing_heap with result of runtime of other heaps 

also add reserve
This commit is contained in:
Sébastien Loriot 2021-12-01 10:19:58 +01:00
parent 49b530461e
commit 0183aac332
1 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
STL_Extension/include/CGAL/Modifiable_priority_queue.h
View File

@ -17,13 +17,13 @@
#include <CGAL/STL_Extension/internal/boost/relaxed_heap.hpp> #include <CGAL/STL_Extension/internal/boost/relaxed_heap.hpp>
#include <CGAL/STL_Extension/internal/boost/mutable_queue.hpp> #include <CGAL/STL_Extension/internal/boost/mutable_queue.hpp>
#include <boost/heap/fibonacci_heap.hpp> #include <boost/heap/pairing_heap.hpp>
#include <type_traits> #include <type_traits>
namespace CGAL { namespace CGAL {
enum Heap_type { CGAL_BOOST_FIBONACCI_HEAP, CGAL_BOOST_PENDING_MUTABLE_QUEUE, CGAL_BOOST_PENDING_RELAXED_HEAP }; enum Heap_type { CGAL_BOOST_PAIRING_HEAP, CGAL_BOOST_PENDING_MUTABLE_QUEUE, CGAL_BOOST_PENDING_RELAXED_HEAP };
template <class IndexedType_ template <class IndexedType_
,class Compare_ = std::less<IndexedType_> ,class Compare_ = std::less<IndexedType_>
@ -94,10 +94,8 @@ private:
template <class IndexedType_ template <class IndexedType_
,class Compare_ ,class Compare_
,class ID_> ,class ID_>
class Modifiable_priority_queue<IndexedType_, Compare_, ID_, CGAL_BOOST_FIBONACCI_HEAP> struct Modifiable_priority_queue<IndexedType_, Compare_, ID_, CGAL_BOOST_PAIRING_HEAP>
{ {
public:
typedef Modifiable_priority_queue Self; typedef Modifiable_priority_queue Self;
typedef IndexedType_ IndexedType ; typedef IndexedType_ IndexedType ;
@ -105,28 +103,54 @@ public:
typedef ID_ ID ; typedef ID_ ID ;
struct Reverse_compare{ struct Reverse_compare{
const Compare c; Compare c;
Reverse_compare(){} Reverse_compare(const Compare& c):c(c){}
Reverse_compare(Compare const& c):c(c){} bool operator() (const IndexedType& a, const IndexedType& b) const
template<typename T>
bool operator() (T const& a, T const& b) const
{ {
return !c(a,b); return !c(a,b);
} }
}; };
typedef boost::heap::fibonacci_heap<IndexedType,boost::heap::compare<Reverse_compare> > Heap; // reference time (SMS Iphigenia, keeping 0.05% of edges, all default parameters + Surface_mesh): 12045ms
// --
// boost::heap::priority_queue is ummutable and cannot be used
// --
// typedef boost::heap::d_ary_heap<IndexedType, boost::heap::arity<2>, boost::heap::compare<Reverse_compare>, boost::heap::mutable_<true> > Heap; //(15291ms)
// typedef boost::heap::d_ary_heap<IndexedType, boost::heap::arity<3>, boost::heap::compare<Reverse_compare>, boost::heap::mutable_<true> > Heap; //(14351ms)
// typedef boost::heap::d_ary_heap<IndexedType, boost::heap::arity<4>, boost::heap::compare<Reverse_compare>, boost::heap::mutable_<true> > Heap; //(13869ms)
// typedef boost::heap::d_ary_heap<IndexedType, boost::heap::arity<5>, boost::heap::compare<Reverse_compare>, boost::heap::mutable_<true> > Heap; //(13879ms)
// typedef boost::heap::d_ary_heap<IndexedType, boost::heap::arity<6>, boost::heap::compare<Reverse_compare>, boost::heap::mutable_<true> > Heap; //(13881ms)
// --
//typedef boost::heap::binomial_heap<IndexedType, boost::heap::compare<Reverse_compare>> Heap; //(16216ms)
// --
// typedef boost::heap::fibonacci_heap<IndexedType, boost::heap::compare<Reverse_compare>> Heap; // (13523ms)
// --
typedef boost::heap::pairing_heap<IndexedType, boost::heap::compare<Reverse_compare>> Heap; // (12174ms)
// --
// typedef boost::heap::skew_heap<IndexedType, boost::heap::compare<Reverse_compare>, boost::heap::mutable_<true>> Heap; //(17957ms)
// --
typedef typename Heap::value_type value_type; typedef typename Heap::value_type value_type;
typedef typename Heap::size_type size_type; typedef typename Heap::size_type size_type;
private:
void reserve_impl(size_type r, std::true_type)
{
mHeap.reserve(r);
}
void reserve_impl(size_type, std::false_type)
{}
public: public:
Modifiable_priority_queue( size_type largest_ID, Compare const& c = Compare(), ID const& id = ID() ) Modifiable_priority_queue( size_type largest_ID, Compare const& c = Compare(), ID const& id = ID() )
: mHeap(Reverse_compare(c)) : mHeap(Reverse_compare(c))
, mID(id) , mID(id)
, mHandles(largest_ID) , mHandles(largest_ID)
{} {
reserve(largest_ID);
}
void push ( value_type const& v ) { mHandles[get(mID, v)]=mHeap.push(v) ; } void push ( value_type const& v ) { mHandles[get(mID, v)]=mHeap.push(v) ; }
@ -166,6 +190,12 @@ public:
return v; return v;
} }
void reserve(size_type r)
{
reserve_impl(r, std::integral_constant<bool, Heap::has_reserve>());
}
private: private:
Heap mHeap ; Heap mHeap ;