Skip to content
Merged
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,47 @@ export function calculateTimeValue(
errorMsg: `The time lag set at ${timeLag} is too large for the length of data at ${reversedEntries.length}. No data available.`,
};

let laggedValue: number | null;
let laggedValue: number | null = null;

if (timeLag < 0)
laggedValue = reversedEntries[totalLag + timeLag][valueField];
else laggedValue = reversedEntries[timeLag][valueField];

if (typeof laggedValue !== 'number' || typeof recent !== 'number')
return { value: null };
if (timeLag < 0) {
const index = totalLag + timeLag;
if (index >= 0 && index < totalLag) {
laggedValue = reversedEntries[index][valueField];
}
} else if (timeLag === 0) {
laggedValue = recent;
} else {
// Find the Nth actual data point, skipping null values
let dataPointsFound = 0;
reversedEntries.slice(1, totalLag).some(entry => {
const searchValue = entry[valueField];
if (typeof searchValue === 'number') {
dataPointsFound += 1;
if (dataPointsFound === timeLag) {
laggedValue = searchValue;
return true;
}
}
return false;
});
}

let calculatedValue: number;
// For comparison operations, both values must be numbers
if (typeof laggedValue === 'number' && typeof recent === 'number') {
if (column.comparisonType === 'diff')
return { value: recent - laggedValue };
if (column.comparisonType === 'perc')
return { value: recent / laggedValue };
if (column.comparisonType === 'perc_change')
return { value: recent / laggedValue - 1 };
}

if (column.comparisonType === 'diff') calculatedValue = recent - laggedValue;
else if (column.comparisonType === 'perc')
calculatedValue = recent / laggedValue;
else if (column.comparisonType === 'perc_change')
calculatedValue = recent / laggedValue - 1;
else calculatedValue = laggedValue;
// If recent is null, return null (can't do meaningful calculations)
if (recent === null) {
Comment thread
msyavuz marked this conversation as resolved.
Outdated
return { value: null };
}

return { value: calculatedValue };
return { value: laggedValue };
}

/**
Expand Down
Loading