Skip to content

Commit

Permalink
[performance] replace helpers.each calls with for-loops
Browse files Browse the repository at this point in the history
  • Loading branch information
@benmccann
benmccann committed May 27, 2019
1 parent 70b32ff commit b5ba6c0
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 36 deletions.
19 changes: 14 additions & 5 deletions src/core/core.helpers.js
View file
Expand Up @@ -553,25 +553,30 @@ module.exports = function() {

ctx.font = font;
var longest = 0;
helpers.each(arrayOfThings, function(thing) {
var ilen = arrayOfThings.length;
var i, j, jlen, thing, nestedThing;
for (i = 0; i < ilen; i++) {
thing = arrayOfThings[i];

// Undefined strings and arrays should not be measured
if (thing !== undefined && thing !== null && helpers.isArray(thing) !== true) {
longest = helpers.measureText(ctx, data, gc, longest, thing);
} else if (helpers.isArray(thing)) {
// if it is an array lets measure each element
// to do maybe simplify this function a bit so we can do this more recursively?
helpers.each(thing, function(nestedThing) {
for (j = 0, jlen = thing.length; j < jlen; j++) {
nestedThing = thing[j];
// Undefined strings and arrays should not be measured
if (nestedThing !== undefined && nestedThing !== null && !helpers.isArray(nestedThing)) {
longest = helpers.measureText(ctx, data, gc, longest, nestedThing);
}
});
}
}
});
}

var gcLen = gc.length / 2;
if (gcLen > arrayOfThings.length) {
for (var i = 0; i < gcLen; i++) {
for (i = 0; i < gcLen; i++) {
delete data[gc[i]];
}
gc.splice(0, gcLen);
Expand All @@ -589,6 +594,10 @@ module.exports = function() {
}
return longest;
};

/**
* @deprecated
*/
helpers.numberOfLabelLines = function(arrayOfThings) {
var numberOfLines = 1;
helpers.each(arrayOfThings, function(thing) {
Expand Down
36 changes: 19 additions & 17 deletions src/scales/scale.linear.js
View file
Expand Up @@ -16,11 +16,11 @@ module.exports = LinearScaleBase.extend({
var me = this;
var opts = me.options;
var chart = me.chart;
var data = chart.data;
var datasets = data.datasets;
var datasets = chart.data.datasets;
var isHorizontal = me.isHorizontal();
var DEFAULT_MIN = 0;
var DEFAULT_MAX = 1;
var data, i, ilen;

function IDMatches(meta) {
return isHorizontal ? meta.xAxisID === me.id : meta.yAxisID === me.id;
Expand Down Expand Up @@ -69,28 +69,29 @@ module.exports = LinearScaleBase.extend({
var negativeValues = valuesPerStack[key].negativeValues;

if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
helpers.each(dataset.data, function(rawValue, index) {
var value = me._parseValue(rawValue);
data = dataset.data;
for (i = 0, ilen = data.length; i < ilen; i++) {
var value = me._parseValue(data[i]);

if (isNaN(value.min) || isNaN(value.max) || meta.data[index].hidden) {
return;
if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden) {
continue;
}

positiveValues[index] = positiveValues[index] || 0;
negativeValues[index] = negativeValues[index] || 0;
positiveValues[i] = positiveValues[i] || 0;
negativeValues[i] = negativeValues[i] || 0;

if (value.min === 0 && !opts.ticks.beginAtZero) {
value.min = value.max;
}

if (opts.relativePoints) {
positiveValues[index] = 100;
positiveValues[i] = 100;
} else if (value.min < 0 || value.max < 0) {
negativeValues[index] += value.min;
negativeValues[i] += value.min;
} else {
positiveValues[index] += value.max;
positiveValues[i] += value.max;
}
});
}
}
});

Expand All @@ -106,11 +107,12 @@ module.exports = LinearScaleBase.extend({
helpers.each(datasets, function(dataset, datasetIndex) {
var meta = chart.getDatasetMeta(datasetIndex);
if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
helpers.each(dataset.data, function(rawValue, index) {
var value = me._parseValue(rawValue);
data = dataset.data;
for (i = 0, ilen = data.length; i < ilen; i++) {
var value = me._parseValue(data[i]);

if (isNaN(value.min) || isNaN(value.max) || meta.data[index].hidden) {
return;
if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden) {
continue;
}

if (me.min === null || value.min < me.min) {
Expand All @@ -120,7 +122,7 @@ module.exports = LinearScaleBase.extend({
if (me.max === null || me.max < value.max) {
me.max = value.max;
}
});
}
}
});
}
Expand Down
30 changes: 16 additions & 14 deletions src/scales/scale.logarithmic.js
View file
Expand Up @@ -72,12 +72,12 @@ module.exports = Scale.extend({
var me = this;
var opts = me.options;
var chart = me.chart;
var data = chart.data;
var datasets = data.datasets;
var datasets = chart.data.datasets;
var isHorizontal = me.isHorizontal();
function IDMatches(meta) {
return isHorizontal ? meta.xAxisID === me.id : meta.yAxisID === me.id;
}
var i, ilen, data;

// Calculate Range
me.min = null;
Expand Down Expand Up @@ -116,16 +116,17 @@ module.exports = Scale.extend({
valuesPerStack[key] = [];
}

helpers.each(dataset.data, function(rawValue, index) {
data = dataset.data;
for (i = 0, ilen = data.length; i < ilen; i++) {
var values = valuesPerStack[key];
var value = me._parseValue(rawValue);
var value = me._parseValue(data[i]);
// invalid, hidden and negative values are ignored
if (isNaN(value.min) || isNaN(value.max) || meta.data[index].hidden || value.min < 0 || value.max < 0) {
return;
if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden || value.min < 0 || value.max < 0) {
continue;
}
values[index] = values[index] || 0;
values[index] += value.max;
});
values[i] = values[i] || 0;
values[i] += value.max;
}
}
});

Expand All @@ -142,11 +143,12 @@ module.exports = Scale.extend({
helpers.each(datasets, function(dataset, datasetIndex) {
var meta = chart.getDatasetMeta(datasetIndex);
if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
helpers.each(dataset.data, function(rawValue, index) {
var value = me._parseValue(rawValue);
data = dataset.data;
for (i = 0, ilen = data.length; i < ilen; i++) {
var value = me._parseValue(data[i]);
// invalid, hidden and negative values are ignored
if (isNaN(value.min) || isNaN(value.max) || meta.data[index].hidden || value.min < 0 || value.max < 0) {
return;
if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden || value.min < 0 || value.max < 0) {
continue;
}

if (me.min === null || value.min < me.min) {
Expand All @@ -160,7 +162,7 @@ module.exports = Scale.extend({
if (value.min !== 0 && (me.minNotZero === null || value.min < me.minNotZero)) {
me.minNotZero = value.min;
}
});
}
}
});
}
Expand Down

0 comments on commit b5ba6c0

Please sign in to comment.