Mirror/powersort
1
0
Fork 0
mirror of https://gitlab.uni-marburg.de/langbeid/powersort.git synced 2025-01-22 19:55:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

benchmark: refactor

Browse Source
This commit is contained in:
Daniel Langbein 2024-12-10 16:53:07 +00:00
parent 8e20550b44
commit a945a3278e
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
8 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/jmh/java/de/uni_marburg/powersort/benchmark/BenchmarkJmh.java
View File

@ -1,9 +1,10 @@
package de.uni_marburg.powersort.benchmark; package de.uni_marburg.powersort.benchmark;
import de.uni_marburg.powersort.TimSort; import de.uni_marburg.powersort.sort.DummySort;
import de.uni_marburg.powersort.sort.MergeSort;
import de.uni_marburg.powersort.sort.TimSort;
import de.uni_marburg.powersort.data.RandomIntegers; import de.uni_marburg.powersort.data.RandomIntegers;
import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -28,16 +29,15 @@ public class BenchmarkJmh {
@BenchmarkMode(Mode.AverageTime) @BenchmarkMode(Mode.AverageTime)
@OutputTimeUnit(TimeUnit.MILLISECONDS) @OutputTimeUnit(TimeUnit.MILLISECONDS)
@Benchmark @Benchmark
public void rand1DummySort(State1 s, Blackhole bh) { public void rand1DummySort(State1 s) {
DummySort.sort(s.a, 0, s.a.length, NaturalOrder.INSTANCE, null, 0, 0); DummySort.sort(s.a, 0, s.a.length, NaturalOrder.INSTANCE, null, 0, 0);
} }
@BenchmarkMode(Mode.AverageTime) @BenchmarkMode(Mode.AverageTime)
@OutputTimeUnit(TimeUnit.MILLISECONDS) @OutputTimeUnit(TimeUnit.MILLISECONDS)
@Benchmark @Benchmark
public void rand1TimSort(State1 s, Blackhole bh) { public void rand1TimSort(State1 s) {
TimSort.sort(s.a, 0, s.a.length, NaturalOrder.INSTANCE, null, 0, 0); TimSort.sort(s.a, 0, s.a.length, NaturalOrder.INSTANCE, null, 0, 0);
bh.consume(s);
} }
@BenchmarkMode(Mode.AverageTime) @BenchmarkMode(Mode.AverageTime)

4
app/src/main/java/de/uni_marburg/powersort/benchmark/Main.java
View File

@ -1,6 +1,8 @@
package de.uni_marburg.powersort.benchmark; package de.uni_marburg.powersort.benchmark;
import de.uni_marburg.powersort.TimSort; import de.uni_marburg.powersort.sort.DummySort;
import de.uni_marburg.powersort.sort.MergeSort;
import de.uni_marburg.powersort.sort.TimSort;
import de.uni_marburg.powersort.data.DescendingIntegers; import de.uni_marburg.powersort.data.DescendingIntegers;
import de.uni_marburg.powersort.data.RandomIntegers; import de.uni_marburg.powersort.data.RandomIntegers;
import de.uni_marburg.powersort.data.ObjectSupplier; import de.uni_marburg.powersort.data.ObjectSupplier;

2
app/src/main/java/de/uni_marburg/powersort/ComparableTimSort.java → app/src/main/java/de/uni_marburg/powersort/sort/ComparableTimSort.java
View File

@ -24,7 +24,7 @@
* questions. * questions.
*/ */
package de.uni_marburg.powersort; package de.uni_marburg.powersort.sort;
/** /**
* This is a near duplicate of {@link TimSort}, modified for use with * This is a near duplicate of {@link TimSort}, modified for use with

4
app/src/main/java/de/uni_marburg/powersort/benchmark/DummySort.java → app/src/main/java/de/uni_marburg/powersort/sort/DummySort.java
View File

@ -1,4 +1,4 @@
package de.uni_marburg.powersort.benchmark; package de.uni_marburg.powersort.sort;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
@ -8,7 +8,7 @@ import java.util.Comparator;
* <p> * <p>
* Uses Arrays.sort() for sorting. * Uses Arrays.sort() for sorting.
*/ */
class DummySort { public class DummySort {
public static <T> void sort(T[] a, int lo, int hi, Comparator<? super T> c, public static <T> void sort(T[] a, int lo, int hi, Comparator<? super T> c,
T[] work, int workBase, int workLen) { T[] work, int workBase, int workLen) {
assert lo == 0; assert lo == 0;

2
app/src/main/java/de/uni_marburg/powersort/benchmark/DummySort2.java → app/src/main/java/de/uni_marburg/powersort/sort/DummySort2.java
View File

@ -1,4 +1,4 @@
package de.uni_marburg.powersort.benchmark; package de.uni_marburg.powersort.sort;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;

2
app/src/main/java/de/uni_marburg/powersort/benchmark/MergeSort.java → app/src/main/java/de/uni_marburg/powersort/sort/MergeSort.java
View File

@ -1,4 +1,4 @@
package de.uni_marburg.powersort.benchmark; package de.uni_marburg.powersort.sort;
import java.util.Comparator; import java.util.Comparator;

2
app/src/main/java/de/uni_marburg/powersort/PowerSort.java → app/src/main/java/de/uni_marburg/powersort/sort/PowerSort.java
View File

@ -1,4 +1,4 @@
package de.uni_marburg.powersort; package de.uni_marburg.powersort.sort;
import java.util.Comparator; import java.util.Comparator;

2
app/src/main/java/de/uni_marburg/powersort/TimSort.java → app/src/main/java/de/uni_marburg/powersort/sort/TimSort.java
View File

@ -24,7 +24,7 @@
* questions. * questions.
*/ */
package de.uni_marburg.powersort; package de.uni_marburg.powersort.sort;
import java.util.Comparator; import java.util.Comparator;