From e177176c572d6d9e11dd3790439dfa21bee601e3 Mon Sep 17 00:00:00 2001
From: Vojtech Moravec <vojtech.moravec.st@vsb.cz>
Date: Mon, 24 Aug 2020 13:24:35 +0200
Subject: [PATCH] Rename ParsedCliOptions -> CompressionOptionsCLIParser.
---
.../java/azgracompress/DataCompressor.java | 32 +++++++++----------
.../azgracompress/benchmark/Benchmark.java | 12 +++----
.../benchmark/BenchmarkBase.java | 6 ++--
.../benchmark/CompressionBenchmark.java | 4 +--
.../azgracompress/benchmark/SQBenchmark.java | 4 +--
.../azgracompress/benchmark/VQBenchmark.java | 4 +--
....java => CompressionOptionsCLIParser.java} | 4 +--
.../azgracompress/cli/CustomFunctionBase.java | 4 +--
.../cli/functions/EntropyCalculation.java | 4 +--
.../functions/MeasurePlaneErrorFunction.java | 4 +--
10 files changed, 39 insertions(+), 39 deletions(-)
rename src/main/java/azgracompress/cli/{ParsedCliOptions.java => CompressionOptionsCLIParser.java} (99%)
diff --git a/src/main/java/azgracompress/DataCompressor.java b/src/main/java/azgracompress/DataCompressor.java
index 89e6a2c..35c7c79 100644
--- a/src/main/java/azgracompress/DataCompressor.java
+++ b/src/main/java/azgracompress/DataCompressor.java
@@ -4,7 +4,7 @@ import azgracompress.benchmark.CompressionBenchmark;
import azgracompress.cache.QuantizationCacheManager;
import azgracompress.cli.CliConstants;
import azgracompress.cli.CustomFunctionBase;
-import azgracompress.cli.ParsedCliOptions;
+import azgracompress.cli.CompressionOptionsCLIParser;
import azgracompress.cli.functions.EntropyCalculation;
import azgracompress.compression.ImageCompressor;
import azgracompress.compression.ImageDecompressor;
@@ -36,28 +36,28 @@ public class DataCompressor {
return;
}
- ParsedCliOptions parsedCliOptions = new ParsedCliOptions(cmd);
+ CompressionOptionsCLIParser compressionOptionsCLIParser = new CompressionOptionsCLIParser(cmd);
// NOTE(Moravec): From this point we need to dispose of possible existing SCIFIO context.
- if (parsedCliOptions.parseError()) {
- System.err.println(parsedCliOptions.getParseError());
+ if (compressionOptionsCLIParser.parseError()) {
+ System.err.println(compressionOptionsCLIParser.getParseError());
ScifioWrapper.dispose();
return;
}
- if (parsedCliOptions.isVerbose()) {
- System.out.println(parsedCliOptions.report());
+ if (compressionOptionsCLIParser.isVerbose()) {
+ System.out.println(compressionOptionsCLIParser.report());
}
- switch (parsedCliOptions.getMethod()) {
+ switch (compressionOptionsCLIParser.getMethod()) {
case Compress: {
- ImageCompressor compressor = new ImageCompressor(parsedCliOptions);
+ ImageCompressor compressor = new ImageCompressor(compressionOptionsCLIParser);
if (!compressor.compress()) {
System.err.println("Errors occurred during compression.");
}
}
break;
case Decompress: {
- ImageDecompressor decompressor = new ImageDecompressor(parsedCliOptions);
+ ImageDecompressor decompressor = new ImageDecompressor(compressionOptionsCLIParser);
if (!decompressor.decompressToFile()) {
System.err.println("Errors occurred during decompression.");
}
@@ -65,11 +65,11 @@ public class DataCompressor {
break;
case Benchmark: {
- CompressionBenchmark.runBenchmark(parsedCliOptions);
+ CompressionBenchmark.runBenchmark(compressionOptionsCLIParser);
}
break;
case TrainCodebook: {
- ImageCompressor compressor = new ImageCompressor(parsedCliOptions);
+ ImageCompressor compressor = new ImageCompressor(compressionOptionsCLIParser);
if (!compressor.trainAndSaveCodebook()) {
System.err.println("Errors occurred during training/saving of codebook.");
}
@@ -79,7 +79,7 @@ public class DataCompressor {
// NOTE(Moravec): Custom function class here |
// V
//CustomFunctionBase customFunction = new MeasurePlaneErrorFunction(parsedCliOptions);
- CustomFunctionBase customFunction = new EntropyCalculation(parsedCliOptions);
+ CustomFunctionBase customFunction = new EntropyCalculation(compressionOptionsCLIParser);
if (!customFunction.run()) {
System.err.println("Errors occurred during custom function.");
}
@@ -91,11 +91,11 @@ public class DataCompressor {
}
break;
case InspectFile: {
- if (parsedCliOptions.getInputDataInfo().getFilePath().endsWith(FileExtensions.CACHE_FILE_EXT)) {
- QuantizationCacheManager.inspectCacheFile(parsedCliOptions.getInputDataInfo().getFilePath(),
- parsedCliOptions.isVerbose());
+ if (compressionOptionsCLIParser.getInputDataInfo().getFilePath().endsWith(FileExtensions.CACHE_FILE_EXT)) {
+ QuantizationCacheManager.inspectCacheFile(compressionOptionsCLIParser.getInputDataInfo().getFilePath(),
+ compressionOptionsCLIParser.isVerbose());
} else {
- ImageDecompressor decompressor = new ImageDecompressor(parsedCliOptions);
+ ImageDecompressor decompressor = new ImageDecompressor(compressionOptionsCLIParser);
try {
System.out.println(decompressor.inspectCompressedFile());
} catch (IOException e) {
diff --git a/src/main/java/azgracompress/benchmark/Benchmark.java b/src/main/java/azgracompress/benchmark/Benchmark.java
index 9c81a82..91fb4fd 100644
--- a/src/main/java/azgracompress/benchmark/Benchmark.java
+++ b/src/main/java/azgracompress/benchmark/Benchmark.java
@@ -1,7 +1,7 @@
package azgracompress.benchmark;
import azgracompress.U16;
-import azgracompress.cli.ParsedCliOptions;
+import azgracompress.cli.CompressionOptionsCLIParser;
import azgracompress.compression.ImageCompressor;
import azgracompress.compression.ImageDecompressor;
import azgracompress.data.ImageU16Dataset;
@@ -19,19 +19,19 @@ import java.util.Optional;
public class Benchmark extends BenchmarkBase {
- protected Benchmark(ParsedCliOptions options) {
+ protected Benchmark(CompressionOptionsCLIParser options) {
super(options);
}
@Override
public void startBenchmark() {
assert (options.getInputDataInfo().isPlaneIndexSet());
- ParsedCliOptions compressOps;
- ParsedCliOptions decompressOps;
+ CompressionOptionsCLIParser compressOps;
+ CompressionOptionsCLIParser decompressOps;
try {
// NOTE: This works, right?
- compressOps = (ParsedCliOptions) options.clone();
- decompressOps = (ParsedCliOptions) options.clone();
+ compressOps = (CompressionOptionsCLIParser) options.clone();
+ decompressOps = (CompressionOptionsCLIParser) options.clone();
} catch (CloneNotSupportedException e) {
System.err.println(e.getMessage());
e.printStackTrace();
diff --git a/src/main/java/azgracompress/benchmark/BenchmarkBase.java b/src/main/java/azgracompress/benchmark/BenchmarkBase.java
index bd81e5a..43c1e2f 100644
--- a/src/main/java/azgracompress/benchmark/BenchmarkBase.java
+++ b/src/main/java/azgracompress/benchmark/BenchmarkBase.java
@@ -2,7 +2,7 @@ package azgracompress.benchmark;
import azgracompress.compression.CompressionOptions;
import azgracompress.io.InputData;
-import azgracompress.cli.ParsedCliOptions;
+import azgracompress.cli.CompressionOptionsCLIParser;
import azgracompress.data.ImageU16;
import azgracompress.data.V3i;
import azgracompress.io.RawDataIO;
@@ -35,9 +35,9 @@ abstract class BenchmarkBase {
protected final int workerCount;
- protected final ParsedCliOptions options;
+ protected final CompressionOptionsCLIParser options;
- protected BenchmarkBase(final ParsedCliOptions options) {
+ protected BenchmarkBase(final CompressionOptionsCLIParser options) {
this.options = options;
final InputData ifi = options.getInputDataInfo();
diff --git a/src/main/java/azgracompress/benchmark/CompressionBenchmark.java b/src/main/java/azgracompress/benchmark/CompressionBenchmark.java
index 1f71768..bc29bea 100644
--- a/src/main/java/azgracompress/benchmark/CompressionBenchmark.java
+++ b/src/main/java/azgracompress/benchmark/CompressionBenchmark.java
@@ -1,9 +1,9 @@
package azgracompress.benchmark;
-import azgracompress.cli.ParsedCliOptions;
+import azgracompress.cli.CompressionOptionsCLIParser;
public class CompressionBenchmark {
- public static void runBenchmark(final ParsedCliOptions options) {
+ public static void runBenchmark(final CompressionOptionsCLIParser options) {
Benchmark benchmark = new Benchmark(options);
benchmark.startBenchmark();
// switch (options.getQuantizationType()) {
diff --git a/src/main/java/azgracompress/benchmark/SQBenchmark.java b/src/main/java/azgracompress/benchmark/SQBenchmark.java
index 50a7504..f423cc5 100644
--- a/src/main/java/azgracompress/benchmark/SQBenchmark.java
+++ b/src/main/java/azgracompress/benchmark/SQBenchmark.java
@@ -2,7 +2,7 @@ package azgracompress.benchmark;
import azgracompress.U16;
import azgracompress.cache.QuantizationCacheManager;
-import azgracompress.cli.ParsedCliOptions;
+import azgracompress.cli.CompressionOptionsCLIParser;
import azgracompress.compression.CompressionOptions;
import azgracompress.io.loader.IPlaneLoader;
import azgracompress.io.loader.PlaneLoaderFactory;
@@ -18,7 +18,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
public class SQBenchmark extends BenchmarkBase {
- public SQBenchmark(final ParsedCliOptions options) {
+ public SQBenchmark(final CompressionOptionsCLIParser options) {
super(options);
}
diff --git a/src/main/java/azgracompress/benchmark/VQBenchmark.java b/src/main/java/azgracompress/benchmark/VQBenchmark.java
index 5b347ad..5c9257c 100644
--- a/src/main/java/azgracompress/benchmark/VQBenchmark.java
+++ b/src/main/java/azgracompress/benchmark/VQBenchmark.java
@@ -1,6 +1,6 @@
package azgracompress.benchmark;
-import azgracompress.cli.ParsedCliOptions;
+import azgracompress.cli.CompressionOptionsCLIParser;
import azgracompress.data.Block;
import azgracompress.data.ImageU16;
import azgracompress.data.V2i;
@@ -8,7 +8,7 @@ import azgracompress.data.V3i;
public class VQBenchmark extends BenchmarkBase {
- public VQBenchmark(final ParsedCliOptions options) {
+ public VQBenchmark(final CompressionOptionsCLIParser options) {
super(options);
}
diff --git a/src/main/java/azgracompress/cli/ParsedCliOptions.java b/src/main/java/azgracompress/cli/CompressionOptionsCLIParser.java
similarity index 99%
rename from src/main/java/azgracompress/cli/ParsedCliOptions.java
rename to src/main/java/azgracompress/cli/CompressionOptionsCLIParser.java
index db87c5a..9737e72 100644
--- a/src/main/java/azgracompress/cli/ParsedCliOptions.java
+++ b/src/main/java/azgracompress/cli/CompressionOptionsCLIParser.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.nio.file.Paths;
import java.util.Optional;
-public class ParsedCliOptions extends CompressionOptions implements Cloneable {
+public class CompressionOptionsCLIParser extends CompressionOptions implements Cloneable {
private static final int DEFAULT_BITS_PER_PIXEL = 8;
/**
@@ -44,7 +44,7 @@ public class ParsedCliOptions extends CompressionOptions implements Cloneable {
*
* @param cmdInput Command line arguments.
*/
- public ParsedCliOptions(CommandLine cmdInput) {
+ public CompressionOptionsCLIParser(CommandLine cmdInput) {
parseCLI(cmdInput);
}
diff --git a/src/main/java/azgracompress/cli/CustomFunctionBase.java b/src/main/java/azgracompress/cli/CustomFunctionBase.java
index 42d2ceb..8af8992 100644
--- a/src/main/java/azgracompress/cli/CustomFunctionBase.java
+++ b/src/main/java/azgracompress/cli/CustomFunctionBase.java
@@ -1,13 +1,13 @@
package azgracompress.cli;
public abstract class CustomFunctionBase {
- protected final ParsedCliOptions options;
+ protected final CompressionOptionsCLIParser options;
/**
* Base constructor with parsed CLI options.
* @param options Parsed cli options.
*/
- public CustomFunctionBase(ParsedCliOptions options) {
+ public CustomFunctionBase(CompressionOptionsCLIParser options) {
this.options = options;
}
diff --git a/src/main/java/azgracompress/cli/functions/EntropyCalculation.java b/src/main/java/azgracompress/cli/functions/EntropyCalculation.java
index e1d2653..1110002 100644
--- a/src/main/java/azgracompress/cli/functions/EntropyCalculation.java
+++ b/src/main/java/azgracompress/cli/functions/EntropyCalculation.java
@@ -1,7 +1,7 @@
package azgracompress.cli.functions;
import azgracompress.cli.CustomFunctionBase;
-import azgracompress.cli.ParsedCliOptions;
+import azgracompress.cli.CompressionOptionsCLIParser;
import azgracompress.io.loader.IPlaneLoader;
import azgracompress.io.loader.PlaneLoaderFactory;
import azgracompress.utilities.Utils;
@@ -14,7 +14,7 @@ public class EntropyCalculation extends CustomFunctionBase {
*
* @param options Parsed cli options.
*/
- public EntropyCalculation(ParsedCliOptions options) {
+ public EntropyCalculation(CompressionOptionsCLIParser options) {
super(options);
}
diff --git a/src/main/java/azgracompress/cli/functions/MeasurePlaneErrorFunction.java b/src/main/java/azgracompress/cli/functions/MeasurePlaneErrorFunction.java
index f644cb8..161bc15 100644
--- a/src/main/java/azgracompress/cli/functions/MeasurePlaneErrorFunction.java
+++ b/src/main/java/azgracompress/cli/functions/MeasurePlaneErrorFunction.java
@@ -1,7 +1,7 @@
package azgracompress.cli.functions;
import azgracompress.cli.CustomFunctionBase;
-import azgracompress.cli.ParsedCliOptions;
+import azgracompress.cli.CompressionOptionsCLIParser;
import azgracompress.data.V3i;
import azgracompress.io.FileInputData;
import azgracompress.io.loader.RawDataLoader;
@@ -13,7 +13,7 @@ import java.io.OutputStreamWriter;
import java.util.Arrays;
public class MeasurePlaneErrorFunction extends CustomFunctionBase {
- public MeasurePlaneErrorFunction(ParsedCliOptions options) {
+ public MeasurePlaneErrorFunction(CompressionOptionsCLIParser options) {
super(options);
}
--
GitLab