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

Jump to bottom

[performance] faster major tick calculation #6307

Merged
merged 3 commits into from Jun 19, 2019
Merged

[performance] faster major tick calculation #6307

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cada458
[performance] faster major tick calculation
benmccann May 29, 2019
c444266
Address review comments
benmccann Jun 4, 2019
0e2a489
Replace isNaN
benmccann Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 24 additions & 6 deletions src/scales/scale.time.js
View file
Open in desktop
Expand Up @@ -404,21 +404,39 @@ function computeOffsets(table, ticks, min, max, options) {
return {start: start, end: end};
}

function setMajorTicks(scale, indices, ticks, majorUnit) {
benmccann marked this conversation as resolved.
Show resolved Hide resolved
var adapter = scale._adapter;
var first = +adapter.startOf(ticks[0].value, majorUnit);
var last = ticks[ticks.length - 1].value;
var major, index;

for (major = first; major <= last; major = +adapter.add(major, 1, majorUnit)) {
index = indices[major];
if (typeof index !== 'undefined') {
benmccann marked this conversation as resolved.
Show resolved Hide resolved
ticks[index].major = true;
}
}
return ticks;
}

function ticksFromTimestamps(scale, values, majorUnit) {
var ticks = [];
var i, ilen, value, major;
var ts = {};
var ilen = values.length;
var i, value;

for (i = 0, ilen = values.length; i < ilen; ++i) {
for (i = 0; i < ilen; ++i) {
value = values[i];
major = majorUnit ? value === +scale._adapter.startOf(value, majorUnit) : false;
ts[value] = i;

ticks.push({
value: value,
major: major
value: value
benmccann marked this conversation as resolved.
Show resolved Hide resolved
});
}

return ticks;
// We set the major ticks separately from the above loop because calling startOf for every tick
// is expensive when there is a large number of ticks
return (ilen === 0 || !majorUnit) ? ticks : setMajorTicks(scale, ts, ticks, majorUnit);
}

var defaultConfig = {
Expand Down
4 changes: 2 additions & 2 deletions test/specs/scale.time.tests.js
View file
Open in desktop
Expand Up @@ -703,7 +703,7 @@ describe('Time scale tests', function() {

expect(scale._ticks.map(function(tick) {
return tick.major;
})).toEqual([true, false, false, false, true]);
})).toEqual([true, undefined, undefined, undefined, true]);
expect(scale.ticks).toEqual(['<8:00:00 pm>', '<8:00:15 pm>', '<8:00:30 pm>', '<8:00:45 pm>', '<8:01:00 pm>']);
});

Expand Down Expand Up @@ -763,7 +763,7 @@ describe('Time scale tests', function() {

expect(scale._ticks.map(function(tick) {
return tick.major;
})).toEqual([true, false, false, false, true]);
})).toEqual([true, undefined, undefined, undefined, true]);
expect(scale.ticks).toEqual(['[[8:00 pm]]', '(8:00:15 pm)', '(8:00:30 pm)', '(8:00:45 pm)', '[[8:01 pm]]']);
});

Expand Down