From 37ea4b66258f20bfe0d880c619e649d5814e8d40 Mon Sep 17 00:00:00 2001 From: M-H9 Date: Wed, 15 Jan 2025 23:11:25 +0100 Subject: [PATCH] changing 1 to 0 --- .../java/de/uni_marburg/powersort/benchmark/JmhCgl.java | 2 +- .../main/java/de/uni_marburg/powersort/sort/SortEnum.java | 8 ++++---- .../java/de/uni_marburg/powersort/sort/IMPL_M_1Test.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/jmh/java/de/uni_marburg/powersort/benchmark/JmhCgl.java b/app/src/jmh/java/de/uni_marburg/powersort/benchmark/JmhCgl.java index 484668f..dff9de6 100644 --- a/app/src/jmh/java/de/uni_marburg/powersort/benchmark/JmhCgl.java +++ b/app/src/jmh/java/de/uni_marburg/powersort/benchmark/JmhCgl.java @@ -23,7 +23,7 @@ public class JmhCgl extends JmhBase { // Either all or a selection of sort implementations. //@Param() - @Param({"TIM_SORT", "FASTER_FINN_SORT", "IMPL_M_11"}) + @Param({"TIM_SORT", "FASTER_FINN_SORT", "IMPL_M_11", "IMPL_M_21"}) SortEnum sortEnum; @Override diff --git a/app/src/main/java/de/uni_marburg/powersort/sort/SortEnum.java b/app/src/main/java/de/uni_marburg/powersort/sort/SortEnum.java index 105f6a0..bac315d 100644 --- a/app/src/main/java/de/uni_marburg/powersort/sort/SortEnum.java +++ b/app/src/main/java/de/uni_marburg/powersort/sort/SortEnum.java @@ -12,8 +12,8 @@ public enum SortEnum { FASTER_FINN_SORT, ASORT, FINN_SORT, - IMPL_M_11, - IMPL_M_21, + IMPL_M_10, + IMPL_M_20, DPQS, QUICK_SORT, MERGE_SORT, @@ -27,8 +27,8 @@ public enum SortEnum { case MERGE_SORT -> array -> MergeSort.legacyMergeSort(array, NaturalOrder.INSTANCE); case TIM_SORT -> array -> TimSort.sort(array, 0, array.length, NaturalOrder.INSTANCE, null, 0, 0); case FINN_SORT -> array -> FinnSort.sort(array, NaturalOrder.INSTANCE); - case IMPL_M_11 -> array -> IMPL_M_1.powerSort(array,NaturalOrder.INSTANCE); - case IMPL_M_21 -> array -> IMPL_M_2.sort(array, 0, array.length, NaturalOrder.INSTANCE, null, 0, 0); + case IMPL_M_10 -> array -> IMPL_M_1.powerSort(array,NaturalOrder.INSTANCE); + case IMPL_M_20 -> array -> IMPL_M_2.sort(array, 0, array.length, NaturalOrder.INSTANCE, null, 0, 0); case FASTER_FINN_SORT -> array -> FasterFinnSort.sort(array, 0, array.length, NaturalOrder.INSTANCE, null, 0, 0); case ASORT -> array -> ASort.sort(array, NaturalOrder.INSTANCE); }; diff --git a/app/src/test/java/de/uni_marburg/powersort/sort/IMPL_M_1Test.java b/app/src/test/java/de/uni_marburg/powersort/sort/IMPL_M_1Test.java index 0b82c4b..b527e7a 100644 --- a/app/src/test/java/de/uni_marburg/powersort/sort/IMPL_M_1Test.java +++ b/app/src/test/java/de/uni_marburg/powersort/sort/IMPL_M_1Test.java @@ -2,6 +2,6 @@ package de.uni_marburg.powersort.sort; public class IMPL_M_1Test extends AbstractSortTest { IMPL_M_1Test() { - sortAlg = SortEnum.IMPL_M_11; + sortAlg = SortEnum.IMPL_M_10; } } \ No newline at end of file