From 8aa23468b30a7600e30df25b671b5e5cd89ddbdc Mon Sep 17 00:00:00 2001 From: Spythere Date: Thu, 23 May 2024 15:53:18 +0200 Subject: [PATCH] chore: changed station stats median to avg --- src/components/StationsView/StationStats.vue | 32 ++++++++------------ src/locales/en.json | 2 +- src/locales/pl.json | 2 +- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/components/StationsView/StationStats.vue b/src/components/StationsView/StationStats.vue index 4ee718b..ba8552a 100644 --- a/src/components/StationsView/StationStats.vue +++ b/src/components/StationsView/StationStats.vue @@ -21,8 +21,8 @@
• - {{ $t('station-stats.med-timetable-count') }} - {{ medTimetableCount }} + {{ $t('station-stats.avg-timetable-count') }} + {{ avgTimetableCount.toFixed(2) }}
@@ -89,27 +89,19 @@ export default defineComponent({ return activeDispatchers.length != 0 ? activeTrains.length / activeDispatchers.length : 0; }, - medTimetableCount() { - const scheduledTrainsArr = this.mainStore.activeSceneryList - .reduce((acc, sc) => { - if (sc.region != this.mainStore.region.id) return acc; + avgTimetableCount() { + const regionSceneries = this.mainStore.activeSceneryList.filter((sc) => { + return sc.region == this.mainStore.region.id; + }); - acc.push(sc.scheduledTrainCount.all); + const timetableCountSum = regionSceneries.reduce((acc, sc) => { + acc += sc.scheduledTrainCount.all; + return acc; + }, 0); - return acc; - }, []) - .sort((a, b) => Math.sign(a - b)); + if (regionSceneries.length == 0) return 0; - if (scheduledTrainsArr.length == 0) return 0; - - if (scheduledTrainsArr.length % 2 == 0) { - let v1 = scheduledTrainsArr[scheduledTrainsArr.length / 2]; - let v2 = scheduledTrainsArr[scheduledTrainsArr.length / 2 - 1]; - - return (v1 + v2) / 2; - } - - return scheduledTrainsArr[~~(scheduledTrainsArr.length / 2)]; + return timetableCountSum / regionSceneries.length; }, trackCount() { diff --git a/src/locales/en.json b/src/locales/en.json index 234b9ac..2e3d8eb 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -306,7 +306,7 @@ "station-stats": { "u-factor": "U-factor", "u-factor-tooltip": "(?) Current server traffic factor (driver count divided by dispatcher count)", - "med-timetable-count": "Median of scenery timetables:", + "avg-timetable-count": "Average count of scenery timetables:", "single-track-count": "Single track routes:", "double-track-count": "Double track routes:", "cross-sceneries": "Cross-track sceneries (1-track <-> 2-track)", diff --git a/src/locales/pl.json b/src/locales/pl.json index 892d035..1f233b4 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -300,7 +300,7 @@ "station-stats": { "u-factor": "Współczynnik Ugla", "u-factor-tooltip": "(?) Współczynnik ruchu na serwerze (liczba maszynistów online dzielona na liczbę dyżurnych ruchu)", - "med-timetable-count": "Mediana rozkładów jazdy na sceneriach:", + "avg-timetable-count": "Średnia liczba rozkładów jazdy na sceneriach:", "single-track-count": "Szlaki jednotorowe:", "double-track-count": "Szlaki dwutorowe:", "cross-sceneries": "Scenerie przejściowe (1-tor <-> 2-tor):",