merge

Author: theghostrecords

.idea/workspace.xml

@@ -46,7 +46,7 @@ function resetForNewAlgo() {
         $("#edge" + i).css({"stroke": "rgb(0, 0, 0)", "stroke-width": "4"});
     }
     for (let i = 0; i < nodes; i++) {
-        $("#node" + i).css({"background-color" : "white", "border-color" : "black"});
+        $("#node" + i).css({"background-color": "white", "border-color": "black"});
     }
 
     deselectAllNodes();
@@ -72,6 +72,7 @@ function checkOverlap(x: number, y: number) {
 
 
 /*************************************************************** */
+
 /*******************  Example Graphs  ****************************/
 /*************************************************************** */
 

Graphs/js/graphStructureController.ts

@@ -391,6 +391,7 @@ class View {
     }
 
     clickedPlay = true;
+
     play() {
         this.clickedPlay = true;
         let algo = control.getAlgorithm().getName();

Heap/js/View.ts

@@ -26,7 +26,7 @@ <h1 id="headerText">Kruskal's Algorithm</h1>
     <svg id="edgeSvg" height="100%" width="100%"></svg>
 </div>
 
-<div id="edgeTitle"><h3>Nodes:</h3></div>
+<div id="edgeTitle"><h3>Edges:</h3></div>
 <div id="edgeTable" class="main-container edgeText-container"></div>
 <div id="totalWeight" class="main-container totalWeight-container">
     <p>Total weight: 0</p>

Kruskal/index.html

@@ -57,7 +57,7 @@ var EventManager = /** @class */ (function () {
         this.previousEvents = [];
     };
     EventManager.prototype.slow = function () {
-        this.delayTime = 1500;
+        this.delayTime = 2000;
         this.helpSetInterval();
     };
     EventManager.prototype.medium = function () {

Kruskal/js/EventManager.js

@@ -65,7 +65,7 @@ class EventManager {
     }
 
     slow() {
-        this.delayTime = 1500;
+        this.delayTime = 2000;
         this.helpSetInterval();
     }
 

Kruskal/js/EventManager.ts

@@ -67,7 +67,6 @@ class eventManager {
     }
 
     slow() {
-
         this.delayTime = 1500;
         this.helpSetInterval();
     }

MergeSort/js/EventManager.ts

@@ -174,7 +174,12 @@ function setInvSortedArray() {
 }
 
 function isSorted(arr: number[]) {
-    return arr.forEach((n1, n2) => n1 <= n2);
+    for (let i = 0; i < arr.length - 1; i++) {
+        if (arr[i] > arr[i + 1]) {
+            return false;
+        }
+    }
+    return true;
 }
 
 function setAlmostSortedArray(): number[] {

MergeSort/js/MergeSortAlgorithm.ts

@@ -58,15 +58,15 @@ var eventManager = /** @class */ (function () {
         this.previousEvents = [];
     };
     eventManager.prototype.slow = function () {
-        this.delayTime = 1500;
+        this.delayTime = 1200;
         this.helpSetInterval();
     };
     eventManager.prototype.medium = function () {
-        this.delayTime = 1000;
+        this.delayTime = 800;
         this.helpSetInterval();
     };
     eventManager.prototype.fast = function () {
-        this.delayTime = 500;
+        this.delayTime = 400;
         this.helpSetInterval();
     };
     eventManager.prototype.helpSetInterval = function () {

SimpleSort/js/EventManager.js

@@ -68,23 +68,22 @@ class eventManager {
     }
 
     slow() {
-
-        this.delayTime = 1500;
+        this.delayTime = 1200;
         this.helpSetInterval();
     }
 
     medium() {
-        this.delayTime = 1000;
+        this.delayTime = 800;
         this.helpSetInterval();
     }
 
-    fast(){
-        this.delayTime = 500;
+    fast() {
+        this.delayTime = 400;
         this.helpSetInterval();
     }
 
     helpSetInterval() {
-        if(!this.paused) {
+        if (!this.paused) {
             this.pause();
             this.start();
         }

SimpleSort/js/EventManager.ts

@@ -30,7 +30,6 @@ function startInsertionSort() {
     var j; // Elements sorted, starting on second position
     var key; // Current element
     var i; // Index moving backwards with key
-    console.log(array.toString());
     for (j = 1; j < array.length; j++) {
         control.setJElement(j, true);
         control.setElementBeingComparedTo(j - 1, true);

SimpleSort/js/InsertionSort.js

@@ -112,7 +112,12 @@ function setInvSortedArray() {
 }
 
 function isSorted(arr: number[]) {
-    return arr.forEach((n1, n2) => n1 <= n2);
+    for (let i = 0; i < arr.length - 1; i++) {
+        if (arr[i] > arr[i + 1]) {
+            return false;
+        }
+    }
+    return true;
 }
 
 function setAlmostSortedArray(): number[] {

SimpleSort/js/InsertionSort.ts

@@ -201,8 +201,8 @@ class view {
         } else {
             this.paused = false;
             manager.unpause();
-            $('#backward').attr('disabled','disabled');
-            $('#forward').attr('disabled','disabled');
+            $('#backward').attr('disabled', 'disabled');
+            $('#forward').attr('disabled', 'disabled');
             $("#togglePause").html("Pause");
         }
     }
@@ -236,9 +236,11 @@ class view {
     slow() {
         manager.slow();
     }
+
     medium() {
         manager.medium();
     }
+
     fast() {
         manager.fast();
     }