Commit 6495ba15 by Ben RUBSON Committed by Torkel Ödegaard

Correct timeStep in case of missing values (#6526)

* Correct timeStep in case of missing values

* Comment
parent 24433263
...@@ -115,6 +115,15 @@ export default class TimeSeries { ...@@ -115,6 +115,15 @@ export default class TimeSeries {
currentValue = this.datapoints[i][0]; currentValue = this.datapoints[i][0];
currentTime = this.datapoints[i][1]; currentTime = this.datapoints[i][1];
// Due to missing values we could have different timeStep all along the series
// so we have to find the minimum one (could occur with aggregators such as ZimSum)
if (i>0) {
var previousTime = this.datapoints[i-1][1];
if (!this.stats.timeStep || currentTime - previousTime < this.stats.timeStep) {
this.stats.timeStep = currentTime - previousTime;
}
}
if (currentValue === null) { if (currentValue === null) {
if (ignoreNulls) { continue; } if (ignoreNulls) { continue; }
if (nullAsZero) { if (nullAsZero) {
...@@ -145,10 +154,6 @@ export default class TimeSeries { ...@@ -145,10 +154,6 @@ export default class TimeSeries {
result.push([currentTime, currentValue]); result.push([currentTime, currentValue]);
} }
if (this.datapoints.length >= 2) {
this.stats.timeStep = this.datapoints[1][1] - this.datapoints[0][1];
}
if (this.stats.max === -Number.MAX_VALUE) { this.stats.max = null; } if (this.stats.max === -Number.MAX_VALUE) { this.stats.max = null; }
if (this.stats.min === Number.MAX_VALUE) { this.stats.min = null; } if (this.stats.min === Number.MAX_VALUE) { this.stats.min = null; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment