Fix bugs in Histogram

Histogram returned wrong indices for non equidistant bins. Partial fix for #80
fair-acc · Jan 16, 2020 · 7de7d50 · 7de7d50
1 parent a21433d
commit 7de7d50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 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
@@ -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
@@ -140,17 +140,17 @@ public double get(final int dimIndex, final int index) {
 
     @Override
     public List<String> getErrorList() {
-        return Collections.<String>emptyList();
+        return Collections.<String> emptyList();
     }
 
     @Override
     public int getIndex(int dimIndex, double value) {
-        return findBin(dimIndex, value);
+        return findBin(dimIndex, value) - 1;
     }
 
     @Override
     public List<String> getInfoList() {
-        return Collections.<String>emptyList();
+        return Collections.<String> emptyList();
     }
 
     @Override