Merge pull request #335 from Caltech-IPAC/DM-9342-HistogramOption

DM-9342:histogram option input dialog

Author: lznakano

src/firefly/java/edu/caltech/ipac/firefly/server/query/HistogramProcessor.java

@@ -44,16 +44,19 @@ public class HistogramProcessor extends IpacTablePartProcessor {
         columns[2].getFormatInfo().setDataFormat("%.14g");
     }
     private final String FIXED_SIZE_ALGORITHM = "fixedSizeBins";
-    private final String NUMBER_BINS = "numBins";
+    private final String FIXED_BIN_SIZE_SELECTION="fixedBinSizeSelection";
+    private final String BIN_SIZE = "binSize";
     private final String COLUMN = "columnExpression";
-
     private final String MIN = "min";
     private final String MAX = "max";
     // private final String ALGORITHM = "algorithm";
     private final String FALSEPOSTIVERATE = "falsePositiveRate";
     private final String PRESERVE_EMPTY_BIN="preserveEmptyBins";
     private String algorithm = null;// FIXED_SIZE_ALGORITHM;
-    private int numBins;
+    private int numBins=0;
+    private double binWidth=0.0;
+    private String binSelection;
+    private String binSize;
     private double min = Double.NaN;
     private double max = Double.NaN;
     private String columnExpression;
@@ -155,17 +158,32 @@ private void getParameters(TableServerRequest tableServerRequest) {
 
             } else if (name.equalsIgnoreCase(MAX)) {
                 max =  Double.parseDouble(value);
-            } else if (name.equalsIgnoreCase(NUMBER_BINS)) {
-                numBins =  Integer.parseInt(value);
-                if (numBins>0) algorithm = FIXED_SIZE_ALGORITHM;
-            } else if (name.equalsIgnoreCase(FALSEPOSTIVERATE)) {
+            } else if (name.equalsIgnoreCase(FIXED_BIN_SIZE_SELECTION)) {
+                binSelection = value;
+               // numBins =  Integer.parseInt(value);
+              //  if (numBins>0) algorithm = FIXED_SIZE_ALGORITHM;
+            } else if (name.equalsIgnoreCase(BIN_SIZE)) {
+                binSize  =  value;
+            }
+            else if (name.equalsIgnoreCase(FALSEPOSTIVERATE)) {
                 falsePostiveRate =  Double.parseDouble(value);
             }
             else if (name.equalsIgnoreCase(PRESERVE_EMPTY_BIN) ){
                 showEmptyBin= Boolean.parseBoolean(value);
             }
         }
 
+
+        if (binSelection.equalsIgnoreCase("numBins")){
+            numBins = Integer.parseInt(binSize);
+        }
+        else if (binSelection.equalsIgnoreCase("binWidth") ) {
+            binWidth = Double.parseDouble(binSize);
+
+        }
+        if (numBins>0 || binWidth>0.0 ){
+            algorithm = FIXED_SIZE_ALGORITHM;
+        }
     }
 
     private void addFormatInfoAtt(DataGroup dg, DataType dt) {
@@ -233,13 +251,15 @@ private Object[] calculateFixedBinSizeDataArray(double[] columnData) {
         }
 
 
-        double binSize = (max-min)/numBins;
+        double binSize =numBins>0? (max-min)/numBins:binWidth;
+
+        int nBins = numBins>0? numBins : (int) Math.ceil((max-min)/binSize);
 
        // double delta =( max -min)/100*numBins;
-        long[] numPointsInBin = new long[numBins];
-        double[] binMin = new double[numBins];
+        long[] numPointsInBin = new long[nBins];
+        double[] binMin = new double[nBins];
 
-        double[] binMax = new double[numBins];
+        double[] binMax = new double[nBins];
 
         int iBin;
         for (int i = 0; i < columnData.length; i++) {
@@ -249,11 +269,11 @@ private Object[] calculateFixedBinSizeDataArray(double[] columnData) {
 
             }
             else if (columnData[i]  == max) { //put the last data in the last bin
-                numPointsInBin[numBins - 1]++;
+                numPointsInBin[nBins - 1]++;
             }
 
         }
-        for (int i=0; i<numBins; i++){
+        for (int i=0; i<nBins; i++){
             binMin[i]=min+i*binSize;
             binMax[i]=binMin[i]+binSize;
         }

src/firefly/js/charts/dataTypes/HistogramCDT.js

@@ -66,8 +66,12 @@ function getServerCallParameters(histogramParams) {
     return [
         histogramParams.columnOrExpr,
         histogramParams.x && histogramParams.x.includes('log'),
+        histogramParams.binWidth,
         histogramParams.numBins,
-        histogramParams.falsePositiveRate
+        histogramParams.fixedBinSizeSelection,
+        histogramParams.falsePositiveRate,
+        histogramParams.minCutoff,
+        histogramParams.maxCutoff
     ];
 }
 
@@ -104,20 +108,23 @@ function fetchColData(dispatch, chartId, chartDataElementId) {
     if (histogramParams.x && histogramParams.x.includes('log')) {
         req.columnExpression = 'log('+req.columnExpression+')';
     }
-    if (histogramParams.numBins) { // fixed size bins
-        req.numBins = histogramParams.numBins;
+    if (histogramParams.fixedBinSizeSelection) { // fixed size bins
+        req.fixedBinSizeSelection=histogramParams.fixedBinSizeSelection;
+        if (histogramParams.fixedBinSizeSelection==='numBins'){
+           req.binSize =  histogramParams.numBins;
+        }else{
+            req.binSize =  histogramParams.binWidth;
+        }
     }
     if (histogramParams.falsePositiveRate) {  // variable size bins using Bayesian Blocks
         req.falsePositiveRate = histogramParams.falsePositiveRate;
     }
-    /*
     if (histogramParams.minCutoff) {
         req.min = histogramParams.minCutoff;
     }
     if (histogramParams.maxCutoff) {
         req.max = histogramParams.maxCutoff;
     }
-    */
 
     req.tbl_id = 'histogram-'+chartId;