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

View File

@ -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));
};

View File

@ -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);

View File

@ -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,