Skip to content

Commit 171aa5a

Browse files
author
Kenneth Apeland
committed
fikset hastighet + fikset sortedCheck metode
1 parent 1181154 commit 171aa5a

13 files changed

+273
-182
lines changed

‎.idea/workspace.xml

+235-155
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Graphs/js/graphStructureController.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function resetForNewAlgo() {
4646
$("#edge" + i).css({"stroke": "rgb(0, 0, 0)", "stroke-width": "4"});
4747
}
4848
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"});
5050
}
5151

5252
deselectAllNodes();
@@ -72,6 +72,7 @@ function checkOverlap(x: number, y: number) {
7272

7373

7474
/*************************************************************** */
75+
7576
/******************* Example Graphs ****************************/
7677
/*************************************************************** */
7778

‎Heap/js/View.ts

+9-8
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class View {
110110
this.started = false;
111111
this.playing = false;
112112
$("#play").text("Play");
113-
$("#arrow").addClass("hidden").animate({ left: ($("#arrayElem0").position().left + 9) + "px" }, 0);
113+
$("#arrow").addClass("hidden").animate({left: ($("#arrayElem0").position().left + 9) + "px"}, 0);
114114
manager.pause();
115115
manager.nextEvents = new Array;
116116
manager.previousEvents = new Array;
@@ -174,7 +174,7 @@ class View {
174174
control.initController(new MaxHeapCombined(10));
175175
this.play();
176176
lockBackForward(true);
177-
lockPlay(false);
177+
lockPlay(false);
178178
break;
179179
}
180180
case "BuildHeap": {
@@ -183,8 +183,8 @@ class View {
183183
screenLock(true);
184184
control.getAlgorithm().build();
185185
this.setPause(true);
186-
lockPlay(false);
187-
lockBackForward(true);
186+
lockPlay(false);
187+
lockBackForward(true);
188188
$("#play").text("Play");
189189
break;
190190
}
@@ -195,8 +195,8 @@ class View {
195195
screenLock(true);
196196
(<HeapSort>control.getAlgorithm()).sort();
197197
this.setPause(true);
198-
lockPlay(false);
199-
lockBackForward(true);
198+
lockPlay(false);
199+
lockBackForward(true);
200200
$("#play").text("Play");
201201
break;
202202
}
@@ -221,7 +221,7 @@ class View {
221221
}
222222

223223
sortHeap() {
224-
control.buildHeap();
224+
control.buildHeap();
225225
control.sortHeap();
226226
}
227227

@@ -388,6 +388,7 @@ class View {
388388
}
389389

390390
clickedPlay = true;
391+
391392
play() {
392393
this.clickedPlay = true;
393394
let algo = control.getAlgorithm().getName();
@@ -412,7 +413,7 @@ class View {
412413
this.playing = false;
413414
manager.pause();
414415
$("#play").text("Resume");
415-
lockPlay(false);
416+
lockPlay(false);
416417
lockBackForward(false);
417418
} else {
418419
this.playing = true;

‎Kruskal/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ <h1 id="headerText">Kruskal's Algorithm</h1>
2626
<svg id="edgeSvg" height="100%" width="100%"></svg>
2727
</div>
2828

29-
<div id="edgeTitle"><h3>Nodes:</h3></div>
29+
<div id="edgeTitle"><h3>Edges:</h3></div>
3030
<div id="edgeTable" class="main-container edgeText-container"></div>
3131
<div id="totalWeight" class="main-container totalWeight-container">
3232
<p>Total weight: 0</p>

‎Kruskal/js/EventManager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var EventManager = /** @class */ (function () {
5757
this.previousEvents = [];
5858
};
5959
EventManager.prototype.slow = function () {
60-
this.delayTime = 1500;
60+
this.delayTime = 2000;
6161
this.helpSetInterval();
6262
};
6363
EventManager.prototype.medium = function () {

‎Kruskal/js/EventManager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class EventManager {
6565
}
6666

6767
slow() {
68-
this.delayTime = 1500;
68+
this.delayTime = 2000;
6969
this.helpSetInterval();
7070
}
7171

‎MergeSort/js/EventManager.ts

-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ class eventManager {
6767
}
6868

6969
slow() {
70-
7170
this.delayTime = 1500;
7271
this.helpSetInterval();
7372
}

‎MergeSort/js/MergeSortAlgorithm.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,12 @@ function setInvSortedArray() {
174174
}
175175

176176
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;
178183
}
179184

180185
function setAlmostSortedArray(): number[] {

‎SimpleSort/js/EventManager.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ var eventManager = /** @class */ (function () {
5858
this.previousEvents = [];
5959
};
6060
eventManager.prototype.slow = function () {
61-
this.delayTime = 1500;
61+
this.delayTime = 1200;
6262
this.helpSetInterval();
6363
};
6464
eventManager.prototype.medium = function () {
65-
this.delayTime = 1000;
65+
this.delayTime = 800;
6666
this.helpSetInterval();
6767
};
6868
eventManager.prototype.fast = function () {
69-
this.delayTime = 500;
69+
this.delayTime = 400;
7070
this.helpSetInterval();
7171
};
7272
eventManager.prototype.helpSetInterval = function () {

‎SimpleSort/js/EventManager.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,22 @@ class eventManager {
6868
}
6969

7070
slow() {
71-
72-
this.delayTime = 1500;
71+
this.delayTime = 1200;
7372
this.helpSetInterval();
7473
}
7574

7675
medium() {
77-
this.delayTime = 1000;
76+
this.delayTime = 800;
7877
this.helpSetInterval();
7978
}
8079

81-
fast(){
82-
this.delayTime = 500;
80+
fast() {
81+
this.delayTime = 400;
8382
this.helpSetInterval();
8483
}
8584

8685
helpSetInterval() {
87-
if(!this.paused) {
86+
if (!this.paused) {
8887
this.pause();
8988
this.start();
9089
}

‎SimpleSort/js/InsertionSort.js

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ function startInsertionSort() {
3030
var j; // Elements sorted, starting on second position
3131
var key; // Current element
3232
var i; // Index moving backwards with key
33-
console.log(array.toString());
3433
for (j = 1; j < array.length; j++) {
3534
control.setJElement(j, true);
3635
control.setElementBeingComparedTo(j - 1, true);

‎SimpleSort/js/InsertionSort.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,12 @@ function setInvSortedArray() {
112112
}
113113

114114
function isSorted(arr: number[]) {
115-
return arr.forEach((n1, n2) => n1 <= n2);
115+
for (let i = 0; i < arr.length - 1; i++) {
116+
if (arr[i] > arr[i + 1]) {
117+
return false;
118+
}
119+
}
120+
return true;
116121
}
117122

118123
function setAlmostSortedArray(): number[] {

‎SimpleSort/js/View.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ class view {
201201
} else {
202202
this.paused = false;
203203
manager.unpause();
204-
$('#backward').attr('disabled','disabled');
205-
$('#forward').attr('disabled','disabled');
204+
$('#backward').attr('disabled', 'disabled');
205+
$('#forward').attr('disabled', 'disabled');
206206
$("#togglePause").html("Pause");
207207
}
208208
}
@@ -236,9 +236,11 @@ class view {
236236
slow() {
237237
manager.slow();
238238
}
239+
239240
medium() {
240241
manager.medium();
241242
}
243+
242244
fast() {
243245
manager.fast();
244246
}

0 commit comments

Comments
 (0)