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

Logging difference error.

parent 883b9fb9
Branches
No related tags found
No related merge requests found
...@@ -10,6 +10,7 @@ import javax.imageio.ImageIO; ...@@ -10,6 +10,7 @@ import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import compression.U16;
import compression.quantization.scalar.ScalarQuantizer; import compression.quantization.scalar.ScalarQuantizer;
import compression.utilities.Utils; import compression.utilities.Utils;
import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Request;
...@@ -169,17 +170,36 @@ public class CellHandler extends ContextHandler { ...@@ -169,17 +170,36 @@ public class CellHandler extends ContextHandler {
} else if (compressionParams.renderDifference()) { } else if (compressionParams.renderDifference()) {
assert (quantizer != null) : "Compressor wasn't created"; assert (quantizer != null) : "Compressor wasn't created";
short[] compressedData = quantizer.quantize(data); short[] compressedData = quantizer.quantize(data);
int e1 = 0, e2 = 0, e3 = 0, e4 = 0, e5 = 0;
for (int i = 0; i < data.length; i++) { for (int i = 0; i < data.length; i++) {
// final int diff = Math.abs(compressedData[i] - data[i]); final int diff = Math.abs(compressedData[i] - data[i]);
// if (diff > 100) { if (diff < 100) {
// data[i] = 2000; data[i] = 1000;
// } else { ++e1;
// data[i] = 0; } else if (diff < 200) {
// } data[i] = 2000;
++e2;
data[i] = (short) (5*Utils.u16BitsToShort(Math.abs(compressedData[i] - data[i]))); } else if (diff < 300) {
data[i] = 3000;
++e3;
} else if (diff < 400) {
data[i] = 4000;
++e4;
} else if (diff < 500) {
data[i] = 5000;
++e5;
} else {
data[i] = 0x0;
}
// assert (data[i] != 0 || (data[i] == 0 && compressedData[i] == 0)) : "BAD";
// data[i] = (short) (5 * Utils.u16BitsToShort(Math.abs(compressedData[i] - data[i])));
} }
LOG.info(String.format("E1: %.2f E2: %.2f E3: %.2f E4: %.2f E5: %.2f",
(float)e1/(float)data.length,
(float)e2/(float)data.length,
(float)e3/(float)data.length,
(float)e4/(float)data.length,
(float)e5/(float)data.length));
//LOG.warn("Not yet implemented."); //LOG.warn("Not yet implemented.");
} }
...@@ -200,9 +220,9 @@ public class CellHandler extends ContextHandler { ...@@ -200,9 +220,9 @@ public class CellHandler extends ContextHandler {
transferedDataSize += buf.length; transferedDataSize += buf.length;
LOG.info(String.format("I:%d;T:%d;S:%d;L:%d Total transfered data: [%d KB] [%d MB]", // LOG.info(String.format("I:%d;T:%d;S:%d;L:%d Total transfered data: [%d KB] [%d MB]",
index, timepoint, setup, level, // index, timepoint, setup, level,
(transferedDataSize / 1000), ((transferedDataSize / 1000) / 1000))); // (transferedDataSize / 1000), ((transferedDataSize / 1000) / 1000)));
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
response.setContentLength(buf.length); response.setContentLength(buf.length);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment