Skip to content
Snippets Groups Projects
Commit 72ad00f2 authored by Vojtech Moravec's avatar Vojtech Moravec
Browse files

Renamed Chunk2D -> Block.

parent 2112a2f9
No related branches found
No related tags found
No related merge requests found
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 {
......
......@@ -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 {
......
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 {
......
......@@ -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) {
......
......@@ -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] =
......
......@@ -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())];
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment