147 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
finnm	8a08e65ae9	Merge remote-tracking branch 'origin/main'	2025-02-01 18:07:59 +01:00
finnm	93138238db	Deletetd tests	2025-02-01 18:07:41 +01:00
Daniel Langbein	acbefbe554	CI: run JMH benchmark	2025-01-29 17:11:02 +01:00
Daniel Langbein	1b944c38f0	benchmark: adjusted time	2025-01-29 16:49:37 +01:00
Daniel Langbein	ce93b03506	Merge remote-tracking branch 'origin/main' ... # Conflicts: # app/src/jmh/java/de/uni_marburg/powersort/benchmark/JmhCgl.java	2025-01-29 16:02:04 +01:00
Daniel Langbein	3f3eef67d4	benchmark: changed param	2025-01-29 16:01:03 +01:00
M-H9	987fd3d30d	creating IMPL_M_5 and getting better performance than TimSort in every case	2025-01-28 22:58:22 +01:00
Daniel Langbein	2e9c2ca2bf	misc during meeting	2025-01-28 19:47:12 +01:00
M-H9	6694a076e5	creating IMPL_M_4 and getting better performance than TimSort in every case	2025-01-28 15:12:38 +01:00
Daniel Langbein	dec8585ab4	update LICENSE	2025-01-26 12:07:45 +01:00
Daniel Langbein	959cb20e7b	FasterFinnSort: stackLen calculation	2025-01-21 16:36:18 +00:00
Daniel Langbein	1fb89e8985	WIP: use Mockito	2025-01-21 16:35:47 +00:00
Daniel Langbein	60ca1275b5	benchmark: more warmup iterations	2025-01-21 16:33:42 +00:00
Daniel Langbein	592eda73a6	Merge remote-tracking branch 'origin/main' ... # Conflicts: # app/src/main/java/de/uni_marburg/powersort/FinnSort/FasterFinnSort.java	2025-01-21 14:18:28 +01:00
Daniel Langbein	5ea120013c	WIP: use Mockito	2025-01-21 13:12:45 +00:00
Daniel Langbein	e631d5161e	add Mockito	2025-01-21 13:12:05 +00:00
Daniel Langbein	9a6359d576	FasterFinnSort: change access	2025-01-21 13:10:12 +00:00
finnm	8be6fa32a8	Fixed merge order of FinnSort and added some testing methods	2025-01-19 13:10:18 +01:00
M-H9	f851b9784d	Integrating my test classes with the Object version IMPL_M_1 and passed the tests	2025-01-16 11:49:22 +01:00
M-H9	e526c67c3c	Reusing "merge" method again and getting a little better results in IMPL_M_1	2025-01-16 09:59:27 +01:00
Daniel Langbein	42a0c24f67	cleanup	2025-01-16 08:06:44 +00:00
M-H9	37ea4b6625	changing 1 to 0	2025-01-15 23:11:25 +01:00
M-H9	1ab2bdc2a0	adding IMPL_M_1Test sort method to the abstract list sorting test	2025-01-15 22:53:17 +01:00
M-H9	a684cb30ec	Converting IMPL_M_1 to Object and it works fine	2025-01-15 21:48:33 +01:00
M-H9	637b988afd	Merge branch 'refs/heads/powersort_M' ... # Conflicts: # app/src/main/java/de/uni_marburg/powersort/benchmark/Main.java	2025-01-15 14:00:01 +01:00
Daniel Langbein	e39a8082e3	benchmark: add input "many ascending runs"	2025-01-14 20:42:13 +00:00
Daniel Langbein	4198e28c79	benchmark: warmup & iterations	2025-01-14 12:08:25 +00:00
Daniel Langbein	82c58e403c	benchmark - JMH: reduced time, improved filtering	2025-01-14 12:08:19 +00:00
Daniel Langbein	4c5f004b06	.idea	2025-01-14 12:08:13 +00:00
Daniel Langbein	dfb302d009	chore: update nixpkgs	2025-01-14 12:08:08 +00:00
Daniel Langbein	1c81038773	chore: update Gradle	2025-01-14 12:08:03 +00:00
Daniel Langbein	ef9d8a512e	shell.nix: cleanup	2025-01-14 12:07:57 +00:00
M-H9	d446339983	Starting IMPL_M_2	2025-01-13 23:05:54 +01:00
M-H9	5637ee115f	Converted IMPL_M_1 to Generic	2025-01-13 22:58:45 +01:00
M-H9	a7f3ebfe50	Converted IMPL_M_1 to Generic	2025-01-13 22:58:28 +01:00
finnm	2b85e4e956	Updated the power function to use integers	2025-01-10 14:35:15 +01:00
Daniel Langbein	88f8df3c07	benchmark: Java max heap	2025-01-09 11:53:38 +00:00
Daniel Langbein	baa0a44b34	docs: README	2025-01-09 11:53:05 +00:00
Daniel Langbein	20bd4629b3	benchmark: JMH IntelliJ plugin	2025-01-07 17:55:53 +00:00
Daniel Langbein	e6ab4f6656	benchmark: separate benchmarks	2025-01-07 17:32:18 +00:00
Daniel Langbein	1133c069f8	shell.nix: fix JDK23	2025-01-07 17:26:25 +00:00
Daniel Langbein	648af1c4be	benchmark: separate JMH benchmarks	2025-01-07 16:43:57 +00:00
Daniel Langbein	1a356490e4	.idea	2025-01-07 16:36:52 +00:00
Daniel Langbein	ddbf8c1174	benchmark: JMH config	2025-01-07 16:07:41 +00:00
Daniel Langbein	5e2425bbca	benchmark: refactor	2025-01-07 14:25:47 +01:00
Daniel Langbein	4223f76727	benchmark: cleanup	2025-01-07 14:25:40 +01:00
Daniel Langbein	54f3ea6d42	benchmark: add input from competition ... # Conflicts: # app/src/main/java/de/uni_marburg/powersort/benchmark/Main.java # app/src/main/java/de/uni_marburg/powersort/sort/SortEnum.java	2025-01-07 14:25:28 +01:00
finnm	4268315f06	Changed FasterFinnSort to use the PowerSort merge policy	2025-01-05 14:26:07 +01:00
finnm	c8bed52bf6	Added FasterFinnSort to the Sort-Enum and created a test class	2025-01-05 14:25:41 +01:00
finnm	3974f575a9	Faster Merging of FinnSort	2025-01-05 12:33:26 +01:00