Gjort compare mer synlig i build (selv når ingen bytte kreves), kombinert build og sort i samme knapp i kombinert-modus og fikset bug

Author: theghostrecords

Heap/index.html

@@ -97,11 +97,6 @@ <h1 id="headerText">Heap Datastructure</h1>
                 Remove max
             </button>
             <br/>
-            <button id="buildHeap" class="btn btn-primary" style="display: none">
-                <!-- Click-Event handled in setUpBuildButton in methods.ts-->
-                Convert to Heap
-            </button>
-            <br/>            
             <button id="sortHeap" class="btn btn-primary" style="display: none">
                 <!-- Click-Event handled in setUpSortButton in methods.ts-->
                 Sort using HeapSort

Heap/js/HeapSort.js

@@ -25,9 +25,10 @@ var HeapSort = /** @class */ (function (_super) {
             control.setArrow(this.sortIndex);
             this.remove();
         }
+        control.setArrow(-1);
     };
     HeapSort.prototype.remove = function () {
-        // Remove root element, set last element to root and start frontendevents
+        // Switch root and last element, remove root and start frontendevents
         var oldVal = this.array[0];
         this.exch(0, --this.currIndex);
         control.sortHighlightTwoNodes(this.currIndex, this.sortIndex, "orange");

Heap/js/HeapSort.ts

@@ -18,6 +18,7 @@ class HeapSort extends MaxHeap {
             control.setArrow(this.sortIndex);
             this.remove();
         }
+        control.setArrow(-1);
     }
 
     remove(): void {

Heap/js/MaxHeap.js

@@ -130,8 +130,17 @@ var MaxHeap = /** @class */ (function () {
         var right = index * 2 + 2;
         if (left >= length)
             return;
-        if (this.array[index] >= this.array[left] && this.array[index] >= this.array[right])
+        if (this.array[index] >= this.array[left] && this.array[index] >= this.array[right]) {
+            if (this.array[left] >= this.array[right] || right >= length) {
+                control.highlightTwoNodes(index, left, "green");
+                control.removeHighlightTwoNodes(index, left, "green");
+            }
+            else {
+                control.highlightTwoNodes(index, right, "green");
+                control.removeHighlightTwoNodes(index, right, "green");
+            }
             return;
+        }
         // Sink
         var other;
         if (right >= length)

Heap/js/MaxHeap.ts

@@ -151,8 +151,16 @@ class MaxHeap implements IAlgorithm {
 
         if (left >= length)
             return;
-        if (this.array[index] >= this.array[left] && this.array[index] >= this.array[right])
+        if (this.array[index] >= this.array[left] && this.array[index] >= this.array[right]) {
+            if (this.array[left] >= this.array[right] || right >= length) {
+                control.highlightTwoNodes(index, left, "green")
+                control.removeHighlightTwoNodes(index, left, "green");
+            } else {
+                control.highlightTwoNodes(index, right, "green");
+                control.removeHighlightTwoNodes(index, right, "green");
+            }
             return;
+        }
 
         // Sink
         let other;

Heap/js/MaxHeapCombined.js

@@ -36,6 +36,7 @@ var MaxHeapCombined = /** @class */ (function (_super) {
             control.setArrow(this.sortIndex);
             this.remove();
         }
+        control.setArrow(-1);
     };
     MaxHeapCombined.prototype.remove = function () {
         // Switch root and last element, remove root and start frontendevents

Heap/js/MaxHeapCombined.ts

@@ -29,6 +29,7 @@ class MaxHeapCombined extends MaxHeapFree {
             control.setArrow(this.sortIndex);
             this.remove();
         }
+        control.setArrow(-1);
     }
 
     remove(): void {

Heap/js/View.js

@@ -180,10 +180,8 @@ var View = /** @class */ (function () {
         control.removeNode();
     };
     View.prototype.sortHeap = function () {
-        control.sortHeap();
-    };
-    View.prototype.buildHeap = function () {
         control.buildHeap();
+        control.sortHeap();
     };
     View.prototype.swapNode = function (child, parent) {
         var forward = function (child, parent) {

Heap/js/View.ts

@@ -207,13 +207,10 @@ class View {
     }
 
     sortHeap() {
+        control.buildHeap();        
         control.sortHeap();
     }
 
-    buildHeap() {
-        control.buildHeap();
-    }
-
     swapNode(child: number, parent: number) {
         let forward = function (child, parent) {
             return function () {

Heap/js/drawGraph.js

@@ -16,7 +16,6 @@ var GraphNode = /** @class */ (function () {
             this.moveBothDirections(xLayer * 70, yLayer * 50, time);
             return xLayer + 1;
         }
-        // Recursive
         else {
             for (var _i = 0, _a = this.children; _i < _a.length; _i++) {
                 var child = _a[_i];

Heap/js/methods.js

@@ -312,12 +312,6 @@ function setUpRemoveButton() {
     });
 }
 setUpRemoveButton();
-function setUpBuildButton() {
-    $("#buildHeap").click(function () {
-        viewer.buildHeap();
-    });
-}
-setUpBuildButton();
 function setUpSortButton() {
     $("#sortHeap").click(function () {
         viewer.sortHeap();

Heap/js/methods.ts

@@ -360,14 +360,6 @@ function setUpRemoveButton() {
 
 setUpRemoveButton();
 
-function setUpBuildButton() {
-    $("#buildHeap").click(function () {
-        viewer.buildHeap();
-    });
-}
-
-setUpBuildButton()
-
 function setUpSortButton() {
     $("#sortHeap").click(function () {
         viewer.sortHeap();