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

Avoid instanceof RangeIntensity checks

This commit is contained in:
Rene Saarsoo 2020-10-06 13:27:11 +03:00
parent 98f10971b3
commit 919996dd09
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/detectRepeats.ts
View File

@ -1,7 +1,6 @@
import { eqProps, flatten, zip } from "ramda"; import { eqProps, flatten, zip } from "ramda";
import { Interval, Comment } from "./ast"; import { Interval, Comment } from "./ast";
import { Duration } from "./Duration"; import { Duration } from "./Duration";
import { RangeIntensity } from "./Intensity";
export type RepeatedInterval = { export type RepeatedInterval = {
type: "repeat"; type: "repeat";
@ -70,7 +69,7 @@ const extractRepeatedInterval = (intervals: Interval[], i: number): RepeatedInte
}; };
}; };
const isRangeInterval = (interval: Interval): boolean => interval.intensity instanceof RangeIntensity; const isRangeInterval = ({ intensity }: Interval): boolean => intensity.start !== intensity.end;
export const detectRepeats = (intervals: Interval[]): (Interval | RepeatedInterval)[] => { export const detectRepeats = (intervals: Interval[]): (Interval | RepeatedInterval)[] => {
if (intervals.length < windowSize) { if (intervals.length < windowSize) {

7
src/stats/zoneDistribution.ts
View File

@ -1,6 +1,5 @@
import { Interval } from "../ast"; import { Interval } from "../ast";
import { Duration } from "../Duration"; import { Duration } from "../Duration";
import { RangeIntensity } from "../Intensity";
import { intensityValueToZoneType, ZoneType } from "../ZoneType"; import { intensityValueToZoneType, ZoneType } from "../ZoneType";
import { intervalsToIntensityNumbers } from "./intervalsToIntensityNumbers"; import { intervalsToIntensityNumbers } from "./intervalsToIntensityNumbers";
@ -21,12 +20,12 @@ export const zoneDistribution = (intervals: Interval[]): ZoneDuration[] => {
const zones = emptyZones(); const zones = emptyZones();
intervals.forEach((interval) => { intervals.forEach((interval) => {
if (interval.intensity instanceof RangeIntensity) { if (interval.intensity.start === interval.intensity.end) {
zones[interval.intensity.zone].duration += interval.duration.seconds;
} else {
intervalsToIntensityNumbers([interval]).forEach((intensityValue) => { intervalsToIntensityNumbers([interval]).forEach((intensityValue) => {
zones[intensityValueToZoneType(intensityValue)].duration++; zones[intensityValueToZoneType(intensityValue)].duration++;
}); });
} else {
zones[interval.intensity.zone].duration += interval.duration.seconds;
} }
}); });

4
src/utils/chunkRangeIntervals.ts
View File

@ -1,7 +1,7 @@
import { chain, curry } from "ramda"; import { chain, curry } from "ramda";
import { Interval } from "../ast"; import { Interval } from "../ast";
import { Duration } from "../Duration"; import { Duration } from "../Duration";
import { ConstantIntensity, Intensity, RangeIntensity } from "../Intensity"; import { ConstantIntensity, Intensity } from "../Intensity";
const chunkDuration = (seconds: number, chunkSize: Duration, intervalDuration: Duration): Duration => { const chunkDuration = (seconds: number, chunkSize: Duration, intervalDuration: Duration): Duration => {
return seconds + chunkSize.seconds > intervalDuration.seconds return seconds + chunkSize.seconds > intervalDuration.seconds
@ -26,7 +26,7 @@ const chunkIntensity = (
}; };
const chunkInterval = curry((chunkSize: Duration, interval: Interval): Interval[] => { const chunkInterval = curry((chunkSize: Duration, interval: Interval): Interval[] => {
if (!(interval.intensity instanceof RangeIntensity)) { if (interval.intensity.start === interval.intensity.end) {
return [interval]; return [interval];
} }