Refactor MinHeap.

ncfausti · Apr 3, 2018 · 062f5a4 · 062f5a4
1 parent 7dd977c
commit 062f5a4
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/data-structures/heap/MinHeap.js b/src/data-structures/heap/MinHeap.js
@@ -85,7 +85,7 @@ export default class MinHeap {
 
     while (
       MinHeap.hasParent(currentIndex) &&
-      this.parent(currentIndex) > this.heapContainer[currentIndex]
+      MinHeap.lessThen(this.heapContainer[currentIndex], this.parent(currentIndex))
     ) {
       this.swap(currentIndex, MinHeap.getParentIndex(currentIndex));
       currentIndex = MinHeap.getParentIndex(currentIndex);
@@ -101,14 +101,14 @@ export default class MinHeap {
     while (this.hasLeftChild(currentIndex)) {
       if (
         this.hasRightChild(currentIndex) &&
-        this.leftChild(currentIndex) > this.rightChild(currentIndex)
+        MinHeap.lessThen(this.rightChild(currentIndex), this.leftChild(currentIndex))
       ) {
         nextIndex = MinHeap.getRightChildIndex(currentIndex);
       } else {
         nextIndex = MinHeap.getLeftChildIndex(currentIndex);
       }
 
-      if (this.heapContainer[currentIndex] < this.heapContainer[nextIndex]) {
+      if (MinHeap.lessThen(this.heapContainer[currentIndex], this.heapContainer[nextIndex])) {
         break;
       }
 
@@ -120,4 +120,16 @@ export default class MinHeap {
   toString() {
     return this.heapContainer.toString();
   }
+
+  static compare(a, b) {
+    if (a === b) {
+      return 0;
+    }
+
+    return a < b ? -1 : 1;
+  }
+
+  static lessThen(a, b) {
+    return MinHeap.compare(a, b) === -1;
+  }
 }