glemte js filene...

Author: kennidenni

MergeSort/js/MergeSortAlgorithm.js

@@ -32,7 +32,6 @@ function mergesort(array) {
         mid = Math.floor(array.length * 0.5);
         left = array.slice(0, mid);
         right = array.slice(mid);
-        //denne og er ekkel
         control.setPivotElement(right[0]);
         pivotElements[pivCount] = right[0];
         pivCount++;
@@ -65,11 +64,11 @@ function merge(left, right) {
         }
         control.setColorInArrayElement(right[tempRightIndex], 0);
         if (left[tempLeftIndex] < right[tempRightIndex]) {
-            leftAlreadyColored = false;
             control.setColorInArrayElement(left[tempLeftIndex], 3);
             control.moveElementToPlace(left[tempLeftIndex], counter, copyArray.indexOf(left[tempLeftIndex]));
             result.push(left[tempLeftIndex]);
             testing[counter] = left[tempLeftIndex];
+            leftAlreadyColored = false;
             counter++;
             tempLeftIndex++;
         }

MergeSort/js/MergeSortAlgorithm.ts

@@ -40,7 +40,6 @@ function mergesort(array: number[]): any {
         left = array.slice(0, mid);
         right = array.slice(mid);
 
-        //denne og er ekkel
         control.setPivotElement(right[0]);
         pivotElements[pivCount] = right[0];
         pivCount++;
@@ -82,13 +81,13 @@ function merge(left: number[], right: number[]) {
         control.setColorInArrayElement(right[tempRightIndex], 0);
 
         if (left[tempLeftIndex] < right[tempRightIndex]) {
-            leftAlreadyColored = false;
             control.setColorInArrayElement(left[tempLeftIndex], 3);
             control.moveElementToPlace(left[tempLeftIndex], counter, copyArray.indexOf(left[tempLeftIndex]));
 
             result.push(left[tempLeftIndex]);
             testing[counter] = left[tempLeftIndex];
 
+            leftAlreadyColored = false;
             counter++;
             tempLeftIndex++;
 

MergeSort/js/View.js

@@ -101,7 +101,6 @@ var view = /** @class */ (function () {
         for (var i = 0; i < index.length; i++) {
             colorList[i] = color;
         }
-        console.log("colorlist" + colorList);
         var forwardSteps = function (index, colorList) {
             return function () {
                 setColors(index, colorList);
@@ -111,7 +110,6 @@ var view = /** @class */ (function () {
         for (var i = 0; i < index.length; i++) {
             oldColor[i] = colorInArray[myArray.indexOf(index[i])];
         }
-        console.log(oldColor + " " + index);
         var backwardSteps = function (index, oldColor) {
             return function () {
                 setColors(index, oldColor);