Skip to content

Commit 9045932

Browse files
Fikser console-errors i heapsort og backward funksjon for arrow
1 parent 82be624 commit 9045932

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

Heap/js/HeapSort.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ var HeapSort = /** @class */ (function (_super) {
1717
function HeapSort(size) {
1818
var _this = _super.call(this, size) || this;
1919
_this.insertElems(size);
20-
_this.currIndex++;
2120
_this.sortIndex = _this.currIndex - 1;
2221
return _this;
2322
}
2423
HeapSort.prototype.sort = function () {
25-
for (var i = this.array.length; i >= 0; i--) {
24+
for (var i = this.sortIndex; i >= 0; i--) {
2625
control.setArrow(this.sortIndex);
2726
this.remove();
2827
}

Heap/js/HeapSort.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ class HeapSort extends MaxHeap {
1010
constructor(size: number) {
1111
super(size);
1212
this.insertElems(size);
13-
this.currIndex++;
1413
this.sortIndex = this.currIndex - 1;
1514
}
1615

1716
sort() {
18-
for (let i = this.array.length; i >= 0; i--) {
17+
for (let i = this.sortIndex; i >= 0; i--) {
1918
control.setArrow(this.sortIndex);
2019
this.remove();
2120
}

Heap/js/View.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ var View = /** @class */ (function () {
4747
}(index);
4848
var backward = function (index) {
4949
return function () {
50-
setArrow(index);
50+
setArrow(-1);
5151
};
5252
}(index);
53-
manager.addEvent(new FrontendEvent(forward, forward, this.animSpeed));
53+
manager.addEvent(new FrontendEvent(forward, backward, this.animSpeed));
5454
};
5555
View.prototype.setValueAtThisIndex = function (i, bValue, oldVal) {
5656
var forwardSteps = function (i, bValue) {

Heap/js/View.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ class View implements IView {
5656
}(index);
5757
let backward = function (index) {
5858
return function () {
59-
setArrow(index)
59+
setArrow(-1);
6060
}
6161
}(index);
6262

63-
manager.addEvent(new FrontendEvent(forward, forward, this.animSpeed));
63+
manager.addEvent(new FrontendEvent(forward, backward, this.animSpeed));
6464
}
6565

6666
setValueAtThisIndex(i: number, bValue: any, oldVal: any) {
@@ -420,7 +420,7 @@ class View implements IView {
420420
lockBackForward(true);
421421
}
422422
}
423-
423+
424424
// Used in eventmanager for freemode and predefined
425425
playButtonState() {
426426
let algo = control.getAlgorithm().getName();

Heap/js/methods.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ setupRadio();
9595
// Methods for positioning arrow
9696
function setArrow(index) {
9797
var $arrow = $("#arrow");
98+
console.log(index);
9899
if (index == -1) {
99100
$arrow.addClass("hidden");
100101
$arrow.animate({ left: ($("#sortArrayElem0").position().left + 9) + "px" }, 0);

0 commit comments

Comments
 (0)