Add filter accuracy to INumberDesc

lineupjs · Nov 17, 2020 · 1ac0955 · 1ac0955
1 parent 25cc8b7
commit 1ac0955
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/demo/small_numbers.html b/demo/small_numbers.html
@@ -68,7 +68,8 @@
           .label('Column with small numbers')
           .width(250)
           .mapping('log', [minN, maxN], [1, 0])
-          .custom('numberFormat', 'e'),
+          .custom('numberFormat', 'e')
+          .custom('filterAccuracy', 0.00001),
       );
 
 

diff --git a/src/model/INumberColumn.ts b/src/model/INumberColumn.ts
@@ -107,6 +107,13 @@ export interface INumberDesc extends IMapAbleDesc {
    * @default .3n
    */
   numberFormat?: string;
+
+  /**
+   * The accuracy defines the deviation of values to the applied filter boundary.
+   * Use an accuracy closer to 0 for columns with smaller numbers (e.g., 1e-9).
+   * @default 0.001
+   */
+  filterAccuracy?: number;
 }
 
 /**

diff --git a/src/model/NumberColumn.ts b/src/model/NumberColumn.ts
@@ -69,11 +69,17 @@ export default class NumberColumn extends ValueColumn<number> implements INumber
 
   /**
    * currently active filter
-   * @type {{min: number, max: number}}
    * @private
    */
   private currentFilter: INumberFilter = noNumberFilter();
 
+  /**
+   * The accuracy defines the deviation of values to the applied filter boundary.
+   * Use an accuracy closer to 0 for columns with smaller numbers (e.g., 1e-9).
+   * @private
+   */
+  private readonly filterAccuracy: number = 0.001;
+
   private readonly numberFormat: (n: number) => string = format('.2f');
 
   private currentGroupThresholds: number[] = [];
@@ -92,6 +98,10 @@ export default class NumberColumn extends ValueColumn<number> implements INumber
     if (desc.numberFormat) {
       this.numberFormat = format(desc.numberFormat);
     }
+
+    if (desc.filterAccuracy) {
+      this.filterAccuracy = desc.filterAccuracy;
+    }
   }
 
   getNumberFormat() {
@@ -281,7 +291,7 @@ export default class NumberColumn extends ValueColumn<number> implements INumber
 
   setFilter(value: INumberFilter | null) {
     value = value || {min: -Infinity, max: +Infinity, filterMissing: false};
-    if (isEqualNumberFilter(value, this.currentFilter)) {
+    if (isEqualNumberFilter(value, this.currentFilter, this.filterAccuracy)) {
       return;
     }
     const bak = this.getFilter();

diff --git a/src/model/internalNumber.ts b/src/model/internalNumber.ts
@@ -60,8 +60,8 @@ export function noNumberFilter() {
 }
 
 /** @internal */
-export function isEqualNumberFilter(a: INumberFilter, b: INumberFilter) {
-  return similar(a.min, b.min, 0.001) && similar(a.max, b.max, 0.001) && a.filterMissing === b.filterMissing;
+export function isEqualNumberFilter(a: INumberFilter, b: INumberFilter, delta = 0.001) {
+  return similar(a.min, b.min, delta) && similar(a.max, b.max, delta) && a.filterMissing === b.filterMissing;
 }
 
 /** @internal */