pali112
/
zwiftout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename intervalsToIntensityNumbers to emphasize type of return value

This commit is contained in:
Rene Saarsoo 2020-09-25 14:35:11 +03:00
parent 212df4e748
commit 8339163fe5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stats/averageIntensity.ts
View File

@ -2,8 +2,8 @@ import { pipe } from "ramda";
import { Interval } from "../ast"; import { Interval } from "../ast";
import { Intensity } from "../Intensity"; import { Intensity } from "../Intensity";
import { average } from "./average"; import { average } from "./average";
import { intervalsToIntensities } from "./intervalsToIntensities"; import { intervalsToIntensityNumbers } from "./intervalsToIntensityNumbers";
export const averageIntensity = (intervals: Interval[]): Intensity => { export const averageIntensity = (intervals: Interval[]): Intensity => {
return new Intensity(pipe(intervalsToIntensities, average)(intervals)); return new Intensity(pipe(intervalsToIntensityNumbers, average)(intervals));
}; };

4
src/stats/intervalsToIntensities.ts → src/stats/intervalsToIntensityNumbers.ts
View File

@ -2,7 +2,7 @@ import { chain } from "ramda";
import { Interval } from "../ast"; import { Interval } from "../ast";
// Converts interval to array of intensity values for each second // 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 intensities: number[] = [];
const [from, to] = [intensity.start, intensity.end]; const [from, to] = [intensity.start, intensity.end];
for (let i = 0; i < duration.seconds; i++) { for (let i = 0; i < duration.seconds; i++) {
@ -12,4 +12,4 @@ const intervalToIntensities = ({ duration, intensity }: Interval): number[] => {
return intensities; return intensities;
}; };
export const intervalsToIntensities = chain(intervalToIntensities); export const intervalsToIntensityNumbers = chain(intervalToIntensityNumbers);

4
src/stats/normalizedIntensity.ts
View File

@ -2,7 +2,7 @@ import { pipe, sum } from "ramda";
import { Interval } from "../ast"; import { Interval } from "../ast";
import { Intensity } from "../Intensity"; import { Intensity } from "../Intensity";
import { average } from "./average"; import { average } from "./average";
import { intervalsToIntensities } from "./intervalsToIntensities"; import { intervalsToIntensityNumbers } from "./intervalsToIntensityNumbers";
// Starting at the beginning of the data, calculate 30-second rolling average // 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 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 => { export const normalizedIntensity = (intervals: Interval[]): Intensity => {
return new Intensity( return new Intensity(
pipe( pipe(
intervalsToIntensities, intervalsToIntensityNumbers,
rollingAverages, rollingAverages,
(averages) => averages.map(fourthPower), (averages) => averages.map(fourthPower),
average, average,