Changeset 14767 for branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/PriorityQueue.cs

Timestamp:

03/19/17 18:47:00 (7 years ago)

Author:

gkronber

Message:

#2700: made some changes while reviewing the code

File:

• branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/PriorityQueue.cs (modified) (8 diffs)

branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/PriorityQueue.cs

@@ -29 +29 @@
   // implementation based on C++ version from Peter Sanders
   // http://www.mpi-inf.mpg.de/~sanders/programs/spq/
-  public sealed class PriorityQueue<TK, TV> : IHeap<TK, TV> where TK : IComparable {
+  public sealed class PriorityQueue<TK, TV> where TK : IComparable {
     private class KNElement {
       public TK Key { get; set; }
@@ -35 +35 @@
     }
 
-    private int capacity;
+    private readonly int capacity;
     private int size; // index of last used element
     private int finalLayerSize; // size of first layer with free space
     private int finalLayerDist; // distance to end of layer
                                 //private KNElement[] rawData;
-    private KNElement[] data;    // alligned version of rawData
+    private readonly KNElement[] data;    // aligned version of rawData
 
     public PriorityQueue(TK supremum, TK infimum, int cap) {
@@ -53 +53 @@
     }
 
-    public int Size
-    {
+    public int Size {
       get { return size; }
     }
 
-    public TK Supremum
-    {
+    public TK Supremum {
       get { return data[capacity + 1].Key; }
     }
 
     public KeyValuePair<TK, TV> PeekMin() {
-      if (size == 0) {
+      if(size == 0) {
         throw new InvalidOperationException("Heap is empty");
       }
@@ -87 +85 @@
       size = sz - 1;
       finalLayerDist++;
-      if (finalLayerDist == finalLayerSize) {
+      if(finalLayerDist == finalLayerSize) {
         finalLayerSize >>= 2;
         finalLayerDist = 0;
       }
 
-      while (succ < sz) {
+      while(succ < sz) {
         var minKey = data[succ].Key;
         var delta = 0;
 
         var otherKey = data[succ + 1].Key;
-        if (otherKey.CompareTo(minKey) < 0) {
+        if(otherKey.CompareTo(minKey) < 0) {
           minKey = otherKey;
           delta = 1;
         }
         otherKey = data[succ + 2].Key;
-        if (otherKey.CompareTo(minKey) < 0) {
+        if(otherKey.CompareTo(minKey) < 0) {
           minKey = otherKey;
           delta = 2;
         }
         otherKey = data[succ + 3].Key;
-        if (otherKey.CompareTo(minKey) < 0) {
+        if(otherKey.CompareTo(minKey) < 0) {
           minKey = otherKey;
           delta = 3;
@@ -137 +135 @@
       pred = pred - layerDist; // finally preds index
 
-      while (data[pred].Key.CompareTo(bubble) > 0) {  // must terminate since inf at root
+      while(data[pred].Key.CompareTo(bubble) > 0) {  // must terminate since inf at root
         data[hole].Key = data[pred].Key;
         data[hole].Value = data[pred].Value;
@@ -159 +157 @@
       finalLayerDist--;
 
-      if (finalLayerDist == -1) { // layer full
-                                  // start next layer
+      if(finalLayerDist == -1) { // layer full
+                                 // start next layer
         finalLayerSize <<= 2;
         finalLayerDist = finalLayerSize - 1;
@@ -173 +171 @@
       pred = pred - layerDist; // finally preds index
       var predKey = data[pred].Key;
-      while (predKey.CompareTo(key) > 0) {
+      while(predKey.CompareTo(key) > 0) {
         data[hole].Key = predKey;
         data[hole].Value = data[pred].Value;
@@ -196 +194 @@
       var sup = Supremum;
       var cap = capacity;
-      for (var i = 1; i <= cap; i++) {
+      for(var i = 1; i <= cap; i++) {
         data[i].Key = sup;
       }