[Lemon-commits] Alpar Juttner: Back out 4 changesets (#50, #312)
Lemon HG
hg at lemon.cs.elte.hu
Fri Feb 26 17:46:53 CET 2010
details: http://lemon.cs.elte.hu/hg/lemon/rev/37f440367057
changeset: 912:37f440367057
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Fri Feb 26 17:07:13 2010 +0100
description:
Back out 4 changesets (#50, #312)
- 532697c9fa53
- bb8c4cd57900
- 9f529abcaebf
- 703ebf476a1d
diffstat:
lemon/Makefile.am | 3 -
lemon/bin_heap.h | 12 +-
lemon/bits/map_extender.h | 4 -
lemon/bucket_heap.h | 567 -----------------------------------------------
lemon/concepts/maps.h | 3 +-
lemon/fib_heap.h | 468 ---------------------------------------
lemon/radix_heap.h | 433 ------------------------------------
test/heap_test.cc | 37 ---
8 files changed, 7 insertions(+), 1520 deletions(-)
diffs (truncated from 1638 to 300 lines):
diff --git a/lemon/Makefile.am b/lemon/Makefile.am
--- a/lemon/Makefile.am
+++ b/lemon/Makefile.am
@@ -59,7 +59,6 @@
lemon/assert.h \
lemon/bfs.h \
lemon/bin_heap.h \
- lemon/bucket_heap.h \
lemon/cbc.h \
lemon/circulation.h \
lemon/clp.h \
@@ -77,7 +76,6 @@
lemon/elevator.h \
lemon/error.h \
lemon/euler.h \
- lemon/fib_heap.h \
lemon/full_graph.h \
lemon/glpk.h \
lemon/gomory_hu.h \
@@ -101,7 +99,6 @@
lemon/network_simplex.h \
lemon/path.h \
lemon/preflow.h \
- lemon/radix_heap.h \
lemon/radix_sort.h \
lemon/random.h \
lemon/smart_graph.h \
diff --git a/lemon/bin_heap.h b/lemon/bin_heap.h
--- a/lemon/bin_heap.h
+++ b/lemon/bin_heap.h
@@ -33,23 +33,23 @@
///
///\brief A Binary Heap implementation.
///
- ///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 CMP specifies the ordering of the priorities.
+ ///priority is efficient. \c Comp specifies the ordering of the priorities.
///In a heap one can change the priority of an item, add or erase an
///item, etc.
///
///\tparam PR Type of the priority of the items.
///\tparam IM A read and writable item map with int values, used internally
///to handle the cross references.
- ///\tparam CMP A functor class for the ordering of the priorities.
+ ///\tparam Comp A functor class for the ordering of the priorities.
///The default is \c std::less<PR>.
///
///\sa FibHeap
///\sa Dijkstra
- template <typename PR, typename IM, typename CMP = std::less<PR> >
+ template <typename PR, typename IM, typename Comp = std::less<PR> >
class BinHeap {
public:
@@ -62,7 +62,7 @@
///\e
typedef std::pair<Item,Prio> Pair;
///\e
- typedef CMP Compare;
+ typedef Comp Compare;
/// \brief Type to represent the items states.
///
diff --git a/lemon/bits/map_extender.h b/lemon/bits/map_extender.h
--- a/lemon/bits/map_extender.h
+++ b/lemon/bits/map_extender.h
@@ -49,8 +49,6 @@
typedef typename Parent::Reference Reference;
typedef typename Parent::ConstReference ConstReference;
- typedef typename Parent::ReferenceMapTag ReferenceMapTag;
-
class MapIt;
class ConstMapIt;
@@ -193,8 +191,6 @@
typedef typename Parent::Reference Reference;
typedef typename Parent::ConstReference ConstReference;
- typedef typename Parent::ReferenceMapTag ReferenceMapTag;
-
class MapIt;
class ConstMapIt;
diff --git a/lemon/bucket_heap.h b/lemon/bucket_heap.h
deleted file mode 100644
--- a/lemon/bucket_heap.h
+++ /dev/null
@@ -1,567 +0,0 @@
-/* -*- mode: C++; indent-tabs-mode: nil; -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library.
- *
- * Copyright (C) 2003-2009
- * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
- * (Egervary Research Group on Combinatorial Optimization, EGRES).
- *
- * Permission to use, modify and distribute this software is granted
- * provided that this copyright notice appears in all copies. For
- * precise terms see the accompanying LICENSE file.
- *
- * This software is provided "AS IS" with no warranty of any kind,
- * express or implied, and with no claim as to its suitability for any
- * purpose.
- *
- */
-
-#ifndef LEMON_BUCKET_HEAP_H
-#define LEMON_BUCKET_HEAP_H
-
-///\ingroup auxdat
-///\file
-///\brief Bucket Heap implementation.
-
-#include <vector>
-#include <utility>
-#include <functional>
-
-namespace lemon {
-
- namespace _bucket_heap_bits {
-
- template <bool MIN>
- struct DirectionTraits {
- static bool less(int left, int right) {
- return left < right;
- }
- static void increase(int& value) {
- ++value;
- }
- };
-
- template <>
- struct DirectionTraits<false> {
- static bool less(int left, int right) {
- return left > right;
- }
- static void increase(int& value) {
- --value;
- }
- };
-
- }
-
- /// \ingroup auxdat
- ///
- /// \brief A Bucket Heap implementation.
- ///
- /// This class implements the \e bucket \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. The bucket heap is very simple implementation, it can store
- /// only integer priorities and it stores for each priority in the
- /// \f$ [0..C) \f$ range a list of items. So it should be used only when
- /// the priorities are small. It is not intended to use as dijkstra heap.
- ///
- /// \param IM A read and write Item int map, used internally
- /// to handle the cross references.
- /// \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 {
-
- public:
- /// \e
- typedef typename IM::Key Item;
- /// \e
- typedef int Prio;
- /// \e
- typedef std::pair<Item, Prio> Pair;
- /// \e
- typedef IM ItemIntMap;
-
- private:
-
- typedef _bucket_heap_bits::DirectionTraits<MIN> Direction;
-
- public:
-
- /// \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 {
- IN_HEAP = 0, ///< = 0.
- PRE_HEAP = -1, ///< = -1.
- POST_HEAP = -2 ///< = -2.
- };
-
- public:
- /// \brief The constructor.
- ///
- /// The constructor.
- /// \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 &map) : _iim(map), _minimum(0) {}
-
- /// The number of items stored in the heap.
- ///
- /// \brief Returns the number of items stored in the heap.
- int size() const { return _data.size(); }
-
- /// \brief Checks if the heap stores no items.
- ///
- /// Returns \c true if and only if the heap stores no items.
- bool empty() const { return _data.empty(); }
-
- /// \brief Make empty this heap.
- ///
- /// Make empty this heap. It does not change the cross reference
- /// map. If you want to reuse a heap what is not surely empty you
- /// should first clear the heap and after that you should set the
- /// cross reference map for each item to \c PRE_HEAP.
- void clear() {
- _data.clear(); _first.clear(); _minimum = 0;
- }
-
- private:
-
- 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;
- } else {
- _first[_data[idx].value] = idx;
- }
- if (_data[idx].next != -1) {
- _data[_data[idx].next].prev = idx;
- }
- _iim[_data[idx].item] = idx;
- }
- _data.pop_back();
- }
-
- void unlace(int idx) {
- if (_data[idx].prev != -1) {
- _data[_data[idx].prev].next = _data[idx].next;
- } else {
- _first[_data[idx].value] = _data[idx].next;
- }
- if (_data[idx].next != -1) {
- _data[_data[idx].next].prev = _data[idx].prev;
- }
- }
-
- void lace(int idx) {
- 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;
- }
- _first[_data[idx].value] = idx;
- _data[idx].prev = -1;
- }
-
- 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 Pair& p) {
- push(p.first, p.second);
- }
-
- /// \brief Insert an item into the heap with the given priority.
- ///
- /// 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 Item &i, const Prio &p) {
- int idx = _data.size();
- _iim[i] = idx;
- _data.push_back(BucketItem(i, p));
- lace(idx);
- if (Direction::less(p, _minimum)) {
- _minimum = p;
- }
- }
-
- /// \brief Returns the item with minimum priority.
- ///
- /// This method returns the item with minimum priority.
- /// \pre The heap must be nonempty.
- Item top() const {
- while (_first[_minimum] == -1) {
- Direction::increase(_minimum);
More information about the Lemon-commits
mailing list