From 7de7d50fc848329fe9da76684a6622eca9c02d05 Mon Sep 17 00:00:00 2001 From: Alexander Krimm Date: Thu, 16 Jan 2020 16:00:12 +0100 Subject: [PATCH] Fix bugs in Histogram Histogram returned wrong indices for non equidistant bins. Partial fix for #80 --- .../src/main/java/de/gsi/dataset/spi/AbstractHistogram.java | 5 +++++ .../src/main/java/de/gsi/dataset/spi/Histogram.java | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/chartfx-dataset/src/main/java/de/gsi/dataset/spi/AbstractHistogram.java b/chartfx-dataset/src/main/java/de/gsi/dataset/spi/AbstractHistogram.java index 041403501..25602d59f 100644 --- a/chartfx-dataset/src/main/java/de/gsi/dataset/spi/AbstractHistogram.java +++ b/chartfx-dataset/src/main/java/de/gsi/dataset/spi/AbstractHistogram.java @@ -168,6 +168,11 @@ public double getBinContent(final int bin) { return data[bin]; } + @Override + public int getDataCount() { + return getDataCount(DIM_X); + } + @Override public int getDataCount(final int dimIndex) { return nAxisBins[dimIndex] - 2; diff --git a/chartfx-dataset/src/main/java/de/gsi/dataset/spi/Histogram.java b/chartfx-dataset/src/main/java/de/gsi/dataset/spi/Histogram.java index 4e181da40..065141a2c 100644 --- a/chartfx-dataset/src/main/java/de/gsi/dataset/spi/Histogram.java +++ b/chartfx-dataset/src/main/java/de/gsi/dataset/spi/Histogram.java @@ -140,17 +140,17 @@ public double get(final int dimIndex, final int index) { @Override public List getErrorList() { - return Collections.emptyList(); + return Collections. emptyList(); } @Override public int getIndex(int dimIndex, double value) { - return findBin(dimIndex, value); + return findBin(dimIndex, value) - 1; } @Override public List getInfoList() { - return Collections.emptyList(); + return Collections. emptyList(); } @Override