From e447105719744aed71a6c8ced7dcc8bae73c261c Mon Sep 17 00:00:00 2001 From: Arild Matsson Date: Sat, 25 May 2024 00:13:23 +0200 Subject: [PATCH] Cleanup timeseries --- app/scripts/timeseries.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/scripts/timeseries.ts b/app/scripts/timeseries.ts index 6ef1a7c92..371794a51 100644 --- a/app/scripts/timeseries.ts +++ b/app/scripts/timeseries.ts @@ -9,11 +9,7 @@ import settings from "@/settings" /** * Find some even points within a range of years. * - * E.g: - * (1830, 2024) => [1850, 1900, 1950, 2000] - * (1967, 1989) => [1970, 1980] - * (1999, 1999) => [1999] - * (1989, 1999) => [1990, 1995] + * E.g: (1830, 2024) => [1850, 1900, 1950, 2000] */ export function calculateYearTicks(min: number, max: number) { // Find a reasonable step size @@ -38,7 +34,7 @@ export const getSeries = () => fromPairs(getTimeDataPairs()) as YearSeries export function getSeriesSelected() { const corpora: { time?: YearSeries }[] = settings.corpusListing.selected // `pickBy` removes zeroes. - const series = corpora.map((corpus) => ("time" in corpus ? (pickBy(corpus.time) as YearSeries) : {})) + const series = corpora.map((corpus) => ("time" in corpus ? pickBy(corpus.time) : {})) return sumYearSeries(...series) } @@ -54,9 +50,9 @@ export function getSpan() { return { min: timeData[0][0], max: timeData[timeData.length - 1][0] } } -/** Numeric data by year. */ -type YearSeries = Record - /** Sum numbers by year. */ export const sumYearSeries = (...series: YearSeries[]): YearSeries => assignWith({}, ...series, (sum: number | undefined, value: number) => (sum || 0) + value) + +/** Numeric data by year. */ +export type YearSeries = Record