From 76346d87e1312583e91fe61f1861f2b9fd8231d4 Mon Sep 17 00:00:00 2001
From: Vojtech Moravec <vojtech.moravec.st@vsb.cz>
Date: Fri, 4 Dec 2020 10:00:59 +0100
Subject: [PATCH] Move classes from cache package to io package.
---
src/main/java/cz/it4i/qcmp/DataCompressor.java | 4 ++--
src/main/java/cz/it4i/qcmp/benchmark/SQBenchmark.java | 2 +-
src/main/java/cz/it4i/qcmp/compression/SQImageCompressor.java | 2 +-
src/main/java/cz/it4i/qcmp/compression/VQImageCompressor.java | 2 +-
src/main/java/cz/it4i/qcmp/fileformat/SqQvcFile.java | 2 +-
src/main/java/cz/it4i/qcmp/fileformat/VqQvcFile.java | 2 +-
.../cz/it4i/qcmp/{cache => io}/QuantizationCacheManager.java | 2 +-
src/main/java/cz/it4i/qcmp/{cache => io}/QvcFileReader.java | 3 +--
src/main/java/cz/it4i/qcmp/{cache => io}/QvcFileWriter.java | 2 +-
9 files changed, 10 insertions(+), 11 deletions(-)
rename src/main/java/cz/it4i/qcmp/{cache => io}/QuantizationCacheManager.java (99%)
rename src/main/java/cz/it4i/qcmp/{cache => io}/QvcFileReader.java (98%)
rename src/main/java/cz/it4i/qcmp/{cache => io}/QvcFileWriter.java (99%)
diff --git a/src/main/java/cz/it4i/qcmp/DataCompressor.java b/src/main/java/cz/it4i/qcmp/DataCompressor.java
index fa30b58..0c0de09 100644
--- a/src/main/java/cz/it4i/qcmp/DataCompressor.java
+++ b/src/main/java/cz/it4i/qcmp/DataCompressor.java
@@ -1,8 +1,6 @@
package cz.it4i.qcmp;
import cz.it4i.qcmp.benchmark.CompressionBenchmark;
-import cz.it4i.qcmp.cache.QuantizationCacheManager;
-import cz.it4i.qcmp.cache.QvcFileReader;
import cz.it4i.qcmp.cli.CliConstants;
import cz.it4i.qcmp.cli.CompressionOptionsCLIParser;
import cz.it4i.qcmp.cli.CustomFunctionBase;
@@ -11,6 +9,8 @@ import cz.it4i.qcmp.compression.ImageCompressor;
import cz.it4i.qcmp.compression.ImageDecompressor;
import cz.it4i.qcmp.fileformat.FileExtensions;
import cz.it4i.qcmp.fileformat.IQvcFile;
+import cz.it4i.qcmp.io.QuantizationCacheManager;
+import cz.it4i.qcmp.io.QvcFileReader;
import org.apache.commons.cli.*;
import java.io.IOException;
diff --git a/src/main/java/cz/it4i/qcmp/benchmark/SQBenchmark.java b/src/main/java/cz/it4i/qcmp/benchmark/SQBenchmark.java
index fe2581b..05ea050 100644
--- a/src/main/java/cz/it4i/qcmp/benchmark/SQBenchmark.java
+++ b/src/main/java/cz/it4i/qcmp/benchmark/SQBenchmark.java
@@ -1,9 +1,9 @@
package cz.it4i.qcmp.benchmark;
import cz.it4i.qcmp.U16;
-import cz.it4i.qcmp.cache.QuantizationCacheManager;
import cz.it4i.qcmp.cli.CompressionOptionsCLIParser;
import cz.it4i.qcmp.compression.CompressionOptions;
+import cz.it4i.qcmp.io.QuantizationCacheManager;
import cz.it4i.qcmp.io.loader.IPlaneLoader;
import cz.it4i.qcmp.io.loader.PlaneLoaderFactory;
import cz.it4i.qcmp.quantization.QTrainIteration;
diff --git a/src/main/java/cz/it4i/qcmp/compression/SQImageCompressor.java b/src/main/java/cz/it4i/qcmp/compression/SQImageCompressor.java
index caab171..ddfd8e8 100644
--- a/src/main/java/cz/it4i/qcmp/compression/SQImageCompressor.java
+++ b/src/main/java/cz/it4i/qcmp/compression/SQImageCompressor.java
@@ -1,13 +1,13 @@
package cz.it4i.qcmp.compression;
import cz.it4i.qcmp.U16;
-import cz.it4i.qcmp.cache.QuantizationCacheManager;
import cz.it4i.qcmp.compression.exception.ImageCompressionException;
import cz.it4i.qcmp.fileformat.IQvcFile;
import cz.it4i.qcmp.fileformat.SqQvcFile;
import cz.it4i.qcmp.huffman.HuffmanEncoder;
import cz.it4i.qcmp.io.InputData;
import cz.it4i.qcmp.io.OutBitStream;
+import cz.it4i.qcmp.io.QuantizationCacheManager;
import cz.it4i.qcmp.io.loader.IPlaneLoader;
import cz.it4i.qcmp.io.loader.PlaneLoaderFactory;
import cz.it4i.qcmp.quantization.scalar.LloydMaxU16ScalarQuantization;
diff --git a/src/main/java/cz/it4i/qcmp/compression/VQImageCompressor.java b/src/main/java/cz/it4i/qcmp/compression/VQImageCompressor.java
index e05cbbe..443ca6f 100644
--- a/src/main/java/cz/it4i/qcmp/compression/VQImageCompressor.java
+++ b/src/main/java/cz/it4i/qcmp/compression/VQImageCompressor.java
@@ -1,6 +1,5 @@
package cz.it4i.qcmp.compression;
-import cz.it4i.qcmp.cache.QuantizationCacheManager;
import cz.it4i.qcmp.compression.exception.ImageCompressionException;
import cz.it4i.qcmp.data.Range;
import cz.it4i.qcmp.fileformat.IQvcFile;
@@ -9,6 +8,7 @@ import cz.it4i.qcmp.fileformat.VqQvcFile;
import cz.it4i.qcmp.huffman.HuffmanEncoder;
import cz.it4i.qcmp.io.InputData;
import cz.it4i.qcmp.io.OutBitStream;
+import cz.it4i.qcmp.io.QuantizationCacheManager;
import cz.it4i.qcmp.io.loader.IPlaneLoader;
import cz.it4i.qcmp.io.loader.PlaneLoaderFactory;
import cz.it4i.qcmp.quantization.vector.LBGResult;
diff --git a/src/main/java/cz/it4i/qcmp/fileformat/SqQvcFile.java b/src/main/java/cz/it4i/qcmp/fileformat/SqQvcFile.java
index d90ec89..764a460 100644
--- a/src/main/java/cz/it4i/qcmp/fileformat/SqQvcFile.java
+++ b/src/main/java/cz/it4i/qcmp/fileformat/SqQvcFile.java
@@ -1,11 +1,11 @@
package cz.it4i.qcmp.fileformat;
-import cz.it4i.qcmp.cache.QvcFileWriter;
import cz.it4i.qcmp.huffman.HuffmanNode;
import cz.it4i.qcmp.huffman.HuffmanTreeBuilder;
import cz.it4i.qcmp.io.InBitStream;
import cz.it4i.qcmp.io.MemoryOutputStream;
import cz.it4i.qcmp.io.OutBitStream;
+import cz.it4i.qcmp.io.QvcFileWriter;
import cz.it4i.qcmp.quantization.scalar.SQCodebook;
import java.io.DataInputStream;
diff --git a/src/main/java/cz/it4i/qcmp/fileformat/VqQvcFile.java b/src/main/java/cz/it4i/qcmp/fileformat/VqQvcFile.java
index b7ad419..7dbaae2 100644
--- a/src/main/java/cz/it4i/qcmp/fileformat/VqQvcFile.java
+++ b/src/main/java/cz/it4i/qcmp/fileformat/VqQvcFile.java
@@ -1,11 +1,11 @@
package cz.it4i.qcmp.fileformat;
-import cz.it4i.qcmp.cache.QvcFileWriter;
import cz.it4i.qcmp.huffman.HuffmanNode;
import cz.it4i.qcmp.huffman.HuffmanTreeBuilder;
import cz.it4i.qcmp.io.InBitStream;
import cz.it4i.qcmp.io.MemoryOutputStream;
import cz.it4i.qcmp.io.OutBitStream;
+import cz.it4i.qcmp.io.QvcFileWriter;
import cz.it4i.qcmp.quantization.vector.VQCodebook;
import java.io.DataInputStream;
diff --git a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java b/src/main/java/cz/it4i/qcmp/io/QuantizationCacheManager.java
similarity index 99%
rename from src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
rename to src/main/java/cz/it4i/qcmp/io/QuantizationCacheManager.java
index f780fe7..1e9cf3f 100644
--- a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
+++ b/src/main/java/cz/it4i/qcmp/io/QuantizationCacheManager.java
@@ -1,4 +1,4 @@
-package cz.it4i.qcmp.cache;
+package cz.it4i.qcmp.io;
import cz.it4i.qcmp.compression.CompressionOptions;
import cz.it4i.qcmp.data.V3i;
diff --git a/src/main/java/cz/it4i/qcmp/cache/QvcFileReader.java b/src/main/java/cz/it4i/qcmp/io/QvcFileReader.java
similarity index 98%
rename from src/main/java/cz/it4i/qcmp/cache/QvcFileReader.java
rename to src/main/java/cz/it4i/qcmp/io/QvcFileReader.java
index 5883a7d..f8f6995 100644
--- a/src/main/java/cz/it4i/qcmp/cache/QvcFileReader.java
+++ b/src/main/java/cz/it4i/qcmp/io/QvcFileReader.java
@@ -1,7 +1,6 @@
-package cz.it4i.qcmp.cache;
+package cz.it4i.qcmp.io;
import cz.it4i.qcmp.fileformat.*;
-import cz.it4i.qcmp.io.RawDataIO;
import java.io.DataInputStream;
import java.io.FileInputStream;
diff --git a/src/main/java/cz/it4i/qcmp/cache/QvcFileWriter.java b/src/main/java/cz/it4i/qcmp/io/QvcFileWriter.java
similarity index 99%
rename from src/main/java/cz/it4i/qcmp/cache/QvcFileWriter.java
rename to src/main/java/cz/it4i/qcmp/io/QvcFileWriter.java
index a643f59..ef67a80 100644
--- a/src/main/java/cz/it4i/qcmp/cache/QvcFileWriter.java
+++ b/src/main/java/cz/it4i/qcmp/io/QvcFileWriter.java
@@ -1,4 +1,4 @@
-package cz.it4i.qcmp.cache;
+package cz.it4i.qcmp.io;
import cz.it4i.qcmp.data.V3i;
import cz.it4i.qcmp.fileformat.QuantizationType;
--
GitLab