LEMON/LEMON-official Changeset - r730:9f529abcaebf

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r730:9f529abcaebf

« 729:bb8c4c

805:b31e13 »
765:703ebf »
760:4ac304 »
756:0747f3 »
748:d1a922 »
743:c9b9da »
740:7bda78 »
738:9e54e3 »
733:7439dc »

r730:9f529abcaebf

Thu, 11 Jun 2009 23:13:24

[Not Reviewed]

0 comments (0 inline)

deba@inf.elte.hu
deba@inf.elte.hu

Unification of names in heaps (#50)

0 4 0

default

4 files changed with 297 insertions and 294 deletions:

lemon/bin_heap.h

lemon/bucket_heap.h

129

127

lemon/fib_heap.h

143

142

lemon/radix_heap.h

↑ Collapse diff ↑

lemon/bin_heap.h

Show inline comments

@@ -35,7 +35,7 @@
 		  ///
 		  ///This class implements the \e binary \e heap data structure.
 		  ///
 		  ///This class implements the \e binary \e heap data structure.
 		  ///
 		  ///A \e heap is a data structure for storing items with specified values
 		  ///called \e priorities in such a way that finding the item with minimum
-		  ///priority is efficient. \c Comp specifies the ordering of the priorities.
+		  ///priority is efficient. \c CMP specifies the ordering of the priorities.
 		  ///In a heap one can change the priority of an item, add or erase an
@@ -46,3 +46,3 @@
 		  ///to handle the cross references.
-		  ///\tparam Comp A functor class for the ordering of the priorities.
+		  ///\tparam CMP A functor class for the ordering of the priorities.
 		  ///The default is \c std::less<PR>.
@@ -51,3 +51,3 @@
 		  ///\sa Dijkstra
-		  template <typename PR, typename IM, typename Comp = std::less<PR> >
+		  template <typename PR, typename IM, typename CMP = std::less<PR> >
 		  class BinHeap {
@@ -64,3 +64,3 @@
 		    ///\e
-		    typedef Comp Compare;
+		    typedef CMP Compare;

lemon/bucket_heap.h

Show inline comments

@@ -33,3 +33,3 @@
-		    template <bool minimize>
+		    template <bool MIN>
 		    struct DirectionTraits {
@@ -67,7 +67,8 @@
 		  ///
-		  /// \param _ItemIntMap A read and writable Item int map, used internally
+		  /// \param IM A read and write Item int map, used internally
 		  /// to handle the cross references.
 		  /// \param minimize If the given parameter is true then the heap gives back
 		  /// the lowest priority.
-		  template <typename _ItemIntMap, bool minimize = true>
+		  /// \param MIN If the given parameter is false then instead of the
 		  /// minimum value the maximum can be retrivied with the top() and
 		  /// prio() member functions.
 		  template <typename IM, bool MIN = true>
 		  class BucketHeap {
@@ -76,3 +77,3 @@
 		    /// \e
-		    typedef typename _ItemIntMap::Key Item;
+		    typedef typename IM::Key Item;
 		    /// \e
@@ -82,3 +83,3 @@
 		    /// \e
-		    typedef _ItemIntMap ItemIntMap;
+		    typedef IM ItemIntMap;
@@ -86,3 +87,3 @@
-		    typedef _bucket_heap_bits::DirectionTraits<minimize> Direction;
+		    typedef _bucket_heap_bits::DirectionTraits<MIN> Direction;
@@ -96,8 +97,8 @@
 		    ///
 		    /// The ItemIntMap \e should be initialized in such way that it maps
 		    /// PRE_HEAP (-1) to any element to be put in the heap...
 		    /// The item-int map must be initialized in such way that it assigns
 		    /// \c PRE_HEAP (<tt>-1</tt>) to any element to be put in the heap.
 		    enum State {
 		      IN_HEAP = 0,
 		      PRE_HEAP = -1,
-		      POST_HEAP = -2
+		      IN_HEAP = 0,    ///< = 0.
 		      PRE_HEAP = -1,  ///< = -1.
 		      POST_HEAP = -2  ///< = -2.
 		    };
@@ -108,6 +109,6 @@
 		    /// The constructor.
-		    /// \param _index should be given to the constructor, since it is used
+		    /// \param map should be given to the constructor, since it is used
 		    /// internally to handle the cross references. The value of the map
 		    /// should be PRE_HEAP (-1) for each element.
-		    explicit BucketHeap(ItemIntMap &_index) : index(_index), minimal(0) {}
+		    explicit BucketHeap(ItemIntMap &map) : _iim(map), _minimum(0) {}
@@ -116,3 +117,3 @@
 		    /// \brief Returns the number of items stored in the heap.
-		    int size() const { return data.size(); }
+		    int size() const { return _data.size(); }
@@ -121,3 +122,3 @@
 		    /// Returns \c true if and only if the heap stores no items.
-		    bool empty() const { return data.empty(); }
+		    bool empty() const { return _data.empty(); }
@@ -130,3 +131,3 @@
 		    void clear() {
-		      data.clear(); first.clear(); minimal = 0;
+		      _data.clear(); _first.clear(); _minimum = 0;
+		    }
@@ -136,15 +137,15 @@
 		    void relocate_last(int idx) {
 		      if (idx + 1 < int(data.size())) {
 		        data[idx] = data.back();
 		        if (data[idx].prev != -1) {
 		          data[data[idx].prev].next = idx;
 		      if (idx + 1 < int(_data.size())) {
 		        _data[idx] = _data.back();
 		        if (_data[idx].prev != -1) {
 		          _data[_data[idx].prev].next = idx;
 		        } else {
-		          first[data[idx].value] = idx;
+		          _first[_data[idx].value] = idx;
+		        }
 		        if (data[idx].next != -1) {
 		          data[data[idx].next].prev = idx;
 		        if (_data[idx].next != -1) {
 		          _data[_data[idx].next].prev = idx;
+		        }
-		        index[data[idx].item] = idx;
+		        _iim[_data[idx].item] = idx;
+		      }
-		      data.pop_back();
+		      _data.pop_back();
+		    }
@@ -152,9 +153,9 @@
 		    void unlace(int idx) {
 		      if (data[idx].prev != -1) {
 		        data[data[idx].prev].next = data[idx].next;
 		      if (_data[idx].prev != -1) {
 		        _data[_data[idx].prev].next = _data[idx].next;
 		      } else {
-		        first[data[idx].value] = data[idx].next;
+		        _first[_data[idx].value] = _data[idx].next;
+		      }
 		      if (data[idx].next != -1) {
 		        data[data[idx].next].prev = data[idx].prev;
 		      if (_data[idx].next != -1) {
 		        _data[_data[idx].next].prev = _data[idx].prev;
+		      }
@@ -163,11 +164,11 @@
 		    void lace(int idx) {
 		      if (int(first.size()) <= data[idx].value) {
 		        first.resize(data[idx].value + 1, -1);
 		      if (int(_first.size()) <= _data[idx].value) {
 		        _first.resize(_data[idx].value + 1, -1);
+		      }
 		      data[idx].next = first[data[idx].value];
 		      if (data[idx].next != -1) {
-		        data[data[idx].next].prev = idx;
+		      _data[idx].next = _first[_data[idx].value];
 		      if (_data[idx].next != -1) {
 		        _data[_data[idx].next].prev = idx;
+		      }
 		      first[data[idx].value] = idx;
 		      data[idx].prev = -1;
 		      _first[_data[idx].value] = idx;
 		      _data[idx].prev = -1;
+		    }
@@ -189,8 +190,8 @@
 		    void push(const Item &i, const Prio &p) {
 		      int idx = data.size();
 		      index[i] = idx;
-		      data.push_back(BucketItem(i, p));
+		      int idx = _data.size();
 		      _iim[i] = idx;
 		      _data.push_back(BucketItem(i, p));
 		      lace(idx);
 		      if (Direction::less(p, minimal)) {
 		        minimal = p;
 		      if (Direction::less(p, _minimum)) {
 		        _minimum = p;
+		      }
@@ -203,6 +204,6 @@
 		    Item top() const {
 		      while (first[minimal] == -1) {
 		        Direction::increase(minimal);
 		      while (_first[_minimum] == -1) {
 		        Direction::increase(_minimum);
+		      }
-		      return data[first[minimal]].item;
+		      return _data[_first[_minimum]].item;
+		    }
@@ -214,6 +215,6 @@
 		    Prio prio() const {
 		      while (first[minimal] == -1) {
 		        Direction::increase(minimal);
 		      while (_first[_minimum] == -1) {
 		        Direction::increase(_minimum);
+		      }
-		      return minimal;
+		      return _minimum;
+		    }
@@ -225,7 +226,7 @@
 		    void pop() {
 		      while (first[minimal] == -1) {
 		        Direction::increase(minimal);
 		      while (_first[_minimum] == -1) {
 		        Direction::increase(_minimum);
+		      }
 		      int idx = first[minimal];
 		      index[data[idx].item] = -2;
 		      int idx = _first[_minimum];
 		      _iim[_data[idx].item] = -2;
 		      unlace(idx);
@@ -240,4 +241,4 @@
 		    void erase(const Item &i) {
 		      int idx = index[i];
 		      index[data[idx].item] = -2;
 		      int idx = _iim[i];
 		      _iim[_data[idx].item] = -2;
 		      unlace(idx);
@@ -253,4 +254,4 @@
 		    Prio operator[](const Item &i) const {
 		      int idx = index[i];
 		      return data[idx].value;
 		      int idx = _iim[i];
 		      return _data[idx].value;
+		    }
@@ -265,6 +266,6 @@
 		    void set(const Item &i, const Prio &p) {
-		      int idx = index[i];
+		      int idx = _iim[i];
 		      if (idx < 0) {
 		        push(i, p);
-		      } else if (Direction::less(p, data[idx].value)) {
+		      } else if (Direction::less(p, _data[idx].value)) {
 		        decrease(i, p);
@@ -283,7 +284,7 @@
 		    void decrease(const Item &i, const Prio &p) {
-		      int idx = index[i];
+		      int idx = _iim[i];
 		      unlace(idx);
 		      data[idx].value = p;
 		      if (Direction::less(p, minimal)) {
-		        minimal = p;
+		      _data[idx].value = p;
 		      if (Direction::less(p, _minimum)) {
 		        _minimum = p;
+		      }
@@ -300,5 +301,5 @@
 		    void increase(const Item &i, const Prio &p) {
-		      int idx = index[i];
+		      int idx = _iim[i];
 		      unlace(idx);
-		      data[idx].value = p;
+		      _data[idx].value = p;
 		      lace(idx);
@@ -315,3 +316,3 @@
 		    State state(const Item &i) const {
-		      int idx = index[i];
+		      int idx = _iim[i];
 		      if (idx >= 0) idx = 0;
@@ -334,3 +335,3 @@
+		        }
-		        index[i] = st;
+		        _iim[i] = st;
 		        break;
@@ -353,6 +354,6 @@
 		    ItemIntMap& index;
 		    std::vector<int> first;
 		    std::vector<BucketItem> data;
 		    mutable int minimal;
 		    ItemIntMap& _iim;
 		    std::vector<int> _first;
 		    std::vector<BucketItem> _data;
 		    mutable int _minimum;
@@ -372,9 +373,10 @@
 		  ///
-		  /// \param _ItemIntMap A read and writable Item int map, used internally
+		  /// \param IM A read and write Item int map, used internally
 		  /// to handle the cross references.
 		  /// \param minimize If the given parameter is true then the heap gives back
 		  /// the lowest priority.
 		  /// \param MIN If the given parameter is false then instead of the
 		  /// minimum value the maximum can be retrivied with the top() and
 		  /// prio() member functions.
 		  ///
 		  /// \sa BucketHeap
-		  template <typename _ItemIntMap, bool minimize = true >
+		  template <typename IM, bool MIN = true >
 		  class SimpleBucketHeap {
@@ -382,6 +384,6 @@
 		  public:
-		    typedef typename _ItemIntMap::Key Item;
+		    typedef typename IM::Key Item;
 		    typedef int Prio;
 		    typedef std::pair<Item, Prio> Pair;
-		    typedef _ItemIntMap ItemIntMap;
+		    typedef IM ItemIntMap;
@@ -389,3 +391,3 @@
-		    typedef _bucket_heap_bits::DirectionTraits<minimize> Direction;
+		    typedef _bucket_heap_bits::DirectionTraits<MIN> Direction;
@@ -399,8 +401,8 @@
 		    ///
 		    /// The ItemIntMap \e should be initialized in such way that it maps
 		    /// PRE_HEAP (-1) to any element to be put in the heap...
 		    /// The item-int map must be initialized in such way that it assigns
 		    /// \c PRE_HEAP (<tt>-1</tt>) to any element to be put in the heap.
 		    enum State {
 		      IN_HEAP = 0,
 		      PRE_HEAP = -1,
-		      POST_HEAP = -2
+		      IN_HEAP = 0,    ///< = 0.
 		      PRE_HEAP = -1,  ///< = -1.
 		      POST_HEAP = -2  ///< = -2.
 		    };
@@ -412,7 +414,7 @@
 		    /// The constructor.
-		    /// \param _index should be given to the constructor, since it is used
+		    /// \param map should be given to the constructor, since it is used
 		    /// internally to handle the cross references. The value of the map
 		    /// should be PRE_HEAP (-1) for each element.
 		    explicit SimpleBucketHeap(ItemIntMap &_index)
 		      : index(_index), free(-1), num(0), minimal(0) {}
 		    explicit SimpleBucketHeap(ItemIntMap &map)
 		      : _iim(map), _free(-1), _num(0), _minimum(0) {}
@@ -421,3 +423,3 @@
 		    /// The number of items stored in the heap.
-		    int size() const { return num; }
+		    int size() const { return _num; }
@@ -426,3 +428,3 @@
 		    /// Returns \c true if and only if the heap stores no items.
-		    bool empty() const { return num == 0; }
+		    bool empty() const { return _num == 0; }
@@ -435,3 +437,3 @@
 		    void clear() {
-		      data.clear(); first.clear(); free = -1; num = 0; minimal = 0;
+		      _data.clear(); _first.clear(); _free = -1; _num = 0; _minimum = 0;
+		    }
@@ -453,18 +455,18 @@
 		      int idx;
 		      if (free == -1) {
 		        idx = data.size();
-		        data.push_back(BucketItem(i));
+		      if (_free == -1) {
 		        idx = _data.size();
 		        _data.push_back(BucketItem(i));
 		      } else {
 		        idx = free;
 		        free = data[idx].next;
-		        data[idx].item = i;
+		        idx = _free;
 		        _free = _data[idx].next;
 		        _data[idx].item = i;
+		      }
 		      index[i] = idx;
 		      if (p >= int(first.size())) first.resize(p + 1, -1);
 		      data[idx].next = first[p];
 		      first[p] = idx;
 		      if (Direction::less(p, minimal)) {
 		        minimal = p;
 		      _iim[i] = idx;
 		      if (p >= int(_first.size())) _first.resize(p + 1, -1);
 		      _data[idx].next = _first[p];
 		      _first[p] = idx;
 		      if (Direction::less(p, _minimum)) {
 		        _minimum = p;
+		      }
-		      ++num;
+		      ++_num;
+		    }
@@ -476,6 +478,6 @@
 		    Item top() const {
 		      while (first[minimal] == -1) {
 		        Direction::increase(minimal);
 		      while (_first[_minimum] == -1) {
 		        Direction::increase(_minimum);
+		      }
-		      return data[first[minimal]].item;
+		      return _data[_first[_minimum]].item;
+		    }
@@ -487,6 +489,6 @@
 		    Prio prio() const {
 		      while (first[minimal] == -1) {
 		        Direction::increase(minimal);
 		      while (_first[_minimum] == -1) {
 		        Direction::increase(_minimum);
+		      }
-		      return minimal;
+		      return _minimum;
+		    }
@@ -498,11 +500,11 @@
 		    void pop() {
 		      while (first[minimal] == -1) {
 		        Direction::increase(minimal);
 		      while (_first[_minimum] == -1) {
 		        Direction::increase(_minimum);
+		      }
 		      int idx = first[minimal];
 		      index[data[idx].item] = -2;
 		      first[minimal] = data[idx].next;
 		      data[idx].next = free;
 		      free = idx;
 		      --num;
 		      int idx = _first[_minimum];
 		      _iim[_data[idx].item] = -2;
 		      _first[_minimum] = _data[idx].next;
 		      _data[idx].next = _free;
 		      _free = idx;
 		      --_num;
+		    }
@@ -518,9 +520,9 @@
 		    Prio operator[](const Item &i) const {
 		      for (int k = 0; k < first.size(); ++k) {
 		        int idx = first[k];
 		      for (int k = 0; k < _first.size(); ++k) {
 		        int idx = _first[k];
 		        while (idx != -1) {
-		          if (data[idx].item == i) {
+		          if (_data[idx].item == i) {
 		            return k;
+		          }
-		          idx = data[idx].next;
+		          idx = _data[idx].next;
+		        }
@@ -539,3 +541,3 @@
 		    State state(const Item &i) const {
-		      int idx = index[i];
+		      int idx = _iim[i];
 		      if (idx >= 0) idx = 0;
@@ -554,7 +556,7 @@
 		    ItemIntMap& index;
 		    std::vector<int> first;
 		    std::vector<BucketItem> data;
 		    int free, num;
-		    mutable int minimal;
+		    ItemIntMap& _iim;
 		    std::vector<int> _first;
 		    std::vector<BucketItem> _data;
 		    int _free, _num;
 		    mutable int _minimum;

lemon/fib_heap.h

Show inline comments

@@ -38,3 +38,3 @@
 		  ///priorities in such a way that finding the item with minimum priority is
-		  ///efficient. \c Compare specifies the ordering of the priorities. In a heap
+		  ///efficient. \c CMP specifies the ordering of the priorities. In a heap
 		  ///one can change the priority of an item, add or erase an item, etc.
@@ -45,7 +45,7 @@
 		  ///
 		  ///\param _Prio Type of the priority of the items.
 		  ///\param _ItemIntMap A read and writable Item int map, used internally
 		  ///\param PRIO Type of the priority of the items.
 		  ///\param IM A read and writable Item int map, used internally
 		  ///to handle the cross references.
 		  ///\param _Compare A class for the ordering of the priorities. The
 		  ///default is \c std::less<_Prio>.
 		  ///\param CMP A class for the ordering of the priorities. The
 		  ///default is \c std::less<PRIO>.
 		  ///
@@ -54,9 +54,5 @@
 		#ifdef DOXYGEN
 		  template <typename _Prio,
 		            typename _ItemIntMap,
-		            typename _Compare>
+		  template <typename PRIO, typename IM, typename CMP>
 		#else
 		  template <typename _Prio,
 		            typename _ItemIntMap,
-		            typename _Compare = std::less<_Prio> >
+		  template <typename PRIO, typename IM, typename CMP = std::less<PRIO> >
 		#endif
@@ -65,5 +61,5 @@
 		    ///\e
-		    typedef _ItemIntMap ItemIntMap;
+		    typedef IM ItemIntMap;
 		    ///\e
-		    typedef _Prio Prio;
+		    typedef PRIO Prio;
 		    ///\e
@@ -73,22 +69,27 @@
 		    ///\e
-		    typedef _Compare Compare;
+		    typedef CMP Compare;
 		  private:
-		    class store;
+		    class Store;
 		    std::vector<store> container;
 		    int minimum;
 		    ItemIntMap &iimap;
 		    Compare comp;
-		    int num_items;
+		    std::vector<Store> _data;
 		    int _minimum;
 		    ItemIntMap &_iim;
 		    Compare _comp;
 		    int _num;
 		  public:
-		    ///Status of the nodes
 		    /// \brief Type to represent the items states.
 		    ///
 		    /// Each Item element have a state associated to it. It may be "in heap",
 		    /// "pre heap" or "post heap". The latter two are indifferent from the
 		    /// heap's point of view, but may be useful to the user.
 		    ///
 		    /// The item-int map must be initialized in such way that it assigns
 		    /// \c PRE_HEAP (<tt>-1</tt>) to any element to be put in the heap.
 		    enum State {
 		      ///The node is in the heap
 		      IN_HEAP = 0,
 		      ///The node has never been in the heap
 		      PRE_HEAP = -1,
 		      ///The node was in the heap but it got out of it
 		      POST_HEAP = -2
 		      IN_HEAP = 0,    ///< = 0.
 		      PRE_HEAP = -1,  ///< = -1.
 		      POST_HEAP = -2  ///< = -2.
 		    };
@@ -97,6 +98,6 @@
 		    ///
-		    /// \c _iimap should be given to the constructor, since it is
+		    /// \c map should be given to the constructor, since it is
 		    ///   used internally to handle the cross references.
 		    explicit FibHeap(ItemIntMap &_iimap)
 		      : minimum(0), iimap(_iimap), num_items() {}
 		    explicit FibHeap(ItemIntMap &map)
 		      : _minimum(0), _iim(map), _num() {}
@@ -104,7 +105,7 @@
 		    ///
 		    /// \c _iimap should be given to the constructor, since it is used
 		    /// internally to handle the cross references. \c _comp is an
 		    /// \c map should be given to the constructor, since it is used
 		    /// internally to handle the cross references. \c comp is an
 		    /// object for ordering of the priorities.
 		    FibHeap(ItemIntMap &_iimap, const Compare &_comp)
 		      : minimum(0), iimap(_iimap), comp(_comp), num_items() {}
 		    FibHeap(ItemIntMap &map, const Compare &comp)
 		      : _minimum(0), _iim(map), _comp(comp), _num() {}
@@ -113,3 +114,3 @@
 		    /// Returns the number of items stored in the heap.
-		    int size() const { return num_items; }
+		    int size() const { return _num; }
@@ -118,3 +119,3 @@
 		    ///   Returns \c true if and only if the heap stores no items.
-		    bool empty() const { return num_items==0; }
+		    bool empty() const { return _num==0; }
@@ -127,3 +128,3 @@
 		    void clear() {
-		      container.clear(); minimum = 0; num_items = 0;
+		      _data.clear(); _minimum = 0; _num = 0;
+		    }
@@ -137,6 +138,6 @@
 		    void set (const Item& item, const Prio& value) {
 		      int i=iimap[item];
 		      if ( i >= 0 && container[i].in ) {
 		        if ( comp(value, container[i].prio) ) decrease(item, value);
 		        if ( comp(container[i].prio, value) ) increase(item, value);
 		      int i=_iim[item];
 		      if ( i >= 0 && _data[i].in ) {
 		        if ( _comp(value, _data[i].prio) ) decrease(item, value);
 		        if ( _comp(_data[i].prio, value) ) increase(item, value);
 		      } else push(item, value);
@@ -149,29 +150,29 @@
 		    void push (const Item& item, const Prio& value) {
-		      int i=iimap[item];
+		      int i=_iim[item];
 		      if ( i < 0 ) {
 		        int s=container.size();
 		        iimap.set( item, s );
-		        store st;
+		        int s=_data.size();
 		        _iim.set( item, s );
 		        Store st;
 		        st.name=item;
-		        container.push_back(st);
+		        _data.push_back(st);
 		        i=s;
 		      } else {
 		        container[i].parent=container[i].child=-1;
 		        container[i].degree=0;
 		        container[i].in=true;
 		        container[i].marked=false;
 		        _data[i].parent=_data[i].child=-1;
 		        _data[i].degree=0;
 		        _data[i].in=true;
 		        _data[i].marked=false;
+		      }
 		      if ( num_items ) {
 		        container[container[minimum].right_neighbor].left_neighbor=i;
 		        container[i].right_neighbor=container[minimum].right_neighbor;
 		        container[minimum].right_neighbor=i;
 		        container[i].left_neighbor=minimum;
 		        if ( comp( value, container[minimum].prio) ) minimum=i;
 		      if ( _num ) {
 		        _data[_data[_minimum].right_neighbor].left_neighbor=i;
 		        _data[i].right_neighbor=_data[_minimum].right_neighbor;
 		        _data[_minimum].right_neighbor=i;
 		        _data[i].left_neighbor=_minimum;
 		        if ( _comp( value, _data[_minimum].prio) ) _minimum=i;
 		      } else {
 		        container[i].right_neighbor=container[i].left_neighbor=i;
 		        minimum=i;
 		        _data[i].right_neighbor=_data[i].left_neighbor=i;
 		        _minimum=i;
+		      }
 		      container[i].prio=value;
 		      ++num_items;
 		      _data[i].prio=value;
 		      ++_num;
+		    }
@@ -183,3 +184,3 @@
 		    /// \pre The heap must be nonempty.
-		    Item top() const { return container[minimum].name; }
+		    Item top() const { return _data[_minimum].name; }
@@ -189,3 +190,3 @@
 		    /// \pre The heap must be nonempty.
-		    const Prio& prio() const { return container[minimum].prio; }
+		    const Prio& prio() const { return _data[_minimum].prio; }
@@ -196,3 +197,3 @@
 		    const Prio& operator[](const Item& item) const {
-		      return container[iimap[item]].prio;
+		      return _data[_iim[item]].prio;
+		    }
@@ -206,7 +207,7 @@
 		      /*The first case is that there are only one root.*/
 		      if ( container[minimum].left_neighbor==minimum ) {
 		        container[minimum].in=false;
 		        if ( container[minimum].degree!=0 ) {
 		          makeroot(container[minimum].child);
-		          minimum=container[minimum].child;
+		      if ( _data[_minimum].left_neighbor==_minimum ) {
 		        _data[_minimum].in=false;
 		        if ( _data[_minimum].degree!=0 ) {
 		          makeroot(_data[_minimum].child);
 		          _minimum=_data[_minimum].child;
 		          balance();
@@ -214,9 +215,9 @@
 		      } else {
 		        int right=container[minimum].right_neighbor;
 		        unlace(minimum);
 		        container[minimum].in=false;
 		        if ( container[minimum].degree > 0 ) {
 		          int left=container[minimum].left_neighbor;
 		          int child=container[minimum].child;
-		          int last_child=container[child].left_neighbor;
+		        int right=_data[_minimum].right_neighbor;
 		        unlace(_minimum);
 		        _data[_minimum].in=false;
 		        if ( _data[_minimum].degree > 0 ) {
 		          int left=_data[_minimum].left_neighbor;
 		          int child=_data[_minimum].child;
 		          int last_child=_data[child].left_neighbor;
@@ -224,11 +225,11 @@
 		          container[left].right_neighbor=child;
 		          container[child].left_neighbor=left;
 		          container[right].left_neighbor=last_child;
 		          container[last_child].right_neighbor=right;
 		          _data[left].right_neighbor=child;
 		          _data[child].left_neighbor=left;
 		          _data[right].left_neighbor=last_child;
 		          _data[last_child].right_neighbor=right;
+		        }
-		        minimum=right;
+		        _minimum=right;
 		        balance();
 		      } // the case where there are more roots
-		      --num_items;
+		      --_num;
+		    }
@@ -240,7 +241,7 @@
 		    void erase (const Item& item) {
-		      int i=iimap[item];
+		      int i=_iim[item];
 		      if ( i >= 0 && container[i].in ) {
 		        if ( container[i].parent!=-1 ) {
-		          int p=container[i].parent;
+		      if ( i >= 0 && _data[i].in ) {
 		        if ( _data[i].parent!=-1 ) {
 		          int p=_data[i].parent;
 		          cut(i,p);
@@ -248,3 +249,3 @@
+		        }
-		        minimum=i;     //As if its prio would be -infinity
+		        _minimum=i;     //As if its prio would be -infinity
 		        pop();
@@ -259,7 +260,7 @@
 		    void decrease (Item item, const Prio& value) {
 		      int i=iimap[item];
 		      container[i].prio=value;
-		      int p=container[i].parent;
+		      int i=_iim[item];
 		      _data[i].prio=value;
 		      int p=_data[i].parent;
-		      if ( p!=-1 && comp(value, container[p].prio) ) {
+		      if ( p!=-1 && _comp(value, _data[p].prio) ) {
 		        cut(i,p);
@@ -267,3 +268,3 @@
+		      }
-		      if ( comp(value, container[minimum].prio) ) minimum=i;
+		      if ( _comp(value, _data[_minimum].prio) ) _minimum=i;
+		    }
@@ -291,5 +292,5 @@
 		    State state(const Item &item) const {
-		      int i=iimap[item];
+		      int i=_iim[item];
 		      if( i>=0 ) {
-		        if ( container[i].in ) i=0;
+		        if ( _data[i].in ) i=0;
 		        else i=-2;
@@ -303,3 +304,3 @@
 		    /// manually clear the heap when it is important to achive the
-		    /// better time complexity.
+		    /// better time _complexity.
 		    /// \param i The item.
@@ -313,3 +314,3 @@
+		        }
-		        iimap[i] = st;
+		        _iim[i] = st;
 		        break;
@@ -324,3 +325,3 @@
-		      int maxdeg=int( std::floor( 2.08*log(double(container.size()))))+1;
+		      int maxdeg=int( std::floor( 2.08*log(double(_data.size()))))+1;
@@ -332,4 +333,4 @@
 		       */
 		      int anchor=container[minimum].left_neighbor;
 		      int next=minimum;
 		      int anchor=_data[_minimum].left_neighbor;
 		      int next=_minimum;
 		      bool end=false;
@@ -339,7 +340,7 @@
 		        if ( anchor==active ) end=true;
 		        int d=container[active].degree;
 		        next=container[active].right_neighbor;
 		        int d=_data[active].degree;
 		        next=_data[active].right_neighbor;
 		        while (A[d]!=-1) {
-		          if( comp(container[active].prio, container[A[d]].prio) ) {
+		          if( _comp(_data[active].prio, _data[A[d]].prio) ) {
 		            fuse(active,A[d]);
@@ -356,9 +357,9 @@
 		      while ( container[minimum].parent >=0 )
 		        minimum=container[minimum].parent;
 		      int s=minimum;
 		      int m=minimum;
 		      while ( _data[_minimum].parent >=0 )
 		        _minimum=_data[_minimum].parent;
 		      int s=_minimum;
 		      int m=_minimum;
 		      do {
 		        if ( comp(container[s].prio, container[minimum].prio) ) minimum=s;
 		        s=container[s].right_neighbor;
 		        if ( _comp(_data[s].prio, _data[_minimum].prio) ) _minimum=s;
 		        s=_data[s].right_neighbor;
 		      } while ( s != m );
@@ -369,4 +370,4 @@
 		      do {
 		        container[s].parent=-1;
 		        s=container[s].right_neighbor;
 		        _data[s].parent=-1;
 		        s=_data[s].right_neighbor;
 		      } while ( s != c );
@@ -378,8 +379,8 @@
 		       */
-		      --container[b].degree;
+		      --_data[b].degree;
 		      if ( container[b].degree !=0 ) {
 		        int child=container[b].child;
 		      if ( _data[b].degree !=0 ) {
 		        int child=_data[b].child;
 		        if ( child==a )
-		          container[b].child=container[child].right_neighbor;
+		          _data[b].child=_data[child].right_neighbor;
 		        unlace(a);
@@ -389,10 +390,10 @@
 		      /*Lacing a to the roots.*/
 		      int right=container[minimum].right_neighbor;
 		      container[minimum].right_neighbor=a;
 		      container[a].left_neighbor=minimum;
 		      container[a].right_neighbor=right;
-		      container[right].left_neighbor=a;
+		      int right=_data[_minimum].right_neighbor;
 		      _data[_minimum].right_neighbor=a;
 		      _data[a].left_neighbor=_minimum;
 		      _data[a].right_neighbor=right;
 		      _data[right].left_neighbor=a;
 		      container[a].parent=-1;
 		      container[a].marked=false;
 		      _data[a].parent=-1;
 		      _data[a].marked=false;
+		    }
@@ -400,6 +401,6 @@
 		    void cascade(int a) {
 		      if ( container[a].parent!=-1 ) {
 		        int p=container[a].parent;
 		      if ( _data[a].parent!=-1 ) {
 		        int p=_data[a].parent;
-		        if ( container[a].marked==false ) container[a].marked=true;
+		        if ( _data[a].marked==false ) _data[a].marked=true;
 		        else {
@@ -415,20 +416,20 @@
 		      /*Lacing b under a.*/
-		      container[b].parent=a;
+		      _data[b].parent=a;
 		      if (container[a].degree==0) {
 		        container[b].left_neighbor=b;
 		        container[b].right_neighbor=b;
 		        container[a].child=b;
 		      if (_data[a].degree==0) {
 		        _data[b].left_neighbor=b;
 		        _data[b].right_neighbor=b;
 		        _data[a].child=b;
 		      } else {
 		        int child=container[a].child;
 		        int last_child=container[child].left_neighbor;
 		        container[child].left_neighbor=b;
 		        container[b].right_neighbor=child;
 		        container[last_child].right_neighbor=b;
 		        container[b].left_neighbor=last_child;
 		        int child=_data[a].child;
 		        int last_child=_data[child].left_neighbor;
 		        _data[child].left_neighbor=b;
 		        _data[b].right_neighbor=child;
 		        _data[last_child].right_neighbor=b;
 		        _data[b].left_neighbor=last_child;
+		      }
-		      ++container[a].degree;
+		      ++_data[a].degree;
-		      container[b].marked=false;
+		      _data[b].marked=false;
+		    }
@@ -439,6 +440,6 @@
 		    void unlace(int a) {
 		      int leftn=container[a].left_neighbor;
 		      int rightn=container[a].right_neighbor;
 		      container[leftn].right_neighbor=rightn;
 		      container[rightn].left_neighbor=leftn;
 		      int leftn=_data[a].left_neighbor;
 		      int rightn=_data[a].right_neighbor;
 		      _data[leftn].right_neighbor=rightn;
 		      _data[rightn].left_neighbor=leftn;
+		    }
@@ -446,3 +447,3 @@
-		    class store {
+		    class Store {
 		      friend class FibHeap;
@@ -459,3 +460,3 @@
-		      store() : parent(-1), child(-1), degree(), marked(false), in(true) {}
+		      Store() : parent(-1), child(-1), degree(), marked(false), in(true) {}
 		    };

lemon/radix_heap.h

Show inline comments

@@ -43,3 +43,3 @@
 		  ///
-		  /// \param _ItemIntMap A read and writable Item int map, used internally
+		  /// \param IM A read and writable Item int map, used internally
 		  /// to handle the cross references.
@@ -48,3 +48,3 @@
 		  /// \see Dijkstra
-		  template <typename _ItemIntMap>
+		  template <typename IM>
 		  class RadixHeap {
@@ -52,5 +52,5 @@
 		  public:
-		    typedef typename _ItemIntMap::Key Item;
+		    typedef typename IM::Key Item;
 		    typedef int Prio;
-		    typedef _ItemIntMap ItemIntMap;
+		    typedef IM ItemIntMap;
@@ -101,3 +101,3 @@
-		    ItemIntMap &iim;
+		    ItemIntMap &_iim;
@@ -109,3 +109,3 @@
 		    ///
-		    /// \param _iim It should be given to the constructor, since it is used
+		    /// \param map It should be given to the constructor, since it is used
 		    /// internally to handle the cross references. The value of the map
@@ -115,4 +115,4 @@
 		    /// \param capacity It determines the initial capacity of the heap.
 		    RadixHeap(ItemIntMap &_iim, int minimal = 0, int capacity = 0)
 		      : iim(_iim) {
 		    RadixHeap(ItemIntMap &map, int minimal = 0, int capacity = 0)
 		      : _iim(map) {
 		      boxes.push_back(RadixBox(minimal, 1));
@@ -270,3 +270,3 @@
+		        }
-		        iim[data[index].item] = index;
+		        _iim[data[index].item] = index;
+		      }
@@ -284,3 +284,3 @@
 		      int n = data.size();
-		      iim.set(i, n);
+		      _iim.set(i, n);
 		      data.push_back(RadixItem(i, p));
@@ -318,3 +318,3 @@
 		      int index = boxes[0].first;
-		      iim[data[index].item] = POST_HEAP;
+		      _iim[data[index].item] = POST_HEAP;
 		      remove(index);
@@ -329,4 +329,4 @@
 		    void erase(const Item &i) {
 		      int index = iim[i];
 		      iim[i] = POST_HEAP;
 		      int index = _iim[i];
 		      _iim[i] = POST_HEAP;
 		      remove(index);
@@ -341,3 +341,3 @@
 		    Prio operator[](const Item &i) const {
-		      int idx = iim[i];
+		      int idx = _iim[i];
 		      return data[idx].prio;
@@ -354,3 +354,3 @@
 		    void set(const Item &i, const Prio &p) {
-		      int idx = iim[i];
+		      int idx = _iim[i];
 		      if( idx < 0 ) {
@@ -376,3 +376,3 @@
 		    void decrease(const Item &i, const Prio &p) {
-		      int idx = iim[i];
+		      int idx = _iim[i];
 		      data[idx].prio = p;
@@ -388,3 +388,3 @@
 		    void increase(const Item &i, const Prio &p) {
-		      int idx = iim[i];
+		      int idx = _iim[i];
 		      data[idx].prio = p;
@@ -402,3 +402,3 @@
 		    State state(const Item &i) const {
-		      int s = iim[i];
+		      int s = _iim[i];
 		      if( s >= 0 ) s = 0;
@@ -421,3 +421,3 @@
+		        }
-		        iim[i] = st;
+		        _iim[i] = st;
 		        break;

0 comments (0 inline)

RhodeCode

Login to your account