From 72ad00f20c464a68942d4dd34ced0d0d0970e308 Mon Sep 17 00:00:00 2001
From: Vojtech Moravec <vojtech.moravec.st@vsb.cz>
Date: Tue, 11 Aug 2020 08:34:04 +0200
Subject: [PATCH] Renamed Chunk2D -> Block.
---
.../java/azgracompress/benchmark/VQBenchmark.java | 4 ++--
.../compression/VQImageDecompressor.java | 2 +-
.../azgracompress/data/{Chunk2D.java => Block.java} | 10 +++++-----
src/main/java/azgracompress/data/ImageU16.java | 4 ++--
src/main/java/azgracompress/data/Voxel.java | 2 +-
.../java/azgracompress/io/loader/BasicLoader.java | 12 ++++++------
6 files changed, 17 insertions(+), 17 deletions(-)
rename src/main/java/azgracompress/data/{Chunk2D.java => Block.java} (96%)
diff --git a/src/main/java/azgracompress/benchmark/VQBenchmark.java b/src/main/java/azgracompress/benchmark/VQBenchmark.java
index 366dfbf..5b347ad 100644
--- a/src/main/java/azgracompress/benchmark/VQBenchmark.java
+++ b/src/main/java/azgracompress/benchmark/VQBenchmark.java
@@ -1,7 +1,7 @@
package azgracompress.benchmark;
import azgracompress.cli.ParsedCliOptions;
-import azgracompress.data.Chunk2D;
+import azgracompress.data.Block;
import azgracompress.data.ImageU16;
import azgracompress.data.V2i;
import azgracompress.data.V3i;
@@ -19,7 +19,7 @@ public class VQBenchmark extends BenchmarkBase {
private ImageU16 reconstructImageFromQuantizedVectors(final int[][] vectors,
final V2i qVector) {
- Chunk2D reconstructedChunk = new Chunk2D(new V2i(rawImageDims.getX(), rawImageDims.getY()));
+ Block reconstructedChunk = new Block(new V2i(rawImageDims.getX(), rawImageDims.getY()));
if (qVector.getY() > 1) {
reconstructedChunk.reconstructFrom2DVectors(vectors, qVector);
} else {
diff --git a/src/main/java/azgracompress/compression/VQImageDecompressor.java b/src/main/java/azgracompress/compression/VQImageDecompressor.java
index 131ba98..5254fbe 100644
--- a/src/main/java/azgracompress/compression/VQImageDecompressor.java
+++ b/src/main/java/azgracompress/compression/VQImageDecompressor.java
@@ -64,7 +64,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I
final V2i qVector,
final V3i imageDims) {
- Chunk2D reconstructedChunk = new Chunk2D(new V2i(imageDims.getX(), imageDims.getY()));
+ Block reconstructedChunk = new Block(new V2i(imageDims.getX(), imageDims.getY()));
if (qVector.getY() > 1) {
reconstructedChunk.reconstructFrom2DVectors(vectors, qVector);
} else {
diff --git a/src/main/java/azgracompress/data/Chunk2D.java b/src/main/java/azgracompress/data/Block.java
similarity index 96%
rename from src/main/java/azgracompress/data/Chunk2D.java
rename to src/main/java/azgracompress/data/Block.java
index 3e4664d..cf4a42f 100644
--- a/src/main/java/azgracompress/data/Chunk2D.java
+++ b/src/main/java/azgracompress/data/Block.java
@@ -1,6 +1,6 @@
package azgracompress.data;
-public class Chunk2D {
+public class Block {
private final int FILL_VALUE = 0;
private int[] data;
@@ -12,7 +12,7 @@ public class Chunk2D {
* @param dims Dimensions of the chunk.
* @param data Chunk data.
*/
- public Chunk2D(final V2i dims, final int[] data) {
+ public Block(final V2i dims, final int[] data) {
this.dims = dims;
this.data = data;
assert (data.length == (dims.getX() * dims.getY())) : "Wrong box data.";
@@ -23,7 +23,7 @@ public class Chunk2D {
*
* @param dims Dimensions of the chunk.
*/
- public Chunk2D(final V2i dims) {
+ public Block(final V2i dims) {
this(dims, new int[dims.getX() * dims.getY()]);
}
@@ -183,8 +183,8 @@ public class Chunk2D {
*/
@Override
public boolean equals(Object obj) {
- if (obj instanceof Chunk2D) {
- final Chunk2D otherChunk = (Chunk2D) obj;
+ if (obj instanceof Block) {
+ final Block otherChunk = (Block) obj;
if (data.length != otherChunk.data.length) {
return false;
} else {
diff --git a/src/main/java/azgracompress/data/ImageU16.java b/src/main/java/azgracompress/data/ImageU16.java
index 589ee1e..c2787c2 100644
--- a/src/main/java/azgracompress/data/ImageU16.java
+++ b/src/main/java/azgracompress/data/ImageU16.java
@@ -24,8 +24,8 @@ public class ImageU16 {
return (x * width) + y;
}
- public Chunk2D as2dChunk() {
- return new Chunk2D(new V2i(width, height), data);
+ public Block as2dChunk() {
+ return new Block(new V2i(width, height), data);
}
public ImageU16 difference(final ImageU16 other) {
diff --git a/src/main/java/azgracompress/data/Voxel.java b/src/main/java/azgracompress/data/Voxel.java
index 56a08e0..62116f3 100644
--- a/src/main/java/azgracompress/data/Voxel.java
+++ b/src/main/java/azgracompress/data/Voxel.java
@@ -106,7 +106,7 @@ public final class Voxel {
final int indexInsideVoxel = dataIndex(voxelX, voxelY, voxelZ, voxelDims);
- final int indexInsidePlane = Chunk2D.index(dstX, dstY, planeDimX);
+ final int indexInsidePlane = Block.index(dstX, dstY, planeDimX);
// reconstructedData are 2D data while voxelData are 3D data!
reconstructedData[planeIndex][indexInsidePlane] =
diff --git a/src/main/java/azgracompress/io/loader/BasicLoader.java b/src/main/java/azgracompress/io/loader/BasicLoader.java
index 04330f0..1be1240 100644
--- a/src/main/java/azgracompress/io/loader/BasicLoader.java
+++ b/src/main/java/azgracompress/io/loader/BasicLoader.java
@@ -50,7 +50,7 @@ public abstract class BasicLoader {
for (int vectorX = 0; vectorX < vectorSize; vectorX++) {
if (baseX + vectorX >= dims.getY())
break;
- rowVectors[vectorIndex][vectorX] = planeData[Chunk2D.index((baseX + vectorX), row, dims.getY())];
+ rowVectors[vectorIndex][vectorX] = planeData[Block.index((baseX + vectorX), row, dims.getY())];
}
++vectorIndex;
}
@@ -77,7 +77,7 @@ public abstract class BasicLoader {
for (int vectorX = 0; vectorX < vectorSize; vectorX++) {
if (baseX + vectorX >= dims.getY())
break;
- rowVectors[vectorIndex][vectorX] = valueAt(plane, Chunk2D.index((baseX + vectorX), row, dims.getY()));
+ rowVectors[vectorIndex][vectorX] = valueAt(plane, Block.index((baseX + vectorX), row, dims.getY()));
}
++vectorIndex;
}
@@ -89,7 +89,7 @@ public abstract class BasicLoader {
protected int[][] loadBlocksImplByLoadPlaneData(final V2i blockDim, final Range<Integer> planeRange) throws IOException {
final int blockSize = blockDim.multiplyTogether();
final int planeCount = planeRange.getTo() - planeRange.getFrom();
- final int blockCount = planeCount * Chunk2D.calculateRequiredChunkCount(dims.toV2i(), blockDim);
+ final int blockCount = planeCount * Block.calculateRequiredChunkCount(dims.toV2i(), blockDim);
int[][] blocks = new int[blockCount][blockSize];
@@ -108,7 +108,7 @@ public abstract class BasicLoader {
protected int[][] loadBlocksImplByValueAt(final V2i blockDim, final Range<Integer> planeRange) {
final int blockSize = blockDim.multiplyTogether();
final int planeCount = planeRange.getTo() - planeRange.getFrom();
- final int blockCount = planeCount * Chunk2D.calculateRequiredChunkCount(dims.toV2i(), blockDim);
+ final int blockCount = planeCount * Block.calculateRequiredChunkCount(dims.toV2i(), blockDim);
int[][] blocks = new int[blockCount][blockSize];
@@ -133,7 +133,7 @@ public abstract class BasicLoader {
srcX = blockXOffset + x;
if (srcX >= dims.getX())
break;
- block[Chunk2D.index(x, y, blockDim.getY())] = valueAt(planeIndex, Chunk2D.index(srcX, srcY, dims.getY()));
+ block[Block.index(x, y, blockDim.getY())] = valueAt(planeIndex, Block.index(srcX, srcY, dims.getY()));
}
}
}
@@ -149,7 +149,7 @@ public abstract class BasicLoader {
if (srcX >= dims.getX())
break;
- block[Chunk2D.index(x, y, blockDim.getY())] = planeData[Chunk2D.index(srcX, srcY, dims.getY())];
+ block[Block.index(x, y, blockDim.getY())] = planeData[Block.index(srcX, srcY, dims.getY())];
}
}
}
--
GitLab