Changeset 274:28728f3945c5 in lemon-0.x

Timestamp:

04/01/04 23:06:53 (21 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

bin_heap merge-olva

Files:

• doc/Doxyfile (modified) (1 diff)
• src/include/bin_heap.h (modified) (6 diffs)
• src/work/alpar/dijkstra/bin_heap.h (deleted)
• src/work/bin_heap_demo.cc (modified) (5 diffs)

doc/Doxyfile

@@ -397 +397 @@
                          ../src/include/skeletons/maps.h \
                          ../src/include/dijkstra.h \
-                         ../src/demo/alpar/dijkstra/bin_heap.h \
+                         ../src/include/bin_heap.h \
                          ../src/include/fib_heap.h \
                          ../src/demo/athos/xy/xy.h \

src/include/bin_heap.h

@@ +1 @@
+// -*- C++ -*- //
+
 /* FIXME: Copyright ... 
  *
@@ -60 +62 @@
 #define BIN_HEAP_HH
 
+///\file
+///\brief Binary Heap implementation.
+
 #include <vector>
 #include <utility>
@@ -66 +71 @@
 namespace hugo {
 
+  /// A Binary Heap implementation.
   template <typename Item, typename Prio, typename ItemIntMap,
             typename Compare = std::less<Prio> >
@@ -86 +92 @@
      * PRE_HEAP (-1) to any element to be put in the heap...
      */
+    ///\todo it is used nowhere
+    ///
     enum state_enum {
       IN_HEAP = 0,
@@ -141 +149 @@
 
     Item top() const {
-      // FIXME: test size>0 ?
       return data[0].first;
     }
-    Prio topPrio() const {
-      // FIXME: test size>0 ?
+    /// Returns the prio of the top element of the heap.
+    Prio prio() const {
       return data[0].second;
     }
@@ -157 +164 @@
     }
 
-    Prio get(const Item &i) const {
+    Prio operator[](const Item &i) const {
       int idx = iim[i];
       return data[idx].second;
     }
-    Prio operator[](const Item &i) const {
-      return get(i);
-    }
+
     void set(const Item &i, const Prio &p) {
       int idx = iim[i];

src/work/bin_heap_demo.cc

@@ -54 +54 @@
   heap.set("korte", 3.4);
 
-  cout << "heap.get(\"alma\") = " 
-       << heap.get("alma")
-       << endl;
   cout << "heap[\"alma\"] = " 
        << heap["alma"]
@@ -63 +60 @@
   cout << "heap.top() = "
        << heap.top() << endl;
-  cout << "heap.topPrio() = "
-       << heap.topPrio() << endl;
+  cout << "heap.prio() = "
+       << heap.prio() << endl;
 
   cout << "heap.decrease(\"alma\", 1.2);\n";
@@ -71 +68 @@
   cout << "heap.top() = "
        << heap.top() << endl;
-  cout << "heap.topPrio() = "
-       << heap.topPrio() << endl;
+  cout << "heap.prio() = "
+       << heap.prio() << endl;
 
   cout << "heap.set(\"alma\", 22);\n";
@@ -79 +76 @@
   cout << "heap.top() = "
        << heap.top() << endl;
-  cout << "heap.topPrio() = "
-       << heap.topPrio() << endl;
+  cout << "heap.prio() = "
+       << heap.prio() << endl;
 
   cout << "heap.size() = "
@@ -89 +86 @@
   cout << "heap.top() = "
        << heap.top() << endl;
-  cout << "heap.topPrio() = "
-       << heap.topPrio() << endl;
+  cout << "heap.prio() = "
+       << heap.prio() << endl;
 
   cout << "heap.state(\"szilva\") = "