mirror of
https://gitlab.uni-marburg.de/langbeid/powersort.git
synced 2025-01-21 19:50:35 +01:00
benchmark: more input lists
This commit is contained in:
parent
3fbee13d07
commit
8379570f9a
@ -3,11 +3,9 @@ package de.uni_marburg.powersort.data;
|
|||||||
import de.uni_marburg.powersort.benchmark.IntegerArray;
|
import de.uni_marburg.powersort.benchmark.IntegerArray;
|
||||||
import de.uni_marburg.powersort.benchmark.LongFormatter;
|
import de.uni_marburg.powersort.benchmark.LongFormatter;
|
||||||
|
|
||||||
import static de.uni_marburg.powersort.data.DataArraySizes.SIZE_ASC;
|
|
||||||
|
|
||||||
public class AscendingIntegers extends IntegerSupplier {
|
public class AscendingIntegers extends IntegerSupplier {
|
||||||
public AscendingIntegers() {
|
public AscendingIntegers(int size) {
|
||||||
super(IntegerArray.ascending( 1, SIZE_ASC));
|
super(IntegerArray.ascending( 1, size));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
package de.uni_marburg.powersort.data;
|
|
||||||
|
|
||||||
public interface DataArraySizes {
|
|
||||||
int SIZE_RAND = 50_000_000;
|
|
||||||
int SIZE_ASC = 50_000_000;
|
|
||||||
int SIZE_DESC = 50_000_000;
|
|
||||||
}
|
|
@ -4,18 +4,23 @@ public enum DataEnum {
|
|||||||
RANDOM_INTEGERS,
|
RANDOM_INTEGERS,
|
||||||
ASCENDING_INTEGERS,
|
ASCENDING_INTEGERS,
|
||||||
DESCENDING_INTEGERS,
|
DESCENDING_INTEGERS,
|
||||||
ASCENDING_RUNS;
|
ASCENDING_RUNS,
|
||||||
|
ASCENDING_RUNS_WITH_OVERLAP;
|
||||||
|
|
||||||
public ObjectSupplier get() {
|
public ObjectSupplier get() {
|
||||||
// We use a seed to get the same random list every time -> Repeatable benchmarks on same input data!
|
// We use a seed to get the same random list every time -> Repeatable benchmarks on same input data!
|
||||||
// final long seed = 3651660232967549736L; // System.nanoTime() ++ Math.random()
|
// final long seed = 3651660232967549736L; // System.nanoTime() ++ Math.random()
|
||||||
final long seed = 140506881906827520L; // (long) 'P' * (long) 'O' *(long) 'W' * (long) 'E' * (long) 'R' * (long) 'S' * (long) 'O' * (long) 'R' * (long) 'T';
|
final long seed = 140506881906827520L; // (long) 'P' * (long) 'O' *(long) 'W' * (long) 'E' * (long) 'R' * (long) 'S' * (long) 'O' * (long) 'R' * (long) 'T';
|
||||||
|
|
||||||
|
int longListSize = 50_000_000;
|
||||||
|
|
||||||
return switch (this) {
|
return switch (this) {
|
||||||
case RANDOM_INTEGERS -> new RandomIntegers(seed);
|
case RANDOM_INTEGERS -> new RandomIntegers(longListSize, seed);
|
||||||
case ASCENDING_INTEGERS -> new AscendingIntegers();
|
case ASCENDING_INTEGERS -> new AscendingIntegers(longListSize);
|
||||||
case DESCENDING_INTEGERS -> new DescendingIntegers();
|
case DESCENDING_INTEGERS -> new DescendingIntegers(longListSize);
|
||||||
case ASCENDING_RUNS -> AscendingRuns.newAscendingRuns(10000, 10000, -10000);
|
|
||||||
|
case ASCENDING_RUNS -> AscendingRuns.newAscendingRuns(10_000, 10_000, -10_000);
|
||||||
|
case ASCENDING_RUNS_WITH_OVERLAP -> AscendingRuns.newAscendingRuns(10_000, 10_000, -5_000);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,11 +3,9 @@ package de.uni_marburg.powersort.data;
|
|||||||
import de.uni_marburg.powersort.benchmark.IntegerArray;
|
import de.uni_marburg.powersort.benchmark.IntegerArray;
|
||||||
import de.uni_marburg.powersort.benchmark.LongFormatter;
|
import de.uni_marburg.powersort.benchmark.LongFormatter;
|
||||||
|
|
||||||
import static de.uni_marburg.powersort.data.DataArraySizes.SIZE_DESC;
|
|
||||||
|
|
||||||
public class DescendingIntegers extends IntegerSupplier {
|
public class DescendingIntegers extends IntegerSupplier {
|
||||||
public DescendingIntegers() {
|
public DescendingIntegers(int size) {
|
||||||
super(IntegerArray.descending(SIZE_DESC, 1));
|
super(IntegerArray.descending(size, 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -3,11 +3,9 @@ package de.uni_marburg.powersort.data;
|
|||||||
import de.uni_marburg.powersort.benchmark.IntegerArray;
|
import de.uni_marburg.powersort.benchmark.IntegerArray;
|
||||||
import de.uni_marburg.powersort.benchmark.LongFormatter;
|
import de.uni_marburg.powersort.benchmark.LongFormatter;
|
||||||
|
|
||||||
import static de.uni_marburg.powersort.data.DataArraySizes.SIZE_RAND;
|
|
||||||
|
|
||||||
public class RandomIntegers extends IntegerSupplier {
|
public class RandomIntegers extends IntegerSupplier {
|
||||||
public RandomIntegers(final long seed) {
|
public RandomIntegers(final int size, final long seed) {
|
||||||
super(IntegerArray.random(SIZE_RAND, seed));
|
super(IntegerArray.random(size, seed));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,17 +1,20 @@
|
|||||||
package de.uni_marburg.powersort.sort;
|
package de.uni_marburg.powersort.sort;
|
||||||
|
|
||||||
|
import de.uni_marburg.powersort.FinnSort.FinnSort;
|
||||||
import de.uni_marburg.powersort.benchmark.NaturalOrder;
|
import de.uni_marburg.powersort.benchmark.NaturalOrder;
|
||||||
|
|
||||||
public enum SortEnum {
|
public enum SortEnum {
|
||||||
// BUBBLE_SORT,
|
// BUBBLE_SORT,
|
||||||
MERGE_SORT,
|
MERGE_SORT,
|
||||||
TIM_SORT;
|
TIM_SORT,
|
||||||
|
FIN_SORT;
|
||||||
|
|
||||||
public SimpleSort get() {
|
public SimpleSort get() {
|
||||||
return switch (this) {
|
return switch (this) {
|
||||||
// case BUBBLE_SORT -> array -> BubbleSort.sort(array, NaturalOrder.INSTANCE);
|
// case BUBBLE_SORT -> array -> BubbleSort.sort(array, NaturalOrder.INSTANCE);
|
||||||
case MERGE_SORT -> array -> MergeSort.legacyMergeSort(array, NaturalOrder.INSTANCE);
|
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 TIM_SORT -> array -> TimSort.sort(array, 0, array.length, NaturalOrder.INSTANCE, null, 0, 0);
|
||||||
|
case FIN_SORT -> array -> FinnSort.sort(array, NaturalOrder.INSTANCE);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user