diff --git a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java b/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java index a2cd2251cc5d3c88f4f0901cb5bdfd2b84295c7d..80f4c2aa9313c0829cdd1b33397b8c4a0beae83d 100644 --- a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java +++ b/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java @@ -1,6 +1,6 @@ package cz.it4i.qcmp.cache; -import cz.it4i.qcmp.fileformat.CacheFileHeaderV1; +import cz.it4i.qcmp.fileformat.QvcHeaderV1; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -12,9 +12,9 @@ public interface ICacheFile { void readFromStream(DataInputStream inputStream) throws IOException; - void readFromStream(DataInputStream inputStream, CacheFileHeaderV1 header) throws IOException; + void readFromStream(DataInputStream inputStream, QvcHeaderV1 header) throws IOException; - CacheFileHeaderV1 getHeader(); + QvcHeaderV1 getHeader(); void report(StringBuilder builder); diff --git a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java b/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java index bd769e831764f30175ec08400619accc832298f1..8f57c41b0acbd64cca5537e0bb9242a76ecdb615 100644 --- a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java +++ b/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java @@ -2,8 +2,8 @@ package cz.it4i.qcmp.cache; import cz.it4i.qcmp.compression.CompressionOptions; import cz.it4i.qcmp.data.V3i; -import cz.it4i.qcmp.fileformat.CacheFileHeaderV1; import cz.it4i.qcmp.fileformat.QuantizationType; +import cz.it4i.qcmp.fileformat.QvcHeaderV1; import cz.it4i.qcmp.quantization.scalar.SQCodebook; import cz.it4i.qcmp.quantization.vector.VQCodebook; @@ -68,8 +68,8 @@ public class QuantizationCacheManager { * @param codebook Final SQ codebook. * @return SQ cache file header. */ - private CacheFileHeaderV1 createHeaderForSQ(final String trainFile, final SQCodebook codebook) { - final CacheFileHeaderV1 header = new CacheFileHeaderV1(); + private QvcHeaderV1 createHeaderForSQ(final String trainFile, final SQCodebook codebook) { + final QvcHeaderV1 header = new QvcHeaderV1(); header.setQuantizationType(QuantizationType.Scalar); header.setCodebookSize(codebook.getCodebookSize()); header.setTrainFileName(trainFile); @@ -105,8 +105,8 @@ public class QuantizationCacheManager { * @param codebook Final VQ codebook. * @return VQ cache file header. */ - private CacheFileHeaderV1 createHeaderForVQ(final String trainFile, final VQCodebook codebook) { - final CacheFileHeaderV1 header = new CacheFileHeaderV1(); + private QvcHeaderV1 createHeaderForVQ(final String trainFile, final VQCodebook codebook) { + final QvcHeaderV1 header = new QvcHeaderV1(); header.setQuantizationType(getQuantizationTypeFromVectorDimensions(codebook.getVectorDims())); header.setCodebookSize(codebook.getCodebookSize()); header.setTrainFileName(trainFile); @@ -125,7 +125,7 @@ public class QuantizationCacheManager { public String saveCodebook(final String trainFile, final SQCodebook codebook) throws IOException { final String fileName = getCacheFilePathForSQ(trainFile, codebook.getCodebookSize()).getAbsolutePath(); - final CacheFileHeaderV1 header = createHeaderForSQ(new File(trainFile).getName(), codebook); + final QvcHeaderV1 header = createHeaderForSQ(new File(trainFile).getName(), codebook); final SQCacheFile cacheFile = new SQCacheFile(header, codebook); try (final FileOutputStream fos = new FileOutputStream(fileName, false); @@ -152,7 +152,7 @@ public class QuantizationCacheManager { codebook.getCodebookSize(), codebook.getVectorDims()).getAbsolutePath(); - final CacheFileHeaderV1 header = createHeaderForVQ(new File(trainFile).getName(), codebook); + final QvcHeaderV1 header = createHeaderForVQ(new File(trainFile).getName(), codebook); final VQCacheFile cacheFile = new VQCacheFile(header, codebook); try (final FileOutputStream fos = new FileOutputStream(fileName, false); @@ -357,7 +357,7 @@ public class QuantizationCacheManager { dis = new DataInputStream(inputStream); } - final CacheFileHeaderV1 header = new CacheFileHeaderV1(); + final QvcHeaderV1 header = new QvcHeaderV1(); try { header.readFromStream(dis); } catch (final IOException e) { @@ -409,12 +409,12 @@ public class QuantizationCacheManager { * @param path Path to cache file. */ public static void inspectCacheFile(final String path, final boolean verbose) { - CacheFileHeaderV1 header = null; + QvcHeaderV1 header = null; final long fileSize; try (final FileInputStream fis = new FileInputStream(path); final DataInputStream dis = new DataInputStream(fis)) { fileSize = fis.getChannel().size(); - header = new CacheFileHeaderV1(); + header = new QvcHeaderV1(); header.readFromStream(dis); } catch (final IOException e) { e.printStackTrace(); diff --git a/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java b/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java index db5d68c7693e0ff161080f3a7a65c3abca96f300..5815ed0cd257ded9622e5a52c9fbd59b9045fa54 100644 --- a/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java +++ b/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java @@ -1,6 +1,6 @@ package cz.it4i.qcmp.cache; -import cz.it4i.qcmp.fileformat.CacheFileHeaderV1; +import cz.it4i.qcmp.fileformat.QvcHeaderV1; import cz.it4i.qcmp.quantization.scalar.SQCodebook; import java.io.DataInputStream; @@ -8,13 +8,13 @@ import java.io.DataOutputStream; import java.io.IOException; public class SQCacheFile implements ICacheFile { - private CacheFileHeaderV1 header; + private QvcHeaderV1 header; private SQCodebook codebook; public SQCacheFile() { } - public SQCacheFile(final CacheFileHeaderV1 header, final SQCodebook codebook) { + public SQCacheFile(final QvcHeaderV1 header, final SQCodebook codebook) { this.header = header; this.codebook = codebook; assert (header.getCodebookSize() == codebook.getCodebookSize()); @@ -34,12 +34,12 @@ public class SQCacheFile implements ICacheFile { } public void readFromStream(final DataInputStream inputStream) throws IOException { - header = new CacheFileHeaderV1(); + header = new QvcHeaderV1(); header.readFromStream(inputStream); readFromStream(inputStream, header); } - public void readFromStream(final DataInputStream inputStream, final CacheFileHeaderV1 header) throws IOException { + public void readFromStream(final DataInputStream inputStream, final QvcHeaderV1 header) throws IOException { this.header = header; final int codebookSize = header.getCodebookSize(); final int[] centroids = new int[codebookSize]; @@ -54,7 +54,7 @@ public class SQCacheFile implements ICacheFile { codebook = new SQCodebook(centroids, frequencies); } - public CacheFileHeaderV1 getHeader() { + public QvcHeaderV1 getHeader() { return header; } diff --git a/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java b/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java index e7c8cc6a1de510ec24ff238dc52967ce70f0ba44..ef7c26a759777db7862d89a22647d607769a3e99 100644 --- a/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java +++ b/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java @@ -1,6 +1,6 @@ package cz.it4i.qcmp.cache; -import cz.it4i.qcmp.fileformat.CacheFileHeaderV1; +import cz.it4i.qcmp.fileformat.QvcHeaderV1; import cz.it4i.qcmp.quantization.vector.VQCodebook; import java.io.DataInputStream; @@ -8,13 +8,13 @@ import java.io.DataOutputStream; import java.io.IOException; public class VQCacheFile implements ICacheFile { - private CacheFileHeaderV1 header; + private QvcHeaderV1 header; private VQCodebook codebook; public VQCacheFile() { } - public VQCacheFile(final CacheFileHeaderV1 header, final VQCodebook codebook) { + public VQCacheFile(final QvcHeaderV1 header, final VQCodebook codebook) { this.header = header; this.codebook = codebook; assert (header.getCodebookSize() == codebook.getCodebookSize()); @@ -37,13 +37,13 @@ public class VQCacheFile implements ICacheFile { } public void readFromStream(final DataInputStream inputStream) throws IOException { - header = new CacheFileHeaderV1(); + header = new QvcHeaderV1(); header.readFromStream(inputStream); readFromStream(inputStream, header); } @Override - public void readFromStream(final DataInputStream inputStream, final CacheFileHeaderV1 header) throws IOException { + public void readFromStream(final DataInputStream inputStream, final QvcHeaderV1 header) throws IOException { this.header = header; final int codebookSize = header.getCodebookSize(); @@ -64,7 +64,7 @@ public class VQCacheFile implements ICacheFile { codebook = new VQCodebook(header.getVectorDim(), vectors, frequencies); } - public CacheFileHeaderV1 getHeader() { + public QvcHeaderV1 getHeader() { return header; } diff --git a/src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeaderV1.java b/src/main/java/cz/it4i/qcmp/fileformat/QvcHeaderV1.java similarity index 99% rename from src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeaderV1.java rename to src/main/java/cz/it4i/qcmp/fileformat/QvcHeaderV1.java index 167b0f780ca2211072dbe95beb7f832b150e0782..cc2ab909dd57f86e4b9ad001fd9d1c658bf35059 100644 --- a/src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeaderV1.java +++ b/src/main/java/cz/it4i/qcmp/fileformat/QvcHeaderV1.java @@ -9,7 +9,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -public class CacheFileHeaderV1 implements IFileHeader { +public class QvcHeaderV1 implements IFileHeader { //region Constants private static final int VERSION = 1; private static final String MAGIC_VALUE = "QCMPCACHE";