Changeset 2547:f393a8162688 in lemon-0.x for lemon/bucket_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/bucket_heap.h (modified) (10 diffs)

lemon/bucket_heap.h

@@ -50 +50 @@
 
   public:
+    /// \e
     typedef typename _ItemIntMap::Key Item;
+    /// \e
     typedef int Prio;
+    /// \e
     typedef std::pair<Item, Prio> Pair;
+    /// \e
     typedef _ItemIntMap ItemIntMap;
 
@@ -63 +67 @@
     /// 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,
@@ -279 +283 @@
     /// get back to the heap again.
     /// \param i The item.
-    state_enum state(const Item &i) const {
+    State state(const Item &i) const {
       int idx = index[i];
       if (idx >= 0) idx = 0;
-      return state_enum(idx);
+      return State(idx);
     }
 
@@ -292 +296 @@
     /// \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:
@@ -335 +339 @@
     typedef _ItemIntMap ItemIntMap;
 
-    enum state_enum {
+    enum State {
       IN_HEAP = 0,
       PRE_HEAP = -1,
@@ -473 +477 @@
     }
 
-    state_enum state(const Item &i) const {
+    State state(const Item &i) const {
       int idx = index[i];
       if (idx >= 0) idx = 0;
-      return state_enum(idx);
-    }
-
-    void state(const Item& i, state_enum st) {
+      return State(idx);
+    }
+
+    void state(const Item& i, State st) {
       switch (st) {
       case POST_HEAP:
@@ -547 +551 @@
     /// 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,
@@ -684 +688 @@
     /// get back to the heap again.
     /// \param i The item.
-    state_enum state(const Item &i) const {
+    State state(const Item &i) const {
       int idx = index[i];
       if (idx >= 0) idx = 0;
-      return state_enum(idx);
+      return State(idx);
     }
 
@@ -717 +721 @@
     typedef _ItemIntMap ItemIntMap;
 
-    enum state_enum {
+    enum State {
       IN_HEAP = 0,
       PRE_HEAP = -1,
@@ -799 +803 @@
     }
 
-    state_enum state(const Item &i) const {
+    State state(const Item &i) const {
       int idx = index[i];
       if (idx >= 0) idx = 0;
-      return state_enum(idx);
+      return State(idx);
     }