This commit is contained in:
Gustav Ekner 2024-07-17 10:41:46 +09:00 committed by GitHub
commit 3072a111d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 27 deletions

View File

@ -6,7 +6,7 @@ export default class InsertionSort extends Sort {
// Go through all array elements... // Go through all array elements...
for (let i = 1; i < array.length; i += 1) { for (let i = 1; i < array.length; i += 1) {
let currentIndex = i; let j = i;
// Call visiting callback. // Call visiting callback.
this.callbacks.visitingCallback(array[i]); this.callbacks.visitingCallback(array[i]);
@ -14,23 +14,17 @@ export default class InsertionSort extends Sort {
// Check if previous element is greater than current element. // Check if previous element is greater than current element.
// If so, swap the two elements. // If so, swap the two elements.
while ( while (
array[currentIndex - 1] !== undefined array[j - 1] !== undefined
&& this.comparator.lessThan(array[currentIndex], array[currentIndex - 1]) && this.comparator.lessThan(array[j], array[j - 1])
) { ) {
// Call visiting callback. // Call visiting callback.
this.callbacks.visitingCallback(array[currentIndex - 1]); this.callbacks.visitingCallback(array[j - 1]);
// Swap the elements. // Swap the elements.
[ [array[j - 1], array[j]] = [array[j], array[j - 1]];
array[currentIndex - 1],
array[currentIndex],
] = [
array[currentIndex],
array[currentIndex - 1],
];
// Shift current index left. // Shift current index left.
currentIndex -= 1; j -= 1;
} }
} }

View File

@ -39,9 +39,7 @@ export default class QuickSortInPlace extends Sort {
* @param {number} rightIndex * @param {number} rightIndex
*/ */
const swap = (leftIndex, rightIndex) => { const swap = (leftIndex, rightIndex) => {
const temp = array[leftIndex]; [array[leftIndex], array[rightIndex]] = [array[rightIndex], array[leftIndex]];
array[leftIndex] = array[rightIndex];
array[rightIndex] = temp;
}; };
const pivot = array[highIndex]; const pivot = array[highIndex];

View File

@ -12,22 +12,20 @@ export default class ShellSort extends Sort {
while (gap > 0) { while (gap > 0) {
// Go and compare all distant element pairs. // Go and compare all distant element pairs.
for (let i = 0; i < (array.length - gap); i += 1) { for (let i = 0; i < (array.length - gap); i += 1) {
let currentIndex = i; let j = i;
let gapShiftedIndex = i + gap; let gapShiftedIndex = i + gap;
while (currentIndex >= 0) { while (j >= 0) {
// Call visiting callback. // Call visiting callback.
this.callbacks.visitingCallback(array[currentIndex]); this.callbacks.visitingCallback(array[j]);
// Compare and swap array elements if needed. // Compare and swap array elements if needed.
if (this.comparator.lessThan(array[gapShiftedIndex], array[currentIndex])) { if (this.comparator.lessThan(array[gapShiftedIndex], array[j])) {
const tmp = array[currentIndex]; [array[j], array[gapShiftedIndex]] = [array[gapShiftedIndex], array[j]];
array[currentIndex] = array[gapShiftedIndex];
array[gapShiftedIndex] = tmp;
} }
gapShiftedIndex = currentIndex; gapShiftedIndex = j;
currentIndex -= gap; j -= gap;
} }
} }

View File

@ -95,9 +95,8 @@ export default class Heap {
* @param {number} indexTwo * @param {number} indexTwo
*/ */
swap(indexOne, indexTwo) { swap(indexOne, indexTwo) {
const tmp = this.heapContainer[indexTwo]; [this.heapContainer[indexOne], this.heapContainer[indexTwo]] = [
this.heapContainer[indexTwo] = this.heapContainer[indexOne]; this.heapContainer[indexTwo], this.heapContainer[indexOne]];
this.heapContainer[indexOne] = tmp;
} }
/** /**