Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/angry-dryers-open.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"sortman": patch
---

Add description for bucket sort in readme
5 changes: 5 additions & 0 deletions .changeset/curly-buttons-build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"sortman": patch
---

Fix merge sort's bug
5 changes: 5 additions & 0 deletions .changeset/fuzzy-adults-play.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"sortman": patch
---

Change test func
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ console.log(sorted);
- Quick sort - `SortMan.quick`
- Selection sort - `SortMan.selection`
- Shell sort - `SortMan.shell`
- Bucket sort - `SortMan.bucket`

# Options

Expand Down
27 changes: 19 additions & 8 deletions src/Sort/MergeSort.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,27 @@ export class MergeSort extends SortBase {
const right = this.core(content.slice(middle));
return (() => {
const result: SortCoreElement<T> = [];
do {
const leftElement = left[0] as SortCoreElement<T>[number];
const rightElement = right[0] as SortCoreElement<T>[number];
if (leftElement.num < rightElement.num) {
result.push(left.shift() as SortCoreElement<T>[number]);
let i = 0;
let l = 0;

while (i < left.length && l < right.length) {
const leftElement = left[i];
const rightElement = right[l];

if (leftElement && rightElement && leftElement.num < rightElement.num) {
const element = left[i++];
if (element) {
result.push(element);
}
} else {
result.push(right.shift() as SortCoreElement<T>[number]);
const element = right[l++];
if (element) {
result.push(element);
}
}
} while (left.length && right.length);
return result;
}

return result.concat(left.slice(i)).concat(right.slice(l));
})();
}
}
37 changes: 33 additions & 4 deletions tests/sort.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,62 @@ import { describe, expect, test } from "@jest/globals";
import { ignoreSorts, numArrData, objectArrData, sorts } from "./utils";
import { sortCheck } from "../src/utils/array";

function evalTest(originalData: number[], sortedData: number[], desc?: boolean): boolean {
const isSameArr = (() => {
const cache = new Map<number, number>();

for (const element of originalData) {
const cachedData = cache.get(element);
if (cachedData) {
cache.set(element, cachedData + 1);
} else {
cache.set(element, 1);
}
}

for (const [num, count] of cache.entries()) {
if (count !== sortedData.filter((value) => value === num).length) {
return false;
}
}

return true;
})() satisfies boolean;
return sortCheck(sortedData, desc) && originalData.length === sortedData.length && isSameArr;
}

for (const { name, algorithm, options } of sorts) {
if (!ignoreSorts.includes(name)) {
describe(name, () => {
describe("Normal test", () => {
test("Number array", () => {
const result = algorithm.sort(numArrData);
expect(sortCheck(result)).toBe(true);
expect(evalTest(numArrData, result)).toBe(true);
});
test("Number array with options", () => {
const result = algorithm.sort(numArrData, {
func: (e) => e
});
expect(sortCheck(result)).toBe(true);
expect(evalTest(numArrData, result)).toBe(true);
});
test("Object array", () => {
const result = algorithm.sort(objectArrData, {
func: (e) => e.num
});
expect(sortCheck(result.map(({ num }) => num))).toBe(true);
expect(
evalTest(
objectArrData.map(({ num }) => num),
result.map(({ num }) => num)
)
).toBe(true);
});
});
describe("Option test", () => {
test("Desc", () => {
const result = algorithm.sort(numArrData, {
desc: true
});
expect(sortCheck(result, true)).toBe(true);
expect(evalTest(numArrData, result, true)).toBe(true);
});
});
if (options && options.describe) {
Expand Down