fix data hists

lineupjs · Dec 16, 2018 · 96ca53f · 96ca53f
1 parent f8cac30
commit 96ca53f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/src/internal/math.ts b/src/internal/math.ts
@@ -351,7 +351,7 @@ export function normalizedStatsBuilder(numberOfBins: number): IBuilder<number, I
     let high = numberOfBins - 1;
     // binary search
     while (low < high) {
-      const center = Math.floor(high + low) / 2;
+      const center = Math.floor((high + low) / 2);
       if (v < hist[center].x1) {
         high = center;
       } else {
@@ -777,6 +777,10 @@ export function dateValueCacheBuilder(length: number) {
   };
 }
 
+export function dateValueCache2Value(v: number) {
+  return v === MISSING_DATE ? null : new Date(v);
+}
+
 export function categoricalValueCacheBuilder(length:  number, categories: {name: string}[]) {
   const vs = createIndexArray(length, categories.length + 1);
   const name2index = new Map<string, number>();
@@ -790,6 +794,10 @@ export function categoricalValueCacheBuilder(length:  number, categories: {name:
   };
 }
 
+export function categoricalValueCache2Value<T extends {name: string}>(v: number, categories: T[]) {
+  return v === 0 ? null : categories[v - 1];
+}
+
 
 function sortWorkerMain(self: IPoorManWorkerScope) {
   const refs = new Map<string, UIntTypedArray | Float32Array | Int32Array>();
@@ -826,13 +834,12 @@ function sortWorkerMain(self: IPoorManWorkerScope) {
       // tslint:disable-next-line:prefer-for-of
       for (let ii = 0; ii < indices.length; ++ii) {
         const v = data[indices[ii]];
-        b.push(v === MISSING_DATE ? null : new Date(v));
+        b.push(dateValueCache2Value(v));
       }
     } else {
       // tslint:disable-next-line:prefer-for-of
       for (let i = 0; i < data.length; ++i) {
-        const v = data[i];
-        b.push(v === MISSING_DATE ? null : new Date(v));
+        b.push(dateValueCache2Value(data[i]));
       }
     }
     self.postMessage(<IDateStatsMessageResponse>{
@@ -851,14 +858,12 @@ function sortWorkerMain(self: IPoorManWorkerScope) {
     if (indices) {
       // tslint:disable-next-line:prefer-for-of
       for (let ii = 0; ii < indices.length; ++ii) {
-        const v = data[indices[ii]];
-        b.push(v === 0 ? null : cats[v - 1]!);
+        b.push(categoricalValueCache2Value(data[indices[ii]], cats));
       }
     } else {
       // tslint:disable-next-line:prefer-for-of
       for (let i = 0; i < data.length; ++i) {
-        const v = data[i];
-        b.push(v === 0 ? null : cats[v - 1]!);
+        b.push(categoricalValueCache2Value(data[i], cats));
       }
     }
 
@@ -932,6 +937,7 @@ function sortWorkerMain(self: IPoorManWorkerScope) {
     if (typeof r.uid !== 'number' || typeof r.type !== 'string') {
       return;
     }
+    debugger;
     const h = msgHandlers[r.type];
     if (h) {
       h(r);
@@ -949,5 +955,7 @@ export const WORKER_BLOB = createWorkerCodeBlob([
   asc.toString(),
   desc.toString(),
   sortComplex.toString(),
+  dateValueCache2Value.toString(),
+  categoricalValueCache2Value.toString(),
   toFunctionBody(sortWorkerMain)
 ]);
diff --git a/src/provider/ScheduledTasks.ts b/src/provider/ScheduledTasks.ts
@@ -1,8 +1,8 @@
-import {getNumberOfBins, IAdvancedBoxPlotData, ICategoricalStatistics, IDateStatistics, ISortMessageResponse, IStatistics, toIndexArray, WORKER_BLOB} from '../internal';
+import {getNumberOfBins, IAdvancedBoxPlotData, ICategoricalStatistics, IDateStatistics, ISortMessageResponse, IStatistics, toIndexArray, WORKER_BLOB, dateValueCache2Value, categoricalValueCache2Value} from '../internal';
 import {ISequence} from '../internal/interable';
 import TaskScheduler, {ABORTED, oneShotIterator} from '../internal/scheduler';
 import {WorkerTaskScheduler} from '../internal/worker';
-import Column, {ICategoricalLikeColumn, IDataRow, IDateColumn, IGroup, IndicesArray, INumberColumn, IOrderedGroup, isCategoricalLikeColumn, isDateColumn, isNumberColumn, Ranking, UIntTypedArray} from '../model';
+import Column, {ICategoricalLikeColumn, IDataRow, IDateColumn, IGroup, IndicesArray, INumberColumn, IOrderedGroup, isCategoricalLikeColumn, isDateColumn, isNumberColumn, Ranking, UIntTypedArray, isCategoricalColumn} from '../model';
 import {IRenderTask} from '../renderer/interfaces';
 import {sortDirect} from './DirectRenderTasks';
 import {CompareLookup} from './sort';
@@ -396,7 +396,16 @@ export class ScheduleRenderTasks extends ARenderTasks implements IRenderTaskExec
     }
     return (col: Column) => {
       const v = this.valueCacheData.get(col.id);
-      return v ? v[dataIndex] : undefined;
+      if (!v) {
+        return undefined;
+      }
+      if (isDateColumn(col)) {
+        return dateValueCache2Value(v[dataIndex]);
+      }
+      if (isCategoricalColumn(col)) {
+        return categoricalValueCache2Value(v[dataIndex], col.categories);
+      }
+      return v[dataIndex];
     };
   }
 

diff --git a/src/provider/tasks.ts b/src/provider/tasks.ts
@@ -128,7 +128,7 @@ export class ARenderTasks {
       let chunkCounter = currentChunkSize;
       const data = this.data;
       for (; i < data.length && chunkCounter > 0; ++i, --chunkCounter) {
-        builder.push(acc(data[i++]));
+        builder.push(acc(data[i]));
       }
       if (i < data.length) { // need another round
         return ANOTHER_ROUND;