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

Library import fix.

parent ef5dabdc
No related branches found
No related tags found
No related merge requests found
...@@ -117,11 +117,5 @@ ...@@ -117,11 +117,5 @@
<artifactId>commons-cli</artifactId> <artifactId>commons-cli</artifactId>
<version>${commons-cli.version}</version> <version>${commons-cli.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>DataCompressor</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
package bdv.server; package bdv.server;
import compression.U16; import compression.U16;
import compression.quantization.QuantizationValueCache; import compression.quantization.QuantizationValueCache;
import compression.quantization.scalar.LloydMaxU16ScalarQuantization; import compression.quantization.scalar.LloydMaxU16ScalarQuantization;
import compression.quantization.scalar.ScalarQuantizer; import compression.quantization.scalar.ScalarQuantizer;
import compression.utilities.Utils;
import mpicbg.spim.data.SpimDataException; import mpicbg.spim.data.SpimDataException;
import org.apache.commons.cli.*; import org.apache.commons.cli.*;
...@@ -100,7 +102,7 @@ public class BigDataServer { ...@@ -100,7 +102,7 @@ public class BigDataServer {
if (compParams.shouldCompressData() || compParams.renderDifference()) { if (compParams.shouldCompressData() || compParams.renderDifference()) {
//TODO(Moravec): Replace LloydMaxU16ScalarQuantization with some ICompressor. //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 int quantizationValueCount = (int) Math.pow(2, compParams.getBitTarget());
final String trainFilename = new File(compParams.getTrainFile()).getName(); final String trainFilename = new File(compParams.getTrainFile()).getName();
...@@ -112,8 +114,12 @@ public class BigDataServer { ...@@ -112,8 +114,12 @@ public class BigDataServer {
LOG.info("Initialized quantizer..."); LOG.info("Initialized quantizer...");
} else { } else {
LOG.info("Calculating quantization values..."); 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()); quantizationCache.saveQuantizationValue(trainFilename, lloydMax.getCentroids());
LOG.info("Saving quantization values..."); LOG.info("Saving quantization values...");
quantizer = new ScalarQuantizer(U16.Min, U16.Max, lloydMax.getCentroids()); quantizer = new ScalarQuantizer(U16.Min, U16.Max, lloydMax.getCentroids());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment