Skip to content

Commit d2fa610

Browse files
author
Kenneth Apeland
committed
fjernet en bug i backwards
1 parent ed57a11 commit d2fa610

File tree

4 files changed

+25
-36
lines changed

4 files changed

+25
-36
lines changed

MergeSort/js/MergeSortAlgorithm.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ function startMergeSort() {
2323
}
2424
function mergesort(array) {
2525
if (array.length < 2) {
26-
if (pivotHelper(array[0])) {
27-
control.deselectPivotElement(array[0]);
28-
}
26+
pivotHelper(array[0]);
27+
//control.deselectPivotElement(array[0]);
2928
return array;
3029
}
3130
else {

MergeSort/js/MergeSortAlgorithm.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function startMergeSort() {
2525
copyArray = returnArray();
2626
mergesort(copyArray);
2727
control.setColorInArrayElements(copyArray, 3, true);
28+
2829
}
2930

3031
function mergesort(array: number[]): any {
@@ -150,7 +151,7 @@ function pivotHelper(number: number) {
150151
if (pivotElements[i] == number) {
151152
pivotElements = pivotElements.filter(function (item) {
152153
return item !== number;
153-
})
154+
});
154155
pivCount--;
155156
control.deselectPivotElement(number);
156157
}

MergeSort/js/Methods.js

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,14 @@ function moveElementBackToPlace(element, px) {
7070
var pos = (Number)(moveLeft.substring(0, moveLeft.length - 2));
7171
px = px * 85;
7272
if (pos > px) {
73-
if ($elem.offset().top > 170) {
74-
var newTop = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
75-
$elem.animate({ top: newTop + "px" }, 500);
76-
}
73+
var newTop = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
74+
$elem.animate({ top: newTop + "px" }, 500);
7775
$elem.animate({ left: px + "px" }, 1000);
7876
}
7977
else {
8078
$elem.animate({ left: px + "px" }, 1000);
81-
if ($elem.offset().top > 170) {
82-
var newTop = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
83-
$elem.animate({ top: newTop + "px" }, 500);
84-
}
79+
var newTop = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
80+
$elem.animate({ top: newTop + "px" }, 500);
8581
}
8682
}
8783
function moveElementsToPlace(element, px) {
@@ -113,18 +109,14 @@ function moveElementsBackToPlace(element, back) {
113109
var pos = (Number)(moveLeft.substring(0, moveLeft.length - 2));
114110
var pixel = back[i] * 85;
115111
if (pos > pixel) {
116-
if ($elem.offset().top > 170) {
117-
var newTop = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
118-
$elem.animate({ top: newTop + "px" }, 500);
119-
}
112+
var newTop = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
113+
$elem.animate({ top: newTop + "px" }, 500);
120114
$elem.animate({ left: pixel + "px" }, 1000);
121115
}
122116
else {
117+
var newTop = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
118+
$elem.animate({ top: newTop + "px" }, 500);
123119
$elem.animate({ left: pixel + "px" }, 1000);
124-
if ($elem.offset().top > 170) {
125-
var newTop = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
126-
$elem.animate({ top: newTop + "px" }, 500);
127-
}
128120
}
129121
}
130122
}

MergeSort/js/Methods.ts

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ function deselectPivotElement(index: number) {
5454
}
5555

5656
function moveElementToPlace(element: number, px: number) {
57+
5758
let $elem = $("#" + insElemNr + element);
5859
let moveLeft: string = $elem.css("left");
5960
let pos: number = (Number)(moveLeft.substring(0, moveLeft.length - 2));
@@ -81,17 +82,15 @@ function moveElementBackToPlace(element: number, px: number) {
8182
px = px * 85;
8283

8384
if (pos > px) {
84-
if ($elem.offset().top > 170) {
85-
var newTop: number = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
86-
$elem.animate({top: newTop + "px"}, 500);
87-
}
85+
var newTop: number = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
86+
$elem.animate({top: newTop + "px"}, 500);
87+
8888
$elem.animate({left: px + "px"}, 1000);
8989
} else {
9090
$elem.animate({left: px + "px"}, 1000);
91-
if ($elem.offset().top > 170) {
92-
var newTop: number = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
93-
$elem.animate({top: newTop + "px"}, 500);
94-
}
91+
var newTop: number = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
92+
$elem.animate({top: newTop + "px"}, 500);
93+
9594
}
9695
}
9796

@@ -126,17 +125,15 @@ function moveElementsBackToPlace(element: number[], back: number[]) {
126125
let pixel: number = back[i] * 85;
127126

128127
if (pos > pixel) {
129-
if ($elem.offset().top > 170) {
130-
var newTop: number = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
131-
$elem.animate({top: newTop + "px"}, 500);
132-
}
128+
var newTop: number = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
129+
$elem.animate({top: newTop + "px"}, 500);
133130
$elem.animate({left: pixel + "px"}, 1000);
134131
} else {
132+
var newTop: number = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
133+
$elem.animate({top: newTop + "px"}, 500);
135134
$elem.animate({left: pixel + "px"}, 1000);
136-
if ($elem.offset().top > 170) {
137-
var newTop: number = parseInt($elem.css('top'), 10) + LEVEL_HEIGHT;
138-
$elem.animate({top: newTop + "px"}, 500);
139-
}
135+
136+
140137
}
141138
}
142139
}

0 commit comments

Comments
 (0)