[Lemon-commits] Alpar Juttner: Merge #419 to branch 1.1
Lemon HG
hg at lemon.cs.elte.hu
Wed Jul 13 15:32:53 CEST 2011
details: http://lemon.cs.elte.hu/hg/lemon/rev/40bbb450143e
changeset: 1064:40bbb450143e
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Wed Jul 13 14:40:05 2011 +0200
description:
Merge #419 to branch 1.1
diffstat:
cmake/FindCOIN.cmake | 16 +-
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/CMakeLists.txt | 2 +
test/heap_test.cc | 37 +++
10 files changed, 1535 insertions(+), 10 deletions(-)
diffs (truncated from 1730 to 300 lines):
diff --git a/cmake/FindCOIN.cmake b/cmake/FindCOIN.cmake
--- a/cmake/FindCOIN.cmake
+++ b/cmake/FindCOIN.cmake
@@ -5,42 +5,52 @@
)
FIND_LIBRARY(COIN_CBC_LIBRARY
NAMES Cbc libCbc
+ HINTS ${COIN_ROOT_DIR}/lib/coin
HINTS ${COIN_ROOT_DIR}/lib
)
FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY
NAMES CbcSolver libCbcSolver
+ HINTS ${COIN_ROOT_DIR}/lib/coin
HINTS ${COIN_ROOT_DIR}/lib
)
FIND_LIBRARY(COIN_CGL_LIBRARY
NAMES Cgl libCgl
+ HINTS ${COIN_ROOT_DIR}/lib/coin
HINTS ${COIN_ROOT_DIR}/lib
)
FIND_LIBRARY(COIN_CLP_LIBRARY
NAMES Clp libClp
+ HINTS ${COIN_ROOT_DIR}/lib/coin
HINTS ${COIN_ROOT_DIR}/lib
)
FIND_LIBRARY(COIN_COIN_UTILS_LIBRARY
NAMES CoinUtils libCoinUtils
+ HINTS ${COIN_ROOT_DIR}/lib/coin
HINTS ${COIN_ROOT_DIR}/lib
)
FIND_LIBRARY(COIN_OSI_LIBRARY
NAMES Osi libOsi
+ HINTS ${COIN_ROOT_DIR}/lib/coin
HINTS ${COIN_ROOT_DIR}/lib
)
FIND_LIBRARY(COIN_OSI_CBC_LIBRARY
NAMES OsiCbc libOsiCbc
+ HINTS ${COIN_ROOT_DIR}/lib/coin
HINTS ${COIN_ROOT_DIR}/lib
)
FIND_LIBRARY(COIN_OSI_CLP_LIBRARY
NAMES OsiClp libOsiClp
+ HINTS ${COIN_ROOT_DIR}/lib/coin
HINTS ${COIN_ROOT_DIR}/lib
)
FIND_LIBRARY(COIN_OSI_VOL_LIBRARY
NAMES OsiVol libOsiVol
+ HINTS ${COIN_ROOT_DIR}/lib/coin
HINTS ${COIN_ROOT_DIR}/lib
)
FIND_LIBRARY(COIN_VOL_LIBRARY
NAMES Vol libVol
+ HINTS ${COIN_ROOT_DIR}/lib/coin
HINTS ${COIN_ROOT_DIR}/lib
)
@@ -55,13 +65,13 @@
COIN_OSI_LIBRARY
COIN_OSI_CBC_LIBRARY
COIN_OSI_CLP_LIBRARY
- COIN_OSI_VOL_LIBRARY
- COIN_VOL_LIBRARY
+ # COIN_OSI_VOL_LIBRARY
+ # COIN_VOL_LIBRARY
)
IF(COIN_FOUND)
SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR})
- SET(COIN_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_OSI_VOL_LIBRARY};${COIN_VOL_LIBRARY}")
+ SET(COIN_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY}")
SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}")
SET(COIN_CBC_LIBRARIES ${COIN_LIBRARIES})
ENDIF(COIN_FOUND)
diff --git a/lemon/Makefile.am b/lemon/Makefile.am
--- a/lemon/Makefile.am
+++ b/lemon/Makefile.am
@@ -59,6 +59,7 @@
lemon/assert.h \
lemon/bfs.h \
lemon/bin_heap.h \
+ lemon/bucket_heap.h \
lemon/cbc.h \
lemon/circulation.h \
lemon/clp.h \
@@ -76,6 +77,7 @@
lemon/elevator.h \
lemon/error.h \
lemon/euler.h \
+ lemon/fib_heap.h \
lemon/full_graph.h \
lemon/glpk.h \
lemon/gomory_hu.h \
@@ -98,6 +100,7 @@
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 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
///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 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>.
///
///\sa FibHeap
///\sa Dijkstra
- template <typename PR, typename IM, typename Comp = std::less<PR> >
+ template <typename PR, typename IM, typename CMP = std::less<PR> >
class BinHeap {
public:
@@ -62,7 +62,7 @@
///\e
typedef std::pair<Item,Prio> Pair;
///\e
- typedef Comp Compare;
+ typedef CMP 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,6 +49,8 @@
typedef typename Parent::Reference Reference;
typedef typename Parent::ConstReference ConstReference;
+ typedef typename Parent::ReferenceMapTag ReferenceMapTag;
+
class MapIt;
class ConstMapIt;
@@ -191,6 +193,8 @@
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
new file mode 100644
--- /dev/null
+++ b/lemon/bucket_heap.h
@@ -0,0 +1,567 @@
+/* -*- 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;
+ }
More information about the Lemon-commits
mailing list