From ebe97aa26820df039f28c3f9ade17fb17a44039e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Moravec?= <theazgra@gmail.com> Date: Mon, 20 Jul 2020 13:06:31 +0200 Subject: [PATCH] Move loaders into separate package. --- src/main/java/azgracompress/benchmark/SQBenchmark.java | 4 ++-- src/main/java/azgracompress/benchmark/VQBenchmark.java | 4 ++-- .../cli/functions/MeasurePlaneErrorFunction.java | 2 +- .../java/azgracompress/compression/SQImageCompressor.java | 4 ++-- .../java/azgracompress/compression/VQImageCompressor.java | 4 ++-- src/main/java/azgracompress/io/{ => loader}/IPlaneLoader.java | 2 +- .../azgracompress/io/{ => loader}/PlaneLoaderFactory.java | 4 +++- .../java/azgracompress/io/{ => loader}/RawDataLoader.java | 3 ++- src/main/java/azgracompress/io/{ => loader}/SCIFIOLoader.java | 3 ++- 9 files changed, 17 insertions(+), 13 deletions(-) rename src/main/java/azgracompress/io/{ => loader}/IPlaneLoader.java (89%) rename src/main/java/azgracompress/io/{ => loader}/PlaneLoaderFactory.java (91%) rename src/main/java/azgracompress/io/{ => loader}/RawDataLoader.java (98%) rename src/main/java/azgracompress/io/{ => loader}/SCIFIOLoader.java (98%) diff --git a/src/main/java/azgracompress/benchmark/SQBenchmark.java b/src/main/java/azgracompress/benchmark/SQBenchmark.java index daeb51d..1fc7d82 100644 --- a/src/main/java/azgracompress/benchmark/SQBenchmark.java +++ b/src/main/java/azgracompress/benchmark/SQBenchmark.java @@ -3,8 +3,8 @@ package azgracompress.benchmark; import azgracompress.U16; import azgracompress.cache.QuantizationCacheManager; import azgracompress.cli.ParsedCliOptions; -import azgracompress.io.IPlaneLoader; -import azgracompress.io.PlaneLoaderFactory; +import azgracompress.io.loader.IPlaneLoader; +import azgracompress.io.loader.PlaneLoaderFactory; import azgracompress.quantization.QTrainIteration; import azgracompress.quantization.scalar.LloydMaxU16ScalarQuantization; import azgracompress.quantization.scalar.SQCodebook; diff --git a/src/main/java/azgracompress/benchmark/VQBenchmark.java b/src/main/java/azgracompress/benchmark/VQBenchmark.java index e2c4a0d..c9095c4 100644 --- a/src/main/java/azgracompress/benchmark/VQBenchmark.java +++ b/src/main/java/azgracompress/benchmark/VQBenchmark.java @@ -4,8 +4,8 @@ import azgracompress.U16; import azgracompress.cache.QuantizationCacheManager; import azgracompress.cli.ParsedCliOptions; import azgracompress.data.*; -import azgracompress.io.IPlaneLoader; -import azgracompress.io.PlaneLoaderFactory; +import azgracompress.io.loader.IPlaneLoader; +import azgracompress.io.loader.PlaneLoaderFactory; import azgracompress.quantization.vector.LBGResult; import azgracompress.quantization.vector.LBGVectorQuantizer; import azgracompress.quantization.vector.VQCodebook; diff --git a/src/main/java/azgracompress/cli/functions/MeasurePlaneErrorFunction.java b/src/main/java/azgracompress/cli/functions/MeasurePlaneErrorFunction.java index d947fc0..5ab882d 100644 --- a/src/main/java/azgracompress/cli/functions/MeasurePlaneErrorFunction.java +++ b/src/main/java/azgracompress/cli/functions/MeasurePlaneErrorFunction.java @@ -5,7 +5,7 @@ import azgracompress.io.InputDataInfo; import azgracompress.cli.ParsedCliOptions; import azgracompress.data.ImageU16; import azgracompress.data.V3i; -import azgracompress.io.RawDataLoader; +import azgracompress.io.loader.RawDataLoader; import azgracompress.utilities.Utils; import java.io.FileOutputStream; diff --git a/src/main/java/azgracompress/compression/SQImageCompressor.java b/src/main/java/azgracompress/compression/SQImageCompressor.java index 364536e..a1cda63 100644 --- a/src/main/java/azgracompress/compression/SQImageCompressor.java +++ b/src/main/java/azgracompress/compression/SQImageCompressor.java @@ -6,8 +6,8 @@ import azgracompress.io.InputDataInfo; import azgracompress.compression.exception.ImageCompressionException; import azgracompress.data.ImageU16; import azgracompress.huffman.Huffman; -import azgracompress.io.IPlaneLoader; -import azgracompress.io.PlaneLoaderFactory; +import azgracompress.io.loader.IPlaneLoader; +import azgracompress.io.loader.PlaneLoaderFactory; import azgracompress.quantization.scalar.LloydMaxU16ScalarQuantization; import azgracompress.quantization.scalar.SQCodebook; import azgracompress.quantization.scalar.ScalarQuantizer; diff --git a/src/main/java/azgracompress/compression/VQImageCompressor.java b/src/main/java/azgracompress/compression/VQImageCompressor.java index 5489814..a64d235 100644 --- a/src/main/java/azgracompress/compression/VQImageCompressor.java +++ b/src/main/java/azgracompress/compression/VQImageCompressor.java @@ -6,8 +6,8 @@ import azgracompress.compression.exception.ImageCompressionException; import azgracompress.data.Chunk2D; import azgracompress.data.ImageU16; import azgracompress.huffman.Huffman; -import azgracompress.io.IPlaneLoader; -import azgracompress.io.PlaneLoaderFactory; +import azgracompress.io.loader.IPlaneLoader; +import azgracompress.io.loader.PlaneLoaderFactory; import azgracompress.quantization.vector.*; import azgracompress.utilities.Stopwatch; diff --git a/src/main/java/azgracompress/io/IPlaneLoader.java b/src/main/java/azgracompress/io/loader/IPlaneLoader.java similarity index 89% rename from src/main/java/azgracompress/io/IPlaneLoader.java rename to src/main/java/azgracompress/io/loader/IPlaneLoader.java index 5e94af1..b629191 100644 --- a/src/main/java/azgracompress/io/IPlaneLoader.java +++ b/src/main/java/azgracompress/io/loader/IPlaneLoader.java @@ -1,4 +1,4 @@ -package azgracompress.io; +package azgracompress.io.loader; import azgracompress.data.ImageU16; diff --git a/src/main/java/azgracompress/io/PlaneLoaderFactory.java b/src/main/java/azgracompress/io/loader/PlaneLoaderFactory.java similarity index 91% rename from src/main/java/azgracompress/io/PlaneLoaderFactory.java rename to src/main/java/azgracompress/io/loader/PlaneLoaderFactory.java index 5690d6c..80a0bc2 100644 --- a/src/main/java/azgracompress/io/PlaneLoaderFactory.java +++ b/src/main/java/azgracompress/io/loader/PlaneLoaderFactory.java @@ -1,4 +1,6 @@ -package azgracompress.io; +package azgracompress.io.loader; + +import azgracompress.io.InputDataInfo; public final class PlaneLoaderFactory { diff --git a/src/main/java/azgracompress/io/RawDataLoader.java b/src/main/java/azgracompress/io/loader/RawDataLoader.java similarity index 98% rename from src/main/java/azgracompress/io/RawDataLoader.java rename to src/main/java/azgracompress/io/loader/RawDataLoader.java index 38d2443..0ba46e4 100644 --- a/src/main/java/azgracompress/io/RawDataLoader.java +++ b/src/main/java/azgracompress/io/loader/RawDataLoader.java @@ -1,7 +1,8 @@ -package azgracompress.io; +package azgracompress.io.loader; import azgracompress.data.ImageU16; import azgracompress.data.V3i; +import azgracompress.io.InputDataInfo; import azgracompress.utilities.TypeConverter; import java.io.*; diff --git a/src/main/java/azgracompress/io/SCIFIOLoader.java b/src/main/java/azgracompress/io/loader/SCIFIOLoader.java similarity index 98% rename from src/main/java/azgracompress/io/SCIFIOLoader.java rename to src/main/java/azgracompress/io/loader/SCIFIOLoader.java index 9ff68dc..bfa9b6c 100644 --- a/src/main/java/azgracompress/io/SCIFIOLoader.java +++ b/src/main/java/azgracompress/io/loader/SCIFIOLoader.java @@ -1,8 +1,9 @@ -package azgracompress.io; +package azgracompress.io.loader; import azgracompress.ScifioWrapper; import azgracompress.data.ImageU16; import azgracompress.data.V3i; +import azgracompress.io.InputDataInfo; import azgracompress.utilities.TypeConverter; import io.scif.FormatException; import io.scif.Reader; -- GitLab