lemon-0.x: comparison lemon/bin

equal deleted inserted replaced

-:8a5bb5b89a25
+:b6db6581cf03
 ///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 Compare specifies the ordering of the priorities. In a heap
 ///one can change the priority of an item, add or erase an item, etc.
 ///
-///\param Prio Type of the priority of the items.
+///\param _Prio Type of the priority of the items.
-///\param ItemIntMap A read and writable Item int map, used internally
+///\param _ItemIntMap 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
+///\param _Compare A class for the ordering of the priorities. The
-///default is \c std::less<Prio>.
+///default is \c std::less<_Prio>.
 ///
 ///\sa FibHeap
 ///\sa Dijkstra
-template <typename Prio, typename ItemIntMap,
+template <typename _Prio, typename _ItemIntMap,
-	    typename Compare = std::less<Prio> >
+	    typename _Compare = std::less<_Prio> >
 class BinHeap {
 public:
-typedef typename ItemIntMap::Key         ItemType;
+typedef _ItemIntMap ItemIntMap;
-typedef Prio                             PrioType;
+typedef _Prio Prio;
-typedef std::pair<ItemType,PrioType>     PairType;
+typedef typename ItemIntMap::Key Item;
-typedef ItemIntMap                       ItemIntMapType;
+typedef std::pair<Item,Prio> Pair;
-typedef Compare                          PrioCompare;
+typedef _Compare Compare;
 /// \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 ItemIntMap \e should be initialized in such way that it maps
 /// PRE_HEAP (-1) to any element to be put in the heap...
-enum state_enum {
+enum State {
 IN_HEAP = 0,
 PRE_HEAP = -1,
 POST_HEAP = -2
 };
 private:
-std::vector<PairType> data;
+std::vector<Pair> data;
 Compare comp;
 ItemIntMap &iim;
 public:
 /// \brief The constructor.
 private:
 static int parent(int i) { return (i-1)/2; }
 static int second_child(int i) { return 2*i+2; }
-bool less(const PairType &p1, const PairType &p2) const {
+bool less(const Pair &p1, const Pair &p2) const {
 return comp(p1.second, p2.second);
 }
-int bubble_up(int hole, PairType p) {
+int bubble_up(int hole, Pair p) {
 int par = parent(hole);
 while( hole>0 && less(p,data[par]) ) {
 	move(data[par],hole);
 	hole = par;
 	par = parent(hole);
 }
 move(p, hole);
 return hole;
 }
-int bubble_down(int hole, PairType p, int length) {
+int bubble_down(int hole, Pair p, int length) {
 int child = second_child(hole);
 while(child < length) {
 	if( less(data[child-1], data[child]) ) {
 	  --child;
 	}
 ok:
 move(p, hole);
 return hole;
 }
-void move(const PairType &p, int i) {
+void move(const Pair &p, int i) {
 data[i] = p;
 iim.set(p.first, i);
 }
 public:
 /// \brief Insert a pair of item and priority into the heap.
 ///
 /// Adds \c p.first to the heap with priority \c p.second.
 /// \param p The pair to insert.
-void push(const PairType &p) {
+void push(const Pair &p) {
 int n = data.size();
 data.resize(n+1);
 bubble_up(n, p);
 }
 /// \brief Insert an item into the heap with the given heap.
 ///
 /// Adds \c i to the heap with priority \c p.
 /// \param i The item to insert.
 /// \param p The priority of the item.
-void push(const ItemType &i, const Prio &p) { push(PairType(i,p)); }
+void push(const Item &i, const Prio &p) { push(Pair(i,p)); }
 /// \brief Returns the item with minimum priority relative to \c Compare.
 ///
 /// This method returns the item with minimum priority relative to \c
 /// Compare.
 /// \pre The heap must be nonempty.
-ItemType top() const {
+Item top() const {
 return data[0].first;
 }
 /// \brief Returns the minimum priority relative to \c Compare.
 ///
 /// \brief Deletes \c i from the heap.
 ///
 /// This method deletes item \c i from the heap.
 /// \param i The item to erase.
 /// \pre The item should be in the heap.
-void erase(const ItemType &i) {
+void erase(const Item &i) {
 int h = iim[i];
 int n = data.size()-1;
 iim.set(data[h].first, POST_HEAP);
 if( h < n ) {
 	if ( bubble_up(h, data[n]) == h) {
 /// \brief Returns the priority of \c i.
 ///
 /// This function returns the priority of item \c i.
 /// \pre \c i must be in the heap.
 /// \param i The item.
-Prio operator[](const ItemType &i) const {
+Prio operator[](const Item &i) const {
 int idx = iim[i];
 return data[idx].second;
 }
 /// \brief \c i gets to the heap with priority \c p independently
 ///
 /// This method calls \ref push(\c i, \c p) if \c i is not stored
 /// in the heap and sets the priority of \c i to \c p otherwise.
 /// \param i The item.
 /// \param p The priority.
-void set(const ItemType &i, const Prio &p) {
+void set(const Item &i, const Prio &p) {
 int idx = iim[i];
 if( idx < 0 ) {
 	push(i,p);
 }
 else if( comp(p, data[idx].second) ) {
-	bubble_up(idx, PairType(i,p));
+	bubble_up(idx, Pair(i,p));
 }
 else {
-	bubble_down(idx, PairType(i,p), data.size());
+	bubble_down(idx, Pair(i,p), data.size());
 }
 }
 /// \brief Decreases the priority of \c i to \c p.
 ///
 /// This method decreases the priority of item \c i to \c p.
 /// \pre \c i must be stored in the heap with priority at least \c
 /// p relative to \c Compare.
 /// \param i The item.
 /// \param p The priority.
-void decrease(const ItemType &i, const Prio &p) {
+void decrease(const Item &i, const Prio &p) {
 int idx = iim[i];
-bubble_up(idx, PairType(i,p));
+bubble_up(idx, Pair(i,p));
 }
 /// \brief Increases the priority of \c i to \c p.
 ///
 /// This method sets the priority of item \c i to \c p.
 /// \pre \c i must be stored in the heap with priority at most \c
 /// p relative to \c Compare.
 /// \param i The item.
 /// \param p The priority.
-void increase(const ItemType &i, const Prio &p) {
+void increase(const Item &i, const Prio &p) {
 int idx = iim[i];
-bubble_down(idx, PairType(i,p), data.size());
+bubble_down(idx, Pair(i,p), data.size());
 }
 /// \brief Returns if \c item is in, has already been in, or has
 /// never been in the heap.
 ///
 /// This method returns PRE_HEAP if \c item has never been in the
 /// heap, IN_HEAP if it is in the heap at the moment, and POST_HEAP
 /// otherwise. In the latter case it is possible that \c item will
 /// get back to the heap again.
 /// \param i The item.
-state_enum state(const ItemType &i) const {
+State state(const Item &i) const {
 int s = iim[i];
 if( s>=0 )
 	s=0;
-return state_enum(s);
+return State(s);
 }
 /// \brief Sets the state of the \c item in the heap.
 ///
 /// Sets the state of the \c item in the heap. It can be used to
 /// manually clear the heap when it is important to achive the
 /// better time complexity.
 /// \param i The item.
 /// \param st The state. It should not be \c IN_HEAP.
-void state(const ItemType& i, state_enum st) {
+void state(const Item& i, State st) {
 switch (st) {
 case POST_HEAP:
 case PRE_HEAP:
 if (state(i) == IN_HEAP) {
 erase(i);

changeset 2547	f393a8162688
parent 2546	b5eba564bb60
child 2548	a3ba22ebccc6