diff --git a/src/main/java/azgracompress/benchmark/CompressionBenchmark.java b/src/main/java/azgracompress/benchmark/CompressionBenchmark.java index d704195d956997994013dbac1123f18fb335cec9..83d9dc9136fcea2579784cebf262e34783e39c61 100644 --- a/src/main/java/azgracompress/benchmark/CompressionBenchmark.java +++ b/src/main/java/azgracompress/benchmark/CompressionBenchmark.java @@ -6,13 +6,13 @@ public class CompressionBenchmark { public static void runBenchmark(final ParsedCliOptions options) { switch (options.getQuantizationType()) { case Scalar: { - ScalarQuantizationBenchmark sqBenchmark = new ScalarQuantizationBenchmark(options); + SQBenchmark sqBenchmark = new SQBenchmark(options); sqBenchmark.startBenchmark(); } break; case Vector1D: case Vector2D: { - VectorQuantizationBenchmark vqBenchmark = new VectorQuantizationBenchmark(options); + VQBenchmark vqBenchmark = new VQBenchmark(options); vqBenchmark.startBenchmark(options.getVectorDimension()); } break; diff --git a/src/main/java/azgracompress/benchmark/ScalarQuantizationBenchmark.java b/src/main/java/azgracompress/benchmark/SQBenchmark.java similarity index 90% rename from src/main/java/azgracompress/benchmark/ScalarQuantizationBenchmark.java rename to src/main/java/azgracompress/benchmark/SQBenchmark.java index 44de36ee0c0789a2e854f0b004f816db4470b6d5..4ec378a0310c67cbc6a6b48d389a3560c64bd433 100644 --- a/src/main/java/azgracompress/benchmark/ScalarQuantizationBenchmark.java +++ b/src/main/java/azgracompress/benchmark/SQBenchmark.java @@ -1,10 +1,9 @@ package azgracompress.benchmark; import azgracompress.U16; +import azgracompress.cache.QuantizationCacheManager; import azgracompress.cli.ParsedCliOptions; -import azgracompress.data.V3i; import azgracompress.quantization.QTrainIteration; -import azgracompress.cache.QuantizationCacheManager; import azgracompress.quantization.scalar.LloydMaxU16ScalarQuantization; import azgracompress.quantization.scalar.SQCodebook; import azgracompress.quantization.scalar.ScalarQuantizer; @@ -14,15 +13,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; -public class ScalarQuantizationBenchmark extends BenchmarkBase { - public ScalarQuantizationBenchmark(final String inputFile, - final String outputDirectory, - final int[] planes, - final V3i rawImageDims) { - super(inputFile, outputDirectory, planes, rawImageDims); - } - - public ScalarQuantizationBenchmark(final ParsedCliOptions options) { +public class SQBenchmark extends BenchmarkBase { + public SQBenchmark(final ParsedCliOptions options) { super(options); } diff --git a/src/main/java/azgracompress/benchmark/VectorQuantizationBenchmark.java b/src/main/java/azgracompress/benchmark/VQBenchmark.java similarity index 95% rename from src/main/java/azgracompress/benchmark/VectorQuantizationBenchmark.java rename to src/main/java/azgracompress/benchmark/VQBenchmark.java index c3df11c0830cb40dfd12926be0e3ae6e38732f21..1e431ebb0e9ef376b4136ab41cf01524c72069a1 100644 --- a/src/main/java/azgracompress/benchmark/VectorQuantizationBenchmark.java +++ b/src/main/java/azgracompress/benchmark/VQBenchmark.java @@ -10,15 +10,15 @@ import azgracompress.quantization.vector.VectorQuantizer; import java.io.File; -public class VectorQuantizationBenchmark extends BenchmarkBase { +public class VQBenchmark extends BenchmarkBase { final static V2i DEFAULT_QVECTOR = new V2i(3, 3); - public VectorQuantizationBenchmark(String inputFile, String outputDirectory, int[] planes, V3i rawImageDims) { + public VQBenchmark(String inputFile, String outputDirectory, int[] planes, V3i rawImageDims) { super(inputFile, outputDirectory, planes, rawImageDims); } - public VectorQuantizationBenchmark(final ParsedCliOptions options) { + public VQBenchmark(final ParsedCliOptions options) { super(options); }