Merge branch 'master' of https://github.com/kennidenni/INF219

Author: theghostrecords

.idea/workspace.xml

@@ -29,6 +29,9 @@ var controller = /** @class */ (function () {
     controller.prototype.setPause = function () {
         viewer.setPause();
     };
+    controller.prototype.setColorInMultipleArrays = function (left, color1, right, color2) {
+        viewer.setColorInMultipleArrays(left, color1, right, color2);
+    };
     return controller;
 }());
 var control = new controller();

MergeSort/js/Controller.js

@@ -36,6 +36,10 @@ class controller {
     setPause() {
         viewer.setPause();
     }
+
+    setColorInMultipleArrays(left: number[], color1: number, right: number[], color2: number) {
+        viewer.setColorInMultipleArrays(left, color1, right, color2);
+    }
 }
 
 let control: controller = new controller();

MergeSort/js/Controller.ts

@@ -35,12 +35,10 @@ function mergesort(array) {
         control.setPivotElement(right[0]);
         pivotElements[pivCount] = right[0];
         pivCount++;
-        control.setColorInArrayElements(left, 1);
-        control.setColorInArrayElements(right, 2);
+        control.setColorInMultipleArrays(left, 1, right, 2);
         control.lowerElements(left);
         control.lowerElements(right);
-        control.setColorInArrayElements(left, 4);
-        control.setColorInArrayElements(right, 4);
+        control.setColorInMultipleArrays(left, 4, right, 4);
         //Split until there is only 1 element left
         return merge(mergesort(left), mergesort(right));
     }
@@ -142,7 +140,12 @@ function setInvSortedArray() {
     return setSortedArray().reverse();
 }
 function isSorted(arr) {
-    return arr.forEach(function (n1, n2) { return n1 <= n2; });
+    for (var i = 0; i < arr.length - 1; i++) {
+        if (arr[i] > arr[i + 1]) {
+            return false;
+        }
+    }
+    return true;
 }
 function setAlmostSortedArray() {
     var arr = setSortedArray();

MergeSort/js/MergeSortAlgorithm.js

@@ -44,14 +44,12 @@ function mergesort(array: number[]): any {
         pivotElements[pivCount] = right[0];
         pivCount++;
 
-        control.setColorInArrayElements(left, 1);
-        control.setColorInArrayElements(right, 2);
+        control.setColorInMultipleArrays(left, 1, right, 2);
 
         control.lowerElements(left);
         control.lowerElements(right);
 
-        control.setColorInArrayElements(left, 4);
-        control.setColorInArrayElements(right, 4);
+        control.setColorInMultipleArrays(left, 4, right, 4);
 
         //Split until there is only 1 element left
         return merge(mergesort(left), mergesort(right));

MergeSort/js/MergeSortAlgorithm.ts

@@ -120,6 +120,43 @@ var view = /** @class */ (function () {
         }
         manager.addEvent(new FrontendEvent(forwardSteps, backwardSteps, this.animSpeed));
     };
+    view.prototype.setColorInMultipleArrays = function (left, color1, right, color2) {
+        var colorList1 = [];
+        for (var i = 0; i < left.length; i++) {
+            colorList1[i] = color1;
+        }
+        var colorList2 = [];
+        for (var i = 0; i < right.length; i++) {
+            colorList2[i] = color2;
+        }
+        var forwardSteps = function (left, colorList1, right, colorList2) {
+            return function () {
+                setColors(left, colorList1);
+                setColors(right, colorList2);
+            };
+        }(left, colorList1, right, colorList2);
+        var oldColor1 = [];
+        for (var i = 0; i < left.length; i++) {
+            oldColor1[i] = colorInArray[myArray.indexOf(left[i])];
+        }
+        var oldColor2 = [];
+        for (var i = 0; i < right.length; i++) {
+            oldColor2[i] = colorInArray[myArray.indexOf(right[i])];
+        }
+        var backwardSteps = function (left, oldColor1, right, oldColor2) {
+            return function () {
+                setColors(left, oldColor1);
+                setColors(right, oldColor2);
+            };
+        }(left, oldColor1, right, oldColor2);
+        for (var i = 0; i < left.length; i++) {
+            colorInArray[myArray.indexOf(left[i])] = color1;
+        }
+        for (var i = 0; i < right.length; i++) {
+            colorInArray[myArray.indexOf(right[i])] = color2;
+        }
+        manager.addEvent(new FrontendEvent(forwardSteps, backwardSteps, this.animSpeed));
+    };
     view.prototype.pause = function () {
         if (!this.paused) {
             this.paused = true;
@@ -144,14 +181,18 @@ var view = /** @class */ (function () {
         $('#forward').removeAttr('disabled');
     };
     view.prototype.forward = function () {
+        $('#forward').attr('disabled', 'disabled');
         manager.next();
+        setTimeout(function () {
+            $('#forward').removeAttr('disabled');
+        }, 350);
     };
     view.prototype.backward = function () {
         $('#backward').attr('disabled', 'disabled');
         manager.previous();
         setTimeout(function () {
             $('#backward').removeAttr('disabled');
-        }, 300);
+        }, 350);
     };
     view.prototype.slow = function () {
         manager.slow();

MergeSort/js/View.js

@@ -152,6 +152,50 @@ class view {
         manager.addEvent(new FrontendEvent(forwardSteps, backwardSteps, this.animSpeed));
     }
 
+    setColorInMultipleArrays(left: number[], color1: number, right: number[], color2: number) {
+        let colorList1: number[] = [];
+        for (let i = 0; i < left.length; i++) {
+            colorList1[i] = color1;
+        }
+
+        let colorList2: number[] = [];
+        for (let i = 0; i < right.length; i++) {
+            colorList2[i] = color2;
+        }
+
+        let forwardSteps = function (left, colorList1, right, colorList2) {
+            return function () {
+                setColors(left, colorList1);
+                setColors(right, colorList2);
+            }
+        }(left, colorList1, right, colorList2);
+
+        let oldColor1: number[] = [];
+        for (let i = 0; i < left.length; i++) {
+            oldColor1[i] = colorInArray[myArray.indexOf(left[i])];
+        }
+
+        let oldColor2: number[] = [];
+        for (let i = 0; i < right.length; i++) {
+            oldColor2[i] = colorInArray[myArray.indexOf(right[i])];
+        }
+
+        let backwardSteps = function (left, oldColor1, right, oldColor2) {
+            return function () {
+                setColors(left, oldColor1);
+                setColors(right, oldColor2);
+            }
+        }(left, oldColor1, right, oldColor2);
+
+        for (let i = 0; i < left.length; i++) {
+            colorInArray[myArray.indexOf(left[i])] = color1;
+        }
+        for (let i = 0; i < right.length; i++) {
+            colorInArray[myArray.indexOf(right[i])] = color2;
+        }
+        manager.addEvent(new FrontendEvent(forwardSteps, backwardSteps, this.animSpeed));
+    }
+
     pause() {
         if (!this.paused) {
             this.paused = true;

MergeSort/js/View.ts

@@ -244,7 +244,6 @@ class view {
     fast() {
         manager.fast();
     }
-
 }
 
 var viewer: view = new view();