diff --git a/lemon/fourary_heap.h b/lemon/quad_heap.h copy from lemon/fourary_heap.h copy to lemon/quad_heap.h --- a/lemon/fourary_heap.h +++ b/lemon/quad_heap.h @@ -16,12 +16,12 @@ * */ -#ifndef LEMON_FOURARY_HEAP_H -#define LEMON_FOURARY_HEAP_H +#ifndef LEMON_QUAD_HEAP_H +#define LEMON_QUAD_HEAP_H ///\ingroup heaps ///\file -///\brief Fourary heap implementation. +///\brief Fourary (quaternary) heap implementation. #include #include @@ -31,13 +31,14 @@ /// \ingroup heaps /// - ///\brief Fourary heap data structure. + ///\brief Fourary (quaternary) heap data structure. /// - /// This class implements the \e fourary \e heap data structure. + /// This class implements the \e Fourary (\e quaternary) \e heap + /// data structure. /// It fully conforms to the \ref concepts::Heap "heap concept". /// - /// The fourary heap is a specialization of the \ref KaryHeap "K-ary heap" - /// for K=4. It is similar to the \ref BinHeap "binary heap", + /// The fourary heap is a specialization of the \ref DHeap "D-ary heap" + /// for D=4. It is similar to the \ref BinHeap "binary heap", /// but its nodes have at most four children, instead of two. /// /// \tparam PR Type of the priorities of the items. @@ -47,13 +48,13 @@ /// The default is \c std::less. /// ///\sa BinHeap - ///\sa KaryHeap + ///\sa DHeap #ifdef DOXYGEN template #else template > #endif - class FouraryHeap { + class QuadHeap { public: /// Type of the item-int map. typedef IM ItemIntMap; @@ -92,7 +93,7 @@ /// \param map A map that assigns \c int values to the items. /// It is used internally to handle the cross references. /// The assigned value must be \c PRE_HEAP (-1) for each item. - explicit FouraryHeap(ItemIntMap &map) : _iim(map) {} + explicit QuadHeap(ItemIntMap &map) : _iim(map) {} /// \brief Constructor. /// @@ -101,7 +102,7 @@ /// It is used internally to handle the cross references. /// The assigned value must be \c PRE_HEAP (-1) for each item. /// \param comp The function object used for comparing the priorities. - FouraryHeap(ItemIntMap &map, const Compare &comp) + QuadHeap(ItemIntMap &map, const Compare &comp) : _iim(map), _comp(comp) {} /// \brief The number of items stored in the heap. @@ -335,7 +336,7 @@ _data[idx].first = j; } - }; // class FouraryHeap + }; // class QuadHeap } // namespace lemon