fikset hastighet + fikset sortedCheck metode

Kenneth Apeland · Kenneth Apeland · commit 171aa5a35eae · 2018-05-04T16:44:53.000+02:00
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Graphs/js/graphStructureController.ts b/Graphs/js/graphStructureController.ts
@@ -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  ****************************/
 /*************************************************************** */
 
diff --git a/Heap/js/View.ts b/Heap/js/View.ts
@@ -110,7 +110,7 @@ class View {
         this.started = false;
         this.playing = false;
         $("#play").text("Play");
-        $("#arrow").addClass("hidden").animate({ left: ($("#arrayElem0").position().left + 9) + "px" }, 0);
+        $("#arrow").addClass("hidden").animate({left: ($("#arrayElem0").position().left + 9) + "px"}, 0);
         manager.pause();
         manager.nextEvents = new Array;
         manager.previousEvents = new Array;
@@ -174,7 +174,7 @@ class View {
                 control.initController(new MaxHeapCombined(10));
                 this.play();
                 lockBackForward(true);
-                lockPlay(false);                
+                lockPlay(false);
                 break;
             }
             case "BuildHeap": {
@@ -183,8 +183,8 @@ class View {
                 screenLock(true);
                 control.getAlgorithm().build();
                 this.setPause(true);
-                lockPlay(false);     
-                lockBackForward(true);           
+                lockPlay(false);
+                lockBackForward(true);
                 $("#play").text("Play");
                 break;
             }
@@ -195,8 +195,8 @@ class View {
                 screenLock(true);
                 (<HeapSort>control.getAlgorithm()).sort();
                 this.setPause(true);
-                lockPlay(false);    
-                lockBackForward(true);                                       
+                lockPlay(false);
+                lockBackForward(true);
                 $("#play").text("Play");
                 break;
             }
@@ -221,7 +221,7 @@ class View {
     }
 
     sortHeap() {
-        control.buildHeap();        
+        control.buildHeap();
         control.sortHeap();
     }
 
@@ -388,6 +388,7 @@ class View {
     }
 
     clickedPlay = true;
+
     play() {
         this.clickedPlay = true;
         let algo = control.getAlgorithm().getName();
@@ -412,7 +413,7 @@ class View {
             this.playing = false;
             manager.pause();
             $("#play").text("Resume");
-            lockPlay(false);            
+            lockPlay(false);
             lockBackForward(false);
         } else {
             this.playing = true;
diff --git a/Kruskal/index.html b/Kruskal/index.html
@@ -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>
diff --git a/Kruskal/js/EventManager.js b/Kruskal/js/EventManager.js
@@ -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 () {
diff --git a/Kruskal/js/EventManager.ts b/Kruskal/js/EventManager.ts
@@ -65,7 +65,7 @@ class EventManager {
     }
 
     slow() {
-        this.delayTime = 1500;
+        this.delayTime = 2000;
         this.helpSetInterval();
     }
 
diff --git a/MergeSort/js/EventManager.ts b/MergeSort/js/EventManager.ts
@@ -67,7 +67,6 @@ class eventManager {
     }
 
     slow() {
-
         this.delayTime = 1500;
         this.helpSetInterval();
     }
diff --git a/MergeSort/js/MergeSortAlgorithm.ts b/MergeSort/js/MergeSortAlgorithm.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[] {
diff --git a/SimpleSort/js/EventManager.js b/SimpleSort/js/EventManager.js
@@ -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 () {
diff --git a/SimpleSort/js/EventManager.ts b/SimpleSort/js/EventManager.ts
@@ -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();
         }
diff --git a/SimpleSort/js/InsertionSort.js b/SimpleSort/js/InsertionSort.js
@@ -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);
diff --git a/SimpleSort/js/InsertionSort.ts b/SimpleSort/js/InsertionSort.ts
@@ -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[] {
diff --git a/SimpleSort/js/View.ts b/SimpleSort/js/View.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();
     }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ function resetForNewAlgo() {`
`46`	`46`	`$("#edge" + i).css({"stroke": "rgb(0, 0, 0)", "stroke-width": "4"});`
`47`	`47`	`}`
`48`	`48`	`for (let i = 0; i < nodes; i++) {`
`49`		`- $("#node" + i).css({"background-color" : "white", "border-color" : "black"});`
	`49`	`+ $("#node" + i).css({"background-color": "white", "border-color": "black"});`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`deselectAllNodes();`
`@@ -72,6 +72,7 @@ function checkOverlap(x: number, y: number) {`
`72`	`72`
`73`	`73`
`74`	`74`	`/*************************************************************** */`
	`75`	`+`
`75`	`76`	`/***************** Example Graphs **************************/`
`76`	`77`	`/*************************************************************** */`
`77`	`78`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class EventManager {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`slow() {`
`68`		`- this.delayTime = 1500;`
	`68`	`+ this.delayTime = 2000;`
`69`	`69`	`this.helpSetInterval();`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ class eventManager {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`slow() {`
`70`		`-`
`71`	`70`	`this.delayTime = 1500;`
`72`	`71`	`this.helpSetInterval();`
`73`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,12 @@ function setInvSortedArray() {`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`function isSorted(arr: number[]) {`
`177`		`- return arr.forEach((n1, n2) => n1 <= n2);`
	`177`	`+ for (let i = 0; i < arr.length - 1; i++) {`
	`178`	`+ if (arr[i] > arr[i + 1]) {`
	`179`	`+ return false;`
	`180`	`+ }`
	`181`	`+ }`
	`182`	`+ return true;`
`178`	`183`	`}`
`179`	`184`
`180`	`185`	`function setAlmostSortedArray(): number[] {`
Original file line number	Diff line number	Diff line change
`@@ -68,23 +68,22 @@ class eventManager {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`slow() {`
`71`		`-`
`72`		`- this.delayTime = 1500;`
	`71`	`+ this.delayTime = 1200;`
`73`	`72`	`this.helpSetInterval();`
`74`	`73`	`}`
`75`	`74`
`76`	`75`	`medium() {`
`77`		`- this.delayTime = 1000;`
	`76`	`+ this.delayTime = 800;`
`78`	`77`	`this.helpSetInterval();`
`79`	`78`	`}`
`80`	`79`
`81`		`- fast(){`
`82`		`- this.delayTime = 500;`
	`80`	`+ fast() {`
	`81`	`+ this.delayTime = 400;`
`83`	`82`	`this.helpSetInterval();`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`helpSetInterval() {`
`87`		`- if(!this.paused) {`
	`86`	`+ if (!this.paused) {`
`88`	`87`	`this.pause();`
`89`	`88`	`this.start();`
`90`	`89`	`}`