X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FStatisticUtils.ts;h=9ca4398ca76590250de3b1c5a935f42ca373cd6f;hb=8d2a9e1c5a2b21932c77846bdf10cbe726797685;hp=bccebbe092ad5d900a5c8e2cc4d3fb27ef4911f1;hpb=66a7748ddeda8c94d7562a1ce58d440319654a4c;p=e-mobility-charging-stations-simulator.git diff --git a/src/utils/StatisticUtils.ts b/src/utils/StatisticUtils.ts index bccebbe0..9ca4398c 100644 --- a/src/utils/StatisticUtils.ts +++ b/src/utils/StatisticUtils.ts @@ -1,5 +1,3 @@ -import { isEmptyArray, isNullOrUndefined } from './Utils.js' - /** * Computes the average of the given data set. * @@ -10,8 +8,7 @@ import { isEmptyArray, isNullOrUndefined } from './Utils.js' export const average = (dataSet: number[]): number => { if (Array.isArray(dataSet) && dataSet.length === 0) { return 0 - } - if (Array.isArray(dataSet) && dataSet.length === 1) { + } else if (Array.isArray(dataSet) && dataSet.length === 1) { return dataSet[0] } return dataSet.reduce((accumulator, nb) => accumulator + nb, 0) / dataSet.length @@ -25,10 +22,9 @@ export const average = (dataSet: number[]): number => { * @internal */ export const median = (dataSet: number[]): number => { - if (isEmptyArray(dataSet)) { + if (Array.isArray(dataSet) && dataSet.length === 0) { return 0 - } - if (Array.isArray(dataSet) && dataSet.length === 1) { + } else if (Array.isArray(dataSet) && dataSet.length === 1) { return dataSet[0] } const sortedDataSet = dataSet.slice().sort((a, b) => a - b) @@ -42,7 +38,7 @@ export const nthPercentile = (dataSet: number[], percentile: number): number => if (percentile < 0 && percentile > 100) { throw new RangeError('Percentile is not between 0 and 100') } - if (isEmptyArray(dataSet)) { + if (Array.isArray(dataSet) && dataSet.length === 0) { return 0 } const sortedDataSet = dataSet.slice().sort((a, b) => a - b) @@ -54,7 +50,8 @@ export const nthPercentile = (dataSet: number[], percentile: number): number => } const percentileIndexBase = (percentile / 100) * (sortedDataSet.length - 1) const percentileIndexInteger = Math.floor(percentileIndexBase) - if (!isNullOrUndefined(sortedDataSet[percentileIndexInteger + 1])) { + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + if (sortedDataSet[percentileIndexInteger + 1] != null) { return ( sortedDataSet[percentileIndexInteger] + (percentileIndexBase - percentileIndexInteger) * @@ -77,10 +74,7 @@ export const stdDeviation = ( dataSet: number[], dataSetAverage: number = average(dataSet) ): number => { - if (isEmptyArray(dataSet)) { - return 0 - } - if (Array.isArray(dataSet) && dataSet.length === 1) { + if (Array.isArray(dataSet) && (dataSet.length === 0 || dataSet.length === 1)) { return 0 } return Math.sqrt(