From d289702c2d0bd30f175e8b82ddc75f6398f7a8ba Mon Sep 17 00:00:00 2001
From: Vojtech Moravec <vojtech.moravec.st@vsb.cz>
Date: Thu, 12 Dec 2019 19:21:22 +0100
Subject: [PATCH] Library import fix.
---
pom.xml | 6 ------
src/main/java/bdv/server/BigDataServer.java | 12 +++++++++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2004d0c..9703da9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,11 +117,5 @@
<artifactId>commons-cli</artifactId>
<version>${commons-cli.version}</version>
</dependency>
- <dependency>
- <groupId>org.scijava</groupId>
- <artifactId>DataCompressor</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/src/main/java/bdv/server/BigDataServer.java b/src/main/java/bdv/server/BigDataServer.java
index 3c7862b..e4d4809 100644
--- a/src/main/java/bdv/server/BigDataServer.java
+++ b/src/main/java/bdv/server/BigDataServer.java
@@ -1,9 +1,11 @@
package bdv.server;
+
import compression.U16;
import compression.quantization.QuantizationValueCache;
import compression.quantization.scalar.LloydMaxU16ScalarQuantization;
import compression.quantization.scalar.ScalarQuantizer;
+import compression.utilities.Utils;
import mpicbg.spim.data.SpimDataException;
import org.apache.commons.cli.*;
@@ -100,7 +102,7 @@ public class BigDataServer {
if (compParams.shouldCompressData() || compParams.renderDifference()) {
//TODO(Moravec): Replace LloydMaxU16ScalarQuantization with some ICompressor.
- QuantizationValueCache quantizationCache = new QuantizationValueCache("D:\\tmp\\bdv_cache");
+ QuantizationValueCache quantizationCache = new QuantizationValueCache("D:\\biology\\bdv_cache");
final int quantizationValueCount = (int) Math.pow(2, compParams.getBitTarget());
final String trainFilename = new File(compParams.getTrainFile()).getName();
@@ -112,8 +114,12 @@ public class BigDataServer {
LOG.info("Initialized quantizer...");
} else {
LOG.info("Calculating quantization values...");
- LloydMaxU16ScalarQuantization lloydMax = new LloydMaxU16ScalarQuantization(compParams.getTrainFile(), compParams.getBitTarget());
- lloydMax.train(false);
+
+ LloydMaxU16ScalarQuantization lloydMax = new LloydMaxU16ScalarQuantization(
+ Utils.convertU16ByteArrayToIntArray(Utils.readFileBytes(compParams.getTrainFile())),
+ (int) Math.pow(2, compParams.getBitTarget()));
+
+ lloydMax.train();
quantizationCache.saveQuantizationValue(trainFilename, lloydMax.getCentroids());
LOG.info("Saving quantization values...");
quantizer = new ScalarQuantizer(U16.Min, U16.Max, lloydMax.getCentroids());
--
GitLab