Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[histogram] squash end-inclusive histogram bins #172

Merged
merged 5 commits into from
Mar 13, 2019
Merged

[histogram] squash end-inclusive histogram bins #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
64c59f6
[histogram] squash end-inclusive histogram bins
Mar 13, 2019
0137ab3
[histogram] add d3 bin issue link
Mar 13, 2019
b326a0c
[histogram] fix variable reference
Mar 13, 2019
da7411a
[histogram] more robust numeric binning
Mar 13, 2019
6d8ee39
[histogram] nix log
Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/demo/examples/02-histogram/renderHistogramTooltip.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function RenderTooltip({ datum, color }) {
<div>
<div>
<strong style={{ color }}>
{typeof bin === 'undefined' ? `${bin0.toFixed(1)} to ${bin1.toFixed(1)}` : bin}
{typeof bin === 'undefined' ? `${bin0.toFixed(2)} to ${bin1.toFixed(2)}` : bin}
</strong>
</div>
<br />
Expand Down
30 changes: 20 additions & 10 deletions packages/histogram/src/utils/binNumericData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@ const DEFAULT_BIN_COUNT = 10;
*/
export default function binNumericData({
allData,
binCount = DEFAULT_BIN_COUNT,
binCount: userBinCount = DEFAULT_BIN_COUNT,
binValues,
limits,
rawDataByIndex,
valueAccessor,
}) {
let binThresholdCount = Math.max(...[2, binCount - 1]);
if (Array.isArray(binValues)) binThresholdCount = binValues.length;
const binCount = Array.isArray(binValues) ? binValues.length : userBinCount;
const binsByIndex = {};
const histogram = d3Histogram();
let extent = d3Extent(allData, valueAccessor);
Expand All @@ -39,25 +38,36 @@ export default function binNumericData({
}
const scale = scaleLinear()
.domain(extent)
.nice(binThresholdCount);
.nice(binCount);

histogram
.domain(limits || scale.domain())
.thresholds(binValues || scale.ticks(binThresholdCount));
histogram.domain(limits || scale.domain()).thresholds(binValues || scale.ticks(binCount));

Object.keys(rawDataByIndex).forEach(index => {
const data = rawDataByIndex[index];
const seriesBins = histogram.value(valueAccessor)(data);

binsByIndex[index] = seriesBins.map((bin, i) => ({
// if the last bin equals the upper bound of the second to last bin, combine them
// see https://github.com/d3/d3-array/issues/46#issuecomment-269873644
const lastBinIndex = seriesBins.length - 1;
const lastBin = seriesBins[lastBinIndex];
const nextToLastBin = seriesBins[lastBinIndex - 1];
const shouldCombineEndBins =
nextToLastBin && nextToLastBin.x1 === lastBin.x0 && lastBin.x1 === lastBin.x0;
const filteredBins = shouldCombineEndBins ? seriesBins.slice(0, -1) : seriesBins;

binsByIndex[index] = filteredBins.map((bin, i) => ({
bin0: bin.x0,
// if the upper limit equals the lower one, use the delta between this bin and the last
bin1:
bin.x0 === bin.x1
? (i > 0 && bin.x0 + bin.x0 - seriesBins[i - 1].x0) || bin.x1 + 1
: bin.x1,
data: bin,
count: bin.length,
data: [...bin].concat(
shouldCombineEndBins && (shouldCombineEndBins && i === lastBinIndex - 1 ? lastBin : []),
),
// if the last bin was inclusive / omitted, add its count to the last bin
count:
bin.length + (shouldCombineEndBins && i === lastBinIndex - 1 ? lastBin.length || 0 : 0),
id: i.toString(),
}));
});
Expand Down