fork/cellxgene
1
0
Fork 0
mirror of https://github.com/chanzuckerberg/cellxgene.git synced 2026-10-06 11:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix binning error in continuous data histogram (#869)

Browse Source
This commit is contained in:
Bruce Martin
2019-08-05 10:40:56 -07:00
committed by GitHub
parent 57b1c3cbb4
commit 906d65c06f
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/__tests__/util/dataframe/histogram.test.js
+24
View File
@@ -66,4 +66,28 @@ describe("Dataframe column histogram", () => {
// memoized? // memoized?
expect(df.col("value").histogram(3, [0, 2])).toMatchObject(h1); expect(df.col("value").histogram(3, [0, 2])).toMatchObject(h1);
}); });
test("continuous thesholds correct", () => {
const vals = [0, 1, 9, 10, 11, 20, 99, 100];
const df = new Dataframe.Dataframe(
[8, 2],
[new Int32Array(vals), new Float32Array(vals)]
);
expect(df.col(0).histogram(5, [0, 100])).toEqual([5, 1, 0, 0, 2]);
expect(df.col(1).histogram(5, [0, 100])).toEqual([5, 1, 0, 0, 2]);
expect(df.col(0).histogram(2, [0, 10])).toEqual([2, 2]);
expect(df.col(0).histogram(10, [0, 100])).toEqual([
3,
2,
1,
0,
0,
0,
0,
0,
0,
2
]);
});
}); });
client/src/util/dataframe/histogram.js
+5 -5
View File
@@ -8,13 +8,13 @@ function _histogramContinuous(column, bins, min, max) {
if (!column) { if (!column) {
return valBins; return valBins;
} }
const binWidth = (max - min) / (bins - 1); const binWidth = (max - min) / bins;
const colArray = column.asArray(); const colArray = column.asArray();
for (let r = 0, len = colArray.length; r < len; r += 1) { for (let r = 0, len = colArray.length; r < len; r += 1) {
const val = colArray[r]; const val = colArray[r];
if (val <= max && val >= min) { if (val <= max && val >= min) {
// ensure test excludes NaN values // ensure test excludes NaN values
const valBin = (val - min) / binWidth; const valBin = Math.min(Math.floor((val - min) / binWidth), bins - 1);
valBins[valBin] += 1; valBins[valBin] += 1;
} }
} }
@@ -26,7 +26,7 @@ function _histogramContinuousBy(column, bins, min, max, by) {
if (!column || !by) { if (!column || !by) {
return byMap; return byMap;
} }
const binWidth = (max - min) / (bins - 1); const binWidth = (max - min) / bins;
const byArray = by.asArray(); const byArray = by.asArray();
const colArray = column.asArray(); const colArray = column.asArray();
for (let r = 0, len = colArray.length; r < len; r += 1) { for (let r = 0, len = colArray.length; r < len; r += 1) {
@@ -39,8 +39,8 @@ function _histogramContinuousBy(column, bins, min, max, by) {
const val = colArray[r]; const val = colArray[r];
if (val <= max && val >= min) { if (val <= max && val >= min) {
// ensure test excludes NaN values // ensure test excludes NaN values
const valBin = (val - min) / binWidth; const valBin = Math.min(Math.floor((val - min) / binWidth), bins - 1);
valBins[Math.floor(valBin)] += 1; valBins[valBin] += 1;
} }
} }
return byMap; return byMap;