Changeset 8540 for branches/RoutePlanning/HeuristicLab.Algorithms.GraphRouting/3.3/PriorityQueues

Timestamp:

08/30/12 11:20:34 (12 years ago)

Author:

spimming

Message:

#1894: fixed assignment issue in BinaryHeap

File:

• branches/RoutePlanning/HeuristicLab.Algorithms.GraphRouting/3.3/PriorityQueues/BinaryHeap.cs (modified) (4 diffs)

branches/RoutePlanning/HeuristicLab.Algorithms.GraphRouting/3.3/PriorityQueues/BinaryHeap.cs

@@ -24 +24 @@
         data[i] = new KNElement();
       }
-      data[0].Key = infimum; // sentinel
+      data[0].Key = infimum;
       data[capacity + 1].Key = sup;
       supremum = sup;
@@ -60 +60 @@
       }
 
-      data[1] = data[size];
+      data[1].Key = data[size].Key;
+      data[1].Value = data[size].Value;
+
       data[size].Key = supremum;
       size--;
@@ -87 +89 @@
       int hole = size;
       while ((hole > 1) && (data[hole >> 1].Key.CompareTo(key) == 1)) {
-        data[hole] = data[hole >> 1];
+        data[hole].Key = data[hole >> 1].Key;
+        data[hole].Value = data[hole >> 1].Value;
         hole = hole >> 1;
       }
@@ -95 +98 @@
 
     public void DecreaseKey(K key, V value) {
-      int pos = size;
-      while ((pos > 1) && (data[pos >> 1].Key.CompareTo(key) != 0)) {
-        pos = pos >> 1;
-      }
-      if (data[pos].Key.CompareTo(key) != 0) {
-        throw new InvalidOperationException("Key not found");
-      }
       throw new NotImplementedException();
     }
-
-
 
     // reset size to 0 and fill data array with sentinels