Changeset 217:fc549fac0dd0 in lemon-0.x for src/work/jacint/fib_heap.h

Timestamp:

03/20/04 17:13:19 (21 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Several bugfixes

File:

• src/work/jacint/fib_heap.h (modified) (6 diffs)

src/work/jacint/fib_heap.h

@@ -95 +95 @@
 
     void set (Item const it, PrioType const value) {
-      int i=iimap.get(it);
+      int i=iimap[it];
       if ( i >= 0 && container[i].in ) {
         if ( comp(value, container[i].prio) ) decrease(it, value); 
@@ -104 +104 @@
 
     void push (Item const it, PrioType const value) {
-      int i=iimap.get(it);      
+      int i=iimap[it];      
       if ( i < 0 ) {
         int s=container.size();
@@ -146 +146 @@
 
 
-    PrioType& operator[](const Item& it) const {
-      return container[iimap.get(it)].prio;
+    PrioType& operator[](const Item& it) {
+      return container[iimap[it]].prio;
     }
     
     const PrioType& operator[](const Item& it) const {
-      return container[iimap.get(it)].prio;
-    }
-
-    const PrioType get(const Item& it) const {
-      return container[iimap.get(it)].prio;
-    }
-
-
+      return container[iimap[it]].prio;
+    }
+
+//     const PrioType get(const Item& it) const {
+//       return container[iimap[it]].prio;
+//     }
 
     void pop() {
@@ -193 +191 @@
     
     void erase (const Item& it) {
-      int i=iimap.get(it);
+      int i=iimap[it];
       
       if ( i >= 0 && container[i].in ) {        
@@ -208 +206 @@
 
     void decrease (Item it, PrioType const value) {
-      int i=iimap.get(it);
+      int i=iimap[it];
       container[i].prio=value;
       int p=container[i].parent;
@@ -227 +225 @@
 
     state_enum state(const Item &it) const {
-      int i=iimap.get(it);
+      int i=iimap[it];
       if( i>=0 ) {
         if ( container[i].in ) i=0;