diff --git a/app/src/main/java/de/uni_marburg/powersort/benchmark/Main.java b/app/src/main/java/de/uni_marburg/powersort/benchmark/Main.java index 29a88b0..b022e79 100644 --- a/app/src/main/java/de/uni_marburg/powersort/benchmark/Main.java +++ b/app/src/main/java/de/uni_marburg/powersort/benchmark/Main.java @@ -1,6 +1,7 @@ package de.uni_marburg.powersort.benchmark; -import de.uni_marburg.powersort.data.DataEnum; +import + de.uni_marburg.powersort.data.DataEnum; import de.uni_marburg.powersort.sort.SortEnum; import de.uni_marburg.powersort.data.ObjectSupplier; @@ -17,7 +18,7 @@ public class Main { System.out.println(); for (DataEnum dataEnum : dataEnums) { - System.out.println("⏳ Creating object supplier " + dataEnum + " ⏳"); + System.out.println(" Creating object supplier " + dataEnum + " "); ObjectSupplier objectSupplier = dataEnum.getObjectSupplier(); for (SortEnum sortImplementation : sortImplementations) { 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 56a9901..9228eb6 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 @@ -1,6 +1,7 @@ package de.uni_marburg.powersort.sort; import de.uni_marburg.powersort.FinnSort.FinnSort; +import de.uni_marburg.powersort.FinnSort.FasterFinnSort; import de.uni_marburg.powersort.benchmark.NaturalOrder; import de.uni_marburg.powersort.sort.dpqs.DualPivotQuicksort; @@ -11,6 +12,7 @@ public enum SortEnum { MERGE_SORT, TIM_SORT, FINN_SORT, + FASTER_FINN_SORT, ASORT; public SortImpl getSortImpl() { @@ -21,6 +23,7 @@ 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 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/FasterFinnSortTest.java b/app/src/test/java/de/uni_marburg/powersort/sort/FasterFinnSortTest.java new file mode 100644 index 0000000..1eff05c --- /dev/null +++ b/app/src/test/java/de/uni_marburg/powersort/sort/FasterFinnSortTest.java @@ -0,0 +1,8 @@ +package de.uni_marburg.powersort.sort; + +public class FasterFinnSortTest extends AbstractSortTest { + FasterFinnSortTest() { + sortAlg = SortEnum.FASTER_FINN_SORT; + } + +}