mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-16 07:13:29 +00:00
refactor(stats): one least-squares fit for every trend line
Six readers fitted a line by hand, four in the determinant form that loses digits on a large x axis, and the two charts carried the same trend function twice. linearFit / fitFromSums in lib/stats is now the one implementation (centred sums, so a fit from points and one composed from stored accumulators are the same arithmetic), trendLineByTime serves both charts with the same two-decimal output, and a guard keeps hand-rolled slopes out of the tree.
This commit is contained in:
1 parent
0fe9d5d224
commit
05503e2b82
9 files changed
+270
-139
No files matched your search
@@ -89,6 +89,7 @@ import {
|
||||
DEFAULT_CHART_RANGE,
|
||||
rangeWindowDays,
|
||||
} from "./chart-range-tabs";
|
||||
import { trendLineByTime } from "@/lib/stats/linear-fit";
|
||||
|
||||
// The range tabs (7 / 30 / 90 / All, a calendar-day window ending now) and
|
||||
// the "All" tab's ten-year fetch span live with the shared
|
||||
@@ -585,44 +586,6 @@ export function resolveAnnotationPositions(
|
||||
return out;
|
||||
}
|
||||
|
||||
function buildTrendSeriesByTime(data: Array<{ date: Date; value: number }>): {
|
||||
points: Array<{ date: Date; value: number }>;
|
||||
slopePerDay: number;
|
||||
} | null {
|
||||
if (data.length < 2) return null;
|
||||
|
||||
const sorted = [...data].sort((a, b) => a.date.getTime() - b.date.getTime());
|
||||
const startTime = sorted[0].date.getTime();
|
||||
const points = sorted.map((p) => ({
|
||||
x: (p.date.getTime() - startTime) / 86400000,
|
||||
y: p.value,
|
||||
}));
|
||||
|
||||
const n = points.length;
|
||||
const sumX = points.reduce((s, p) => s + p.x, 0);
|
||||
const sumY = points.reduce((s, p) => s + p.y, 0);
|
||||
const sumXY = points.reduce((s, p) => s + p.x * p.y, 0);
|
||||
const sumXX = points.reduce((s, p) => s + p.x * p.x, 0);
|
||||
|
||||
const denominator = n * sumXX - sumX * sumX;
|
||||
if (denominator === 0) return null;
|
||||
|
||||
const slope = (n * sumXY - sumX * sumY) / denominator;
|
||||
const intercept = (sumY - slope * sumX) / n;
|
||||
|
||||
return {
|
||||
points: sorted.map((p) => ({
|
||||
date: p.date,
|
||||
value:
|
||||
Math.round(
|
||||
(intercept + slope * ((p.date.getTime() - startTime) / 86400000)) *
|
||||
100,
|
||||
) / 100,
|
||||
})),
|
||||
slopePerDay: slope,
|
||||
};
|
||||
}
|
||||
|
||||
export function HealthChart({
|
||||
types,
|
||||
title,
|
||||
@@ -1235,7 +1198,7 @@ export function HealthChart({
|
||||
}));
|
||||
|
||||
if (typeData.length >= 2) {
|
||||
const trend = buildTrendSeriesByTime(typeData);
|
||||
const trend = trendLineByTime(typeData);
|
||||
if (trend) {
|
||||
for (const point of trend.points) {
|
||||
const pointTimestamp = point.date.getTime();
|
||||
|
||||
@@ -54,6 +54,7 @@ import { CHART_HEIGHT_PX } from "@/lib/charts/constants";
|
||||
import { shouldFireDataReady } from "@/lib/charts/data-ready-latch";
|
||||
import { moodLabelKeyForScore } from "@/lib/mood/labels";
|
||||
import { apiGet } from "@/lib/api/api-fetch";
|
||||
import { trendLineByTime } from "@/lib/stats/linear-fit";
|
||||
|
||||
// --- Types ---
|
||||
|
||||
@@ -197,44 +198,6 @@ function movingAverageByPoints(
|
||||
});
|
||||
}
|
||||
|
||||
function buildTrendLine(data: Array<{ date: Date; value: number }>): {
|
||||
points: Array<{ date: Date; value: number }>;
|
||||
slopePerDay: number;
|
||||
} | null {
|
||||
if (data.length < 2) return null;
|
||||
|
||||
const sorted = [...data].sort((a, b) => a.date.getTime() - b.date.getTime());
|
||||
const startTime = sorted[0].date.getTime();
|
||||
const points = sorted.map((p) => ({
|
||||
x: (p.date.getTime() - startTime) / 86400000,
|
||||
y: p.value,
|
||||
}));
|
||||
|
||||
const n = points.length;
|
||||
const sumX = points.reduce((s, p) => s + p.x, 0);
|
||||
const sumY = points.reduce((s, p) => s + p.y, 0);
|
||||
const sumXY = points.reduce((s, p) => s + p.x * p.y, 0);
|
||||
const sumXX = points.reduce((s, p) => s + p.x * p.x, 0);
|
||||
|
||||
const denominator = n * sumXX - sumX * sumX;
|
||||
if (denominator === 0) return null;
|
||||
|
||||
const slope = (n * sumXY - sumX * sumY) / denominator;
|
||||
const intercept = (sumY - slope * sumX) / n;
|
||||
|
||||
return {
|
||||
points: sorted.map((p) => ({
|
||||
date: p.date,
|
||||
value:
|
||||
Math.round(
|
||||
(intercept + slope * ((p.date.getTime() - startTime) / 86400000)) *
|
||||
100,
|
||||
) / 100,
|
||||
})),
|
||||
slopePerDay: slope,
|
||||
};
|
||||
}
|
||||
|
||||
// --- Aggregation helpers (exported for unit tests) ---
|
||||
|
||||
interface MoodEntryDay {
|
||||
@@ -542,7 +505,7 @@ export function MoodChart({
|
||||
}));
|
||||
|
||||
if (scoreData.length >= 2) {
|
||||
const trend = buildTrendLine(scoreData);
|
||||
const trend = trendLineByTime(scoreData);
|
||||
if (trend) {
|
||||
for (const point of trend.points) {
|
||||
const pointTimestamp = point.date.getTime();
|
||||
|
||||
Reference in new issue
Block a user