81 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Langbein	68d86d6e6b	benchmark: filter out some of the "data x algorithm" combinations	2024-12-17 18:57:41 +00:00
Daniel Langbein	9bb9096c92	rm conflicting IDE settings	2024-12-17 17:53:54 +01:00
Daniel Langbein	526d69e95b	benchmark: include merge and bubble again ^^	2024-12-17 16:52:59 +00:00
Daniel Langbein	385082bb8d	Merge remote-tracking branch 'origin/main'	2024-12-17 16:39:14 +00:00
Daniel Langbein	a7a6f9e246	benchmark: exclude merge sort	2024-12-17 16:38:41 +00:00
Daniel Langbein	b730c34ddd	benchmark: numbers	2024-12-17 16:28:01 +00:00
Ambili Jacob	691d7eb0ac	Merge remote-tracking branch 'origin/main' ... # Conflicts: # .idea/misc.xml	2024-12-17 16:47:29 +01:00
Daniel Langbein	dbf26421d9	FinnSort: Disable printouts	2024-12-17 15:14:18 +01:00
Daniel Langbein	077cd818e6	refactor	2024-12-17 14:09:21 +01:00
finnm	59bfd44f45	Fixed the merging order of FinnSort	2024-12-17 13:24:50 +01:00
finnm	b1f94636c7	Removed Main Method from FinnSort	2024-12-17 13:11:05 +01:00
Daniel Langbein	b754184272	typo	2024-12-17 09:52:43 +00:00
Daniel Langbein	7a8f1c7f8d	fix: test data typo	2024-12-17 08:40:04 +00:00
Daniel Langbein	6b0a5394b1	benchmark: refactor	2024-12-17 08:34:57 +00:00
Daniel Langbein	c3ecfc5531	benchmark: rm ObjectSupplier.title	2024-12-17 08:28:09 +00:00
Daniel Langbein	a782d8c1fa	add sort test	2024-12-17 08:26:56 +00:00
finnm	e182ecc756	Fixed FinnSort: Cleared runs for every method call	2024-12-16 22:50:51 +01:00
finnm	fa70412791	Merge remote-tracking branch 'origin/main'	2024-12-16 22:31:53 +01:00
finnm	afe766992a	Initialized a second FinnSort	2024-12-16 22:31:37 +01:00
Daniel Langbein	d19d89006c	add sort test	2024-12-16 21:30:53 +00:00
Daniel Langbein	ccd0fba7c2	docs	2024-12-16 21:28:43 +00:00
Daniel Langbein	e25a14f718	test and benchmark: add ASort	2024-12-16 21:20:06 +00:00
Daniel Langbein	cb9ff240ea	refactor	2024-12-16 21:19:35 +00:00
Daniel Langbein	43dfcd987e	add sort test	2024-12-16 21:07:18 +00:00
Daniel Langbein	8379570f9a	benchmark: more input lists	2024-12-16 21:06:11 +00:00
finnm	3fbee13d07	Made FinnSort public	2024-12-16 19:04:30 +01:00
finnm	8e047dca9d	Merge branch 'implementation-by-finn' ... # Conflicts: # app/src/main/java/de/uni_marburg/powersort/FinnSort/FinnSort.java	2024-12-16 18:59:31 +01:00
finnm	8e49fb76b9	Made FinnSort generic	2024-12-16 18:59:15 +01:00
finnm	f32088c2c9	Made FinnSort generic	2024-12-16 16:11:13 +01:00
Daniel Langbein	72d668e0f9	benchmark: docs	2024-12-15 20:08:50 +00:00
Daniel Langbein	a262272b19	benchmark: ascending runs	2024-12-15 20:07:28 +00:00
Daniel Langbein	025193595c	benchmark: reproducible random lists	2024-12-12 15:31:00 +00:00
Daniel Langbein	e3b90c83cc	benchmark: JMH SortEnum	2024-12-11 18:05:12 +00:00
Daniel Langbein	060ff596b8	benchmark: SortEnum	2024-12-11 17:38:55 +00:00
Daniel Langbein	904d462fc6	benchmark: @Param & DataEnum	2024-12-11 17:08:01 +00:00
Daniel Langbein	605d0c2781	benchmark: refactor	2024-12-11 16:25:47 +00:00
Daniel Langbein	684f28bb2b	benchmark: refactor	2024-12-11 16:08:49 +00:00
Daniel Langbein	e627c99b55	benchmark: doc	2024-12-11 15:40:50 +00:00
M-H9	ebff5b6dc5	add app/bin to .gitignore	2024-12-11 14:04:46 +01:00
M-H9	2a3e3b3354	Merge branch 'powersort_M' ... # Conflicts: # .idea/misc.xml	2024-12-11 14:01:56 +01:00
M-H9	18c27e2ea0	Remove .vscode/settings.json from the repository ... The file likely contained editor-specific configurations that are unrelated to the source code. Removing it helps prevent unintentional overrides of personal developer settings and keeps the repository cleaner.	2024-12-11 12:00:37 +01:00
M-H9	d4fd68fa70	Refactor package structure and update visibility modifier. ... Renamed packages to follow a consistent naming convention (`de.uni_marburg.powersort.msort`). Adjusted imports and references accordingly. Changed `MERGE_COST` visibility from private to protected for broader accessibility.	2024-12-11 11:55:31 +01:00
Daniel Langbein	b16ef90b8c	FinnSort: public access	2024-12-10 21:38:56 +00:00
M-H9	3f35d9bbfe	Created my branch folder for the merge	2024-12-10 18:12:08 +01:00
Daniel Langbein	75f7f34fa3	refactor	2024-12-10 18:10:32 +01:00
Daniel Langbein	09ee6a6e5f	Merge remote-tracking branch 'origin/implementation/Ambili'	2024-12-10 18:09:47 +01:00
Ambili Jacob	e92ecc309a	WIP power sort	2024-12-10 18:07:32 +01:00
Daniel Langbein	aeaaf792a3	Merge remote-tracking branch 'refs/remotes/origin/implementation-by-finn'	2024-12-10 18:00:42 +01:00
Daniel Langbein	3560f261a3	add bubblesort	2024-12-10 16:54:36 +00:00
Daniel Langbein	a945a3278e	benchmark: refactor	2024-12-10 16:53:07 +00:00