Skip to content

Commit ed57a11

Browse files
theghostrecordstheghostrecords
committed
FJernet død kode, fikset pause + backwards
1 parent 44e8c35 commit ed57a11

17 files changed

+28
-510
lines changed

‎Heap/js/Controller.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ var Controller = /** @class */ (function () {
6969
Controller.prototype.displaySize = function (root, size) {
7070
viewer.displayNodeSize(root, size);
7171
};
72-
Controller.prototype.saveState = function (arr) {
73-
viewer.executeSaveMethodInJavaScript(arr);
74-
};
7572
Controller.prototype.addNode = function (i) {
7673
this.algorithm.add(i);
7774
};

‎Heap/js/Controller.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ class Controller {
8585
viewer.displayNodeSize(root, size);
8686
}
8787

88-
saveState(arr: number[]) {
89-
viewer.executeSaveMethodInJavaScript(arr);
90-
}
91-
9288
addNode(i: number) {
9389
this.algorithm.add(i);
9490
}

‎Heap/js/EventManager.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ var EventManager = /** @class */ (function () {
1616
return;
1717
}
1818
var event = this.nextEvents.shift();
19-
//console.log(this.nextEvents);
2019
event.next();
2120
this.previousEvents.push(event);
2221
if (event.duration == 0)
@@ -27,7 +26,6 @@ var EventManager = /** @class */ (function () {
2726
if (this.previousEvents.length == 0)
2827
return;
2928
var event = this.previousEvents.pop();
30-
//this.delayTime = 0; //TODO: Should there be a delay when stepping backwards?
3129
event.previous();
3230
this.nextEvents.unshift(event);
3331
};
@@ -55,15 +53,3 @@ var FrontendEvent = /** @class */ (function () {
5553
return FrontendEvent;
5654
}());
5755
var manager = new EventManager();
58-
/*
59-
/** How to add FrontendEvents to manager
60-
for(var i=0; i<10; i++) {
61-
var f = function(k) {
62-
return function() {console.log("Going forward, step " + k);};
63-
}(i);
64-
var b = function(k) {
65-
return function() {console.log("Going backward, step " + k);}
66-
}(i);
67-
manager.addEvent(new FrontendEvent(f,b));
68-
}
69-
*/

‎Heap/js/EventManager.ts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class EventManager {
1919
return;
2020
}
2121
var event = (<FrontendEvent>this.nextEvents.shift());
22-
//console.log(this.nextEvents);
2322
event.next();
2423
this.previousEvents.push(event);
2524
if (event.duration == 0)
@@ -31,8 +30,6 @@ class EventManager {
3130
if (this.previousEvents.length == 0)
3231
return;
3332
var event: FrontendEvent = (<FrontendEvent>this.previousEvents.pop());
34-
//this.delayTime = 0; //TODO: Should there be a delay when stepping backwards?
35-
3633
event.previous();
3734
this.nextEvents.unshift(event);
3835
}
@@ -66,17 +63,4 @@ class FrontendEvent {
6663
}
6764
}
6865

69-
var manager: EventManager = new EventManager();
70-
71-
/*
72-
/** How to add FrontendEvents to manager
73-
for(var i=0; i<10; i++) {
74-
var f = function(k) {
75-
return function() {console.log("Going forward, step " + k);};
76-
}(i);
77-
var b = function(k) {
78-
return function() {console.log("Going backward, step " + k);}
79-
}(i);
80-
manager.addEvent(new FrontendEvent(f,b));
81-
}
82-
*/
66+
var manager: EventManager = new EventManager();

‎Heap/js/HeapSort.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ var HeapSort = /** @class */ (function (_super) {
4141
control.setValueAtIndex(this.currIndex, " ", oldVal);
4242
this.sink(0, this.currIndex - 1);
4343
control.highlightSortElem(this.sortIndex--, "green");
44-
control.saveState(this.array);
4544
};
4645
HeapSort.prototype.insertElems = function (size) {
4746
for (var i = 0; i < size; i++) {

‎Heap/js/HeapSort.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class HeapSort extends MaxHeap {
3535
control.setValueAtIndex(this.currIndex, " ", oldVal);
3636
this.sink(0, this.currIndex - 1);
3737
control.highlightSortElem(this.sortIndex--, "green");
38-
control.saveState(this.array);
3938
}
4039

4140

@@ -48,10 +47,10 @@ class HeapSort extends MaxHeap {
4847
$("document").ready(function () {
4948
for (var i = 0; i < size; i++) {
5049
var left = (i * 70) + "px";
51-
$("#sortArrayElem" + i).animate({left: left}, 1000);
50+
$("#sortArrayElem" + i).animate({ left: left }, 1000);
5251
}
5352
var arrayWidth = ((size - 1) * 70) + 50;
54-
$("#sortArrayUL").animate({left: (-arrayWidth / 2 + 20) + "px"}, 500); // +20? Ul is default 40px -> 40/2 = 20. Dont touch.
53+
$("#sortArrayUL").animate({ left: (-arrayWidth / 2 + 20) + "px" }, 500); // +20? Ul is default 40px -> 40/2 = 20. Dont touch.
5554
});
5655
}
5756

‎Heap/js/IView.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,17 @@ interface IView {
88

99
selectThisIndex(index: number, b: boolean): void;
1010

11-
saveState(relationshipsJSON: string, backendArray: string): void;
12-
1311
setThisArrow(index: number): void;
1412

1513
setValueAtThisIndex(i: number, bValue: any, oldVal:any): void;
1614

1715
connectThisNodes(child: number, parent: number): void;
1816

19-
executeSaveMethodInJavaScript(clonedBackendArray: number[]): void;
20-
2117
highlightThisNode(index: number, color: string): void;
2218

2319
removeThisHighlight(node: number): void;
2420

2521
displayNodeSize(root: number, size: number): void;
2622

27-
setThisState(arrayObject: JSON, array: JSON): void;
28-
2923
screenLockThis(locked: boolean): void;
3024
}

‎Heap/js/MaxHeap.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ var MaxHeap = /** @class */ (function () {
1313
this.array[i] = Math.floor((Math.random() * 10)) + 1;
1414
}
1515
this.backEndBuild();
16-
// this.array[i] = i;
17-
//this.array.reverse();
1816
}
1917
MaxHeap.prototype.setIndex = function () {
2018
for (var i = 0; i < this.array.length; i++) {
@@ -95,32 +93,24 @@ var MaxHeap = /** @class */ (function () {
9593
MaxHeap.prototype.exch = function (number, number2) {
9694
if (this.array[number] === undefined || this.array[number2] === undefined || number > this.currIndex || number > this.currIndex)
9795
return;
98-
control.saveState(this.array);
9996
var tmp = this.array[number];
10097
this.array[number] = this.array[number2];
10198
control.setValueAtIndex(number, this.array[number], tmp);
10299
this.array[number2] = tmp;
103100
control.setValueAtIndex(number2, this.array[number2], this.array[number]);
104-
//console.log("fst: " + this.array[number] + ", second: " + this.array[number2]);
105-
//control.swapArrayElems(number, this.array[number], number2, this.array[number2]);
106101
};
107102
MaxHeap.prototype.add = function (a) {
108-
control.saveState(this.array);
109103
// Add to array and start frontendevents
110104
if (this.currIndex > 10) {
111105
return;
112106
}
113107
else {
114-
control.lockScreen(true);
115108
this.array[this.currIndex] = a;
116109
control.insertNewElem(this.currIndex++, a, Math.floor((this.currIndex - 2) / 2));
117110
}
118111
this.swim(this.currIndex - 1);
119-
control.lockScreen(false);
120112
};
121113
MaxHeap.prototype.remove = function () {
122-
control.saveState(this.array);
123-
control.lockScreen(true);
124114
// Remove root element, set last element to root and start frontendevents
125115
this.currIndex--;
126116
var oldVal = this.array[0];
@@ -129,8 +119,6 @@ var MaxHeap = /** @class */ (function () {
129119
control.removeElem(this.currIndex, false);
130120
control.setValueAtIndex(this.currIndex, " ", oldVal);
131121
this.sink(0, this.currIndex - 1);
132-
control.saveState(this.array);
133-
control.lockScreen(false);
134122
};
135123
MaxHeap.prototype.sink = function (index, length) {
136124
var left = index * 2 + 1;
@@ -147,7 +135,6 @@ var MaxHeap = /** @class */ (function () {
147135
else {
148136
other = left;
149137
}
150-
control.saveState(this.array);
151138
control.highlightNode(index, "orange");
152139
control.highlightNode(other, "orange");
153140
control.swapNode(index, other);
@@ -161,7 +148,6 @@ var MaxHeap = /** @class */ (function () {
161148
MaxHeap.prototype.swim = function (index) {
162149
var other = Math.floor((index - 1) / 2);
163150
while (other >= 0 && this.array[index] > this.array[other]) {
164-
control.saveState(this.array);
165151
control.highlightNode(index, "orange");
166152
control.highlightNode(other, "orange");
167153
control.swapNode(index, other);

‎Heap/js/MaxHeap.ts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ class MaxHeap implements IAlgorithm {
2020
this.array[i] = Math.floor((Math.random() * 10)) + 1;
2121
}
2222
this.backEndBuild();
23-
// this.array[i] = i;
24-
//this.array.reverse();
2523
}
2624

2725
setIndex() {
@@ -115,37 +113,25 @@ class MaxHeap implements IAlgorithm {
115113
if (this.array[number] === undefined || this.array[number2] === undefined || number > this.currIndex || number > this.currIndex)
116114
return;
117115

118-
control.saveState(this.array);
119-
120116
let tmp = this.array[number];
121117
this.array[number] = this.array[number2];
122118
control.setValueAtIndex(number, this.array[number], tmp);
123119
this.array[number2] = tmp;
124120
control.setValueAtIndex(number2, this.array[number2], this.array[number]);
125-
//console.log("fst: " + this.array[number] + ", second: " + this.array[number2]);
126-
127-
//control.swapArrayElems(number, this.array[number], number2, this.array[number2]);
128121
}
129122

130123
add(a: number): void {
131-
control.saveState(this.array);
132-
133124
// Add to array and start frontendevents
134125
if (this.currIndex > 10) {
135126
return;
136127
} else {
137-
control.lockScreen(true);
138128
this.array[this.currIndex] = a;
139129
control.insertNewElem(this.currIndex++, a, Math.floor((this.currIndex - 2) / 2));
140130
}
141131
this.swim(this.currIndex - 1);
142-
control.lockScreen(false);
143132
}
144133

145134
remove(): void {
146-
control.saveState(this.array);
147-
148-
control.lockScreen(true);
149135
// Remove root element, set last element to root and start frontendevents
150136
this.currIndex--;
151137
let oldVal = this.array[0];
@@ -154,8 +140,6 @@ class MaxHeap implements IAlgorithm {
154140
control.removeElem(this.currIndex, false);
155141
control.setValueAtIndex(this.currIndex, " ", oldVal);
156142
this.sink(0, this.currIndex - 1);
157-
control.saveState(this.array);
158-
control.lockScreen(false);
159143
}
160144

161145
protected sink(index: number, length: number): void {
@@ -175,8 +159,6 @@ class MaxHeap implements IAlgorithm {
175159
other = left;
176160
}
177161

178-
control.saveState(this.array);
179-
180162
control.highlightNode(index, "orange");
181163
control.highlightNode(other, "orange");
182164
control.swapNode(index, other);
@@ -191,7 +173,6 @@ class MaxHeap implements IAlgorithm {
191173
protected swim(index: number): void {
192174
let other: number = Math.floor((index - 1) / 2);
193175
while (other >= 0 && this.array[index] > this.array[other]) {
194-
control.saveState(this.array);
195176
control.highlightNode(index, "orange");
196177
control.highlightNode(other, "orange");
197178
control.swapNode(index, other);

‎Heap/js/State.js

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎Heap/js/State.ts

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)