From b5d7ab5a6b923cd7d4081e4ad78cc75ca1c02c5f Mon Sep 17 00:00:00 2001
From: Vojtech Moravec <vojtech.moravec.st@vsb.cz>
Date: Wed, 25 Mar 2020 18:47:54 +0100
Subject: [PATCH] Renamec the benchmark classes.
---
.../benchmark/CompressionBenchmark.java | 4 ++--
...QuantizationBenchmark.java => SQBenchmark.java} | 14 +++-----------
...QuantizationBenchmark.java => VQBenchmark.java} | 6 +++---
3 files changed, 8 insertions(+), 16 deletions(-)
rename src/main/java/azgracompress/benchmark/{ScalarQuantizationBenchmark.java => SQBenchmark.java} (90%)
rename src/main/java/azgracompress/benchmark/{VectorQuantizationBenchmark.java => VQBenchmark.java} (95%)
diff --git a/src/main/java/azgracompress/benchmark/CompressionBenchmark.java b/src/main/java/azgracompress/benchmark/CompressionBenchmark.java
index d704195..83d9dc9 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 44de36e..4ec378a 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 c3df11c..1e431eb 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);
}
--
GitLab