From 8339163fe52164a1d0182e64db973eea256d6d89 Mon Sep 17 00:00:00 2001 From: Rene Saarsoo Date: Fri, 25 Sep 2020 14:35:11 +0300 Subject: [PATCH] Rename intervalsToIntensityNumbers to emphasize type of return value --- src/stats/averageIntensity.ts | 4 ++-- ...tervalsToIntensities.ts => intervalsToIntensityNumbers.ts} | 4 ++-- src/stats/normalizedIntensity.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/stats/{intervalsToIntensities.ts => intervalsToIntensityNumbers.ts} (71%) diff --git a/src/stats/averageIntensity.ts b/src/stats/averageIntensity.ts index cd07f61..141dcea 100644 --- a/src/stats/averageIntensity.ts +++ b/src/stats/averageIntensity.ts @@ -2,8 +2,8 @@ import { pipe } from "ramda"; import { Interval } from "../ast"; import { Intensity } from "../Intensity"; import { average } from "./average"; -import { intervalsToIntensities } from "./intervalsToIntensities"; +import { intervalsToIntensityNumbers } from "./intervalsToIntensityNumbers"; export const averageIntensity = (intervals: Interval[]): Intensity => { - return new Intensity(pipe(intervalsToIntensities, average)(intervals)); + return new Intensity(pipe(intervalsToIntensityNumbers, average)(intervals)); }; diff --git a/src/stats/intervalsToIntensities.ts b/src/stats/intervalsToIntensityNumbers.ts similarity index 71% rename from src/stats/intervalsToIntensities.ts rename to src/stats/intervalsToIntensityNumbers.ts index 88bd20d..810c1a5 100644 --- a/src/stats/intervalsToIntensities.ts +++ b/src/stats/intervalsToIntensityNumbers.ts @@ -2,7 +2,7 @@ import { chain } from "ramda"; import { Interval } from "../ast"; // Converts interval to array of intensity values for each second -const intervalToIntensities = ({ duration, intensity }: Interval): number[] => { +const intervalToIntensityNumbers = ({ duration, intensity }: Interval): number[] => { const intensities: number[] = []; const [from, to] = [intensity.start, intensity.end]; for (let i = 0; i < duration.seconds; i++) { @@ -12,4 +12,4 @@ const intervalToIntensities = ({ duration, intensity }: Interval): number[] => { return intensities; }; -export const intervalsToIntensities = chain(intervalToIntensities); +export const intervalsToIntensityNumbers = chain(intervalToIntensityNumbers); diff --git a/src/stats/normalizedIntensity.ts b/src/stats/normalizedIntensity.ts index 899b5ef..d5633c0 100644 --- a/src/stats/normalizedIntensity.ts +++ b/src/stats/normalizedIntensity.ts @@ -2,7 +2,7 @@ import { pipe, sum } from "ramda"; import { Interval } from "../ast"; import { Intensity } from "../Intensity"; import { average } from "./average"; -import { intervalsToIntensities } from "./intervalsToIntensities"; +import { intervalsToIntensityNumbers } from "./intervalsToIntensityNumbers"; // Starting at the beginning of the data, calculate 30-second rolling average const windowSize = 30; // equals to nr of seconds, but also to nr of entries in intensities array @@ -28,7 +28,7 @@ const fourthRoot = (x: number) => Math.pow(x, 1 / 4); export const normalizedIntensity = (intervals: Interval[]): Intensity => { return new Intensity( pipe( - intervalsToIntensities, + intervalsToIntensityNumbers, rollingAverages, (averages) => averages.map(fourthPower), average,