Changeset 2547:f393a8162688 in lemon-0.x for lemon/radix_heap.h

Timestamp:

12/27/07 14:40:16 (16 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3424

Message:

Renaming state_enum to State
Removing "Type" suffix from typedefs
Moving implementation into the class definition

File:

• lemon/radix_heap.h (modified) (5 diffs)

lemon/radix_heap.h

@@ -29 +29 @@
 namespace lemon {
 
-  /// \brief Exception thrown by RadixHeap.
-  ///  
-  /// This Exception is thrown when a smaller priority
-  /// is inserted into the \e RadixHeap then the last time erased.
-  /// \see RadixHeap
-  /// \author Balazs Dezso
-
-  class UnderFlowPriorityError : public RuntimeError {
-  public:
-    virtual const char* what() const throw() {
-      return "lemon::UnderFlowPriorityError";
-    }  
-  };
 
   /// \ingroup auxdata
@@ -70 +57 @@
     typedef _ItemIntMap ItemIntMap;
 
+    /// \brief Exception thrown by RadixHeap.
+    ///  
+    /// This Exception is thrown when a smaller priority
+    /// is inserted into the \e RadixHeap then the last time erased.
+    /// \see RadixHeap
+    /// \author Balazs Dezso
+    
+    class UnderFlowPriorityError : public RuntimeError {
+    public:
+      virtual const char* what() const throw() {
+        return "lemon::RadixHeap::UnderFlowPriorityError";
+      }  
+    };
+
     /// \brief Type to represent the items states.
     ///
@@ -78 +79 @@
     /// 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,
@@ -402 +403 @@
     /// get back to the heap again.
     /// \param i The item.
-    state_enum state(const Item &i) const {
+    State state(const Item &i) const {
       int s = iim[i];
       if( s >= 0 ) s = 0;
-      return state_enum(s);
+      return State(s);
     }
 
@@ -415 +416 @@
     /// \param i The item.
     /// \param st The state. It should not be \c IN_HEAP. 
-    void state(const Item& i, state_enum st) {
+    void state(const Item& i, State st) {
       switch (st) {
       case POST_HEAP: