Add analysis 02 (midnight sample), simplify plots, spell out rule names
- Analysis 02 MOVING_AVERAGE_7_DAYS_MIDNIGHT_UTC_DROP: same rule as analysis 01 on the 00:00 UTC BusVoltage sample only, one point per day. Shared computation in energy_check._ma_drop(); analysis 01 results unchanged on VERMONT. - Common page: one panel per analysis (02 under 01), then the time series (D-016); src/analyse_02.py launches that page. - Analysis panel reduced to two curves on one volt axis: 7-day mean and threshold; gap and reference moved to hover (D-015). - Date tick labels under every subplot. - Rule IDs spelled out: MA7D_DROP -> MOVING_AVERAGE_7_DAYS_DROP, MA7D_MIDNIGHT_DROP -> MOVING_AVERAGE_7_DAYS_MIDNIGHT_UTC_DROP (D-017). - Docs: analysis sheet 02, sheet 01, CLAUDE.md, README, decisions D-015..D-017, analysis rule and nouvelle-analyse skill. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
8992bda17e
commit
7b1da6d7cf
11 files changed
+214
-70
No files matched your search
+2
-1
@@ -1,4 +1,5 @@
|
||||
"""Analyse 01 : MA7D_DROP (tendance de BusVoltage en moyenne glissante), graphiques HTML ouverts dans le navigateur.
|
||||
"""Analyse 01 : MOVING_AVERAGE_7_DAYS_DROP (tendance de BusVoltage en moyenne glissante), graphiques HTML ouverts dans le navigateur.
|
||||
La page montre aussi, juste dessous, l'analyse 02 (MOVING_AVERAGE_7_DAYS_MIDNIGHT_UTC_DROP), pour comparer les deux méthodes.
|
||||
|
||||
Usage : python3 src/analyse_01.py [CSV ou dossiers...] (défaut : data/, sortie dans out/)
|
||||
Documentation : docs/analyses/analyse_01.md
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
"""Analyse 02 : MOVING_AVERAGE_7_DAYS_MIDNIGHT_UTC_DROP (MOVING_AVERAGE_7_DAYS_DROP sur la seule mesure de 00:00 UTC).
|
||||
|
||||
Son graphique est le panneau placé sous MOVING_AVERAGE_7_DAYS_DROP, dans la page commune : ce script lance analyse_01.py.
|
||||
Usage : python3 src/analyse_02.py [CSV ou dossiers...] (défaut : data/, sortie dans out/)
|
||||
Documentation : docs/analyses/analyse_02.md
|
||||
"""
|
||||
import runpy
|
||||
from pathlib import Path
|
||||
|
||||
runpy.run_path(str(Path(__file__).with_name("analyse_01.py")), run_name="__main__")
|
||||
+44
-19
@@ -1,6 +1,7 @@
|
||||
"""Analyse énergétique MA7D_DROP : tendance de BusVoltage en moyenne glissante.
|
||||
"""Analyses énergétiques : tendance de BusVoltage en moyenne glissante.
|
||||
|
||||
Documentation : docs/analyses/analyse_01.md
|
||||
- MOVING_AVERAGE_7_DAYS_DROP (docs/analyses/analyse_01.md) : sur toutes les heures ;
|
||||
- MOVING_AVERAGE_7_DAYS_MIDNIGHT_UTC_DROP (docs/analyses/analyse_02.md) : le même calcul sur la seule mesure de 00:00 UTC.
|
||||
Bibliothèque standard uniquement (cible : système embarqué de la station).
|
||||
"""
|
||||
import argparse
|
||||
@@ -14,6 +15,7 @@ import sys
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
HOUR = timedelta(hours=1)
|
||||
DAY = timedelta(days=1)
|
||||
|
||||
# Constantes de calibration (fiche analyse_01, « Constantes et sources »).
|
||||
WINDOW_H = 168 # multiple de 24 h : annule le cycle jour/nuit ; 72 h ne lisse pas la météo
|
||||
@@ -23,7 +25,7 @@ MIN_REF_POINTS = 24 # au moins un jour de référence (choix de conception)
|
||||
THRESHOLD_V = -0.2 # cas de régression : pire écart sain -0,16 V (VERMONT 05-11)
|
||||
|
||||
RULE = {
|
||||
"id": "MA7D_DROP",
|
||||
"id": "MOVING_AVERAGE_7_DAYS_DROP",
|
||||
"window_h": WINDOW_H,
|
||||
"ref_h": REF_H,
|
||||
"min_coverage": MIN_COVERAGE,
|
||||
@@ -33,6 +35,19 @@ RULE = {
|
||||
"doc": "docs/analyses/analyse_01.md",
|
||||
}
|
||||
|
||||
# Analyse 02 : les mêmes constantes, converties en jours (un point par jour, fiche analyse_02).
|
||||
RULE_MIDNIGHT = {
|
||||
"id": "MOVING_AVERAGE_7_DAYS_MIDNIGHT_UTC_DROP",
|
||||
"sample": "BusVoltage à 00:00 UTC",
|
||||
"window_d": WINDOW_H // 24,
|
||||
"ref_d": REF_H // 24,
|
||||
"min_coverage": MIN_COVERAGE,
|
||||
"min_ref_points": MIN_REF_POINTS // 24,
|
||||
"threshold_v": THRESHOLD_V,
|
||||
"threshold_source": "repris de MOVING_AVERAGE_7_DAYS_DROP pour comparer les méthodes, non recalibré (fiche analyse_02)",
|
||||
"doc": "docs/analyses/analyse_02.md",
|
||||
}
|
||||
|
||||
NAME_RE = re.compile(r"^(?P<station>[^_]+)_(?P<metric>.+?)_\d{4}_\d{2}_\d{2}_\d{2}_\d{2} to .+\.csv$")
|
||||
|
||||
|
||||
@@ -78,29 +93,39 @@ def load_stations(paths):
|
||||
|
||||
|
||||
def run(series):
|
||||
"""Analyse MA7D_DROP, causale : le point t n'utilise que les données <= t (fiche analyse_01, « Principe »)."""
|
||||
v = series["BusVoltage"]
|
||||
"""Analyse MOVING_AVERAGE_7_DAYS_DROP, causale : le point t n'utilise que les données <= t (fiche analyse_01, « Principe »)."""
|
||||
return _ma_drop(series["BusVoltage"], HOUR, WINDOW_H, REF_H, MIN_REF_POINTS, RULE)
|
||||
|
||||
|
||||
def run_midnight(series):
|
||||
"""Analyse MOVING_AVERAGE_7_DAYS_MIDNIGHT_UTC_DROP : le même calcul sur la seule mesure de 00:00 UTC (fiche analyse_02)."""
|
||||
v = {t: x for t, x in series["BusVoltage"].items() if t.hour == t.minute == 0}
|
||||
return _ma_drop(v, DAY, WINDOW_H // 24, REF_H // 24, MIN_REF_POINTS // 24, RULE_MIDNIGHT)
|
||||
|
||||
|
||||
def _ma_drop(v, step, window, ref_n, min_ref, rule):
|
||||
"""Moyenne sur `window` pas de `step`, comparée à son maximum des `ref_n` pas précédents (causal)."""
|
||||
if not v:
|
||||
return {"analysis": RULE["id"], "rule": RULE, "points": []}
|
||||
return {"analysis": rule["id"], "rule": rule, "points": []}
|
||||
t0 = min(v)
|
||||
if any((t - t0) % HOUR for t in v):
|
||||
raise ValueError("BusVoltage : horodatages hors de la grille horaire")
|
||||
grid = [t0 + i * HOUR for i in range((max(v) - t0) // HOUR + 1)]
|
||||
if any((t - t0) % step for t in v):
|
||||
raise ValueError(f"BusVoltage : horodatages hors de la grille (pas de {step})")
|
||||
grid = [t0 + i * step for i in range((max(v) - t0) // step + 1)]
|
||||
# NaN/inf (ex. export pandas) = pas de mesure : sinon un NaN pollue la somme courante.
|
||||
vals = [x if x is not None and math.isfinite(x) else None for x in (v.get(t) for t in grid)]
|
||||
|
||||
# Moyenne glissante sur WINDOW_H créneaux (somme courante), définie si couverture suffisante.
|
||||
# Moyenne glissante sur `window` créneaux (somme courante), définie si couverture suffisante.
|
||||
ma, cov = [None] * len(grid), [0.0] * len(grid)
|
||||
total = count = 0
|
||||
for i, x in enumerate(vals):
|
||||
if x is not None:
|
||||
total += x
|
||||
count += 1
|
||||
if i >= WINDOW_H and vals[i - WINDOW_H] is not None:
|
||||
total -= vals[i - WINDOW_H]
|
||||
if i >= window and vals[i - window] is not None:
|
||||
total -= vals[i - window]
|
||||
count -= 1
|
||||
cov[i] = count / WINDOW_H
|
||||
if count >= MIN_COVERAGE * WINDOW_H:
|
||||
cov[i] = count / window
|
||||
if count >= MIN_COVERAGE * window:
|
||||
ma[i] = total / count
|
||||
|
||||
points = []
|
||||
@@ -111,16 +136,16 @@ def run(series):
|
||||
value = anomaly = None
|
||||
if ma[i] is not None:
|
||||
facts["ma_v"] = round(ma[i], 3)
|
||||
lo = max(0, i - REF_H)
|
||||
lo = max(0, i - ref_n)
|
||||
ref_vals = [m for m in ma[lo:i] if m is not None]
|
||||
if len(ref_vals) >= MIN_REF_POINTS:
|
||||
if len(ref_vals) >= min_ref:
|
||||
ref = max(ref_vals)
|
||||
value = ma[i] - ref
|
||||
anomaly = value < THRESHOLD_V
|
||||
anomaly = value < rule["threshold_v"]
|
||||
facts["ref_v"] = round(ref, 3)
|
||||
facts["ref_t"] = grid[ma.index(ref, lo, i)]
|
||||
points.append({"t": t, "value": value, "anomaly": anomaly, "facts": facts})
|
||||
return {"analysis": RULE["id"], "rule": RULE, "points": points}
|
||||
return {"analysis": rule["id"], "rule": rule, "points": points}
|
||||
|
||||
|
||||
def periods(points):
|
||||
@@ -203,7 +228,7 @@ def summary(station, result, per):
|
||||
|
||||
|
||||
def main(argv=None):
|
||||
ap = argparse.ArgumentParser(description="Analyse énergétique MA7D_DROP")
|
||||
ap = argparse.ArgumentParser(description="Analyse énergétique MOVING_AVERAGE_7_DAYS_DROP")
|
||||
ap.add_argument("paths", nargs="+", help="fichiers CSV et/ou dossiers")
|
||||
ap.add_argument("--out", default="out", help="dossier de sortie (défaut : out/)")
|
||||
a = ap.parse_args(argv)
|
||||
|
||||
+35
-37
@@ -1,6 +1,6 @@
|
||||
"""Graphique HTML de l'analyse MA7D_DROP (poste de dev, plotly dans .venv).
|
||||
"""Graphique HTML des analyses énergétiques, un panneau par analyse (poste de dev, plotly dans .venv).
|
||||
|
||||
Documentation : docs/analyses/analyse_01.md
|
||||
Documentation : docs/analyses/analyse_01.md, docs/analyses/analyse_02.md
|
||||
"""
|
||||
import argparse
|
||||
import os
|
||||
@@ -11,7 +11,7 @@ import energy_check as ec
|
||||
|
||||
# Plotly ne recale pas l'ordonnée sur la plage visible : après chaque zoom ou déplacement horizontal,
|
||||
# ce script recalcule l'axe vertical de chaque graphique sur les points visibles (5 % de marge),
|
||||
# en gardant la ligne de seuil visible. Double-clic : retour à la vue complète.
|
||||
# seuil compris (c'est une courbe). Double-clic : retour à la vue complète.
|
||||
AUTOSCALE_Y_JS = """
|
||||
const gd = document.getElementById('{plot_id}');
|
||||
const name = (t, a) => a + 'axis' + (t[a + 'axis'] || a).slice(1);
|
||||
@@ -24,7 +24,7 @@ gd.on('plotly_relayout', ev => {
|
||||
gd.data.forEach(t => { upd[name(t, 'y') + '.autorange'] = true; });
|
||||
return Plotly.relayout(gd, upd);
|
||||
}
|
||||
const box = {yaxis: [__SEUIL__, __SEUIL__]};
|
||||
const box = {};
|
||||
gd.data.forEach((t, i) => {
|
||||
if (t.visible === 'legendonly' || t.visible === false) return;
|
||||
const xa = gd._fullLayout[name(t, 'x')];
|
||||
@@ -43,7 +43,7 @@ gd.on('plotly_relayout', ev => {
|
||||
}
|
||||
Plotly.relayout(gd, upd);
|
||||
});
|
||||
""".replace("__SEUIL__", str(ec.THRESHOLD_V))
|
||||
"""
|
||||
|
||||
|
||||
def gaps(v):
|
||||
@@ -60,50 +60,49 @@ def gaps(v):
|
||||
return out
|
||||
|
||||
|
||||
def figure(station, series, result, per):
|
||||
"""Haut : l'analyse, courbes superposées. Dessous : une série temporelle par graphique (échelles propres)."""
|
||||
def figure(station, series, results):
|
||||
"""Haut : une analyse par graphique, courbes superposées. Dessous : une série temporelle par graphique."""
|
||||
metrics = ["BusVoltage"] + sorted(m for m in series if m != "BusVoltage")
|
||||
fig = make_subplots(rows=1 + len(metrics), cols=1, shared_xaxes=True, vertical_spacing=0.02,
|
||||
row_heights=[1.5] + [1] * len(metrics),
|
||||
specs=[[{"secondary_y": True}]] + [[{}]] * len(metrics),
|
||||
subplot_titles=[f"Analyse {ec.RULE['id']}"] + metrics)
|
||||
n = len(results)
|
||||
fig = make_subplots(rows=n + len(metrics), cols=1, shared_xaxes=True, vertical_spacing=0.03,
|
||||
row_heights=[1.5] * n + [1] * len(metrics),
|
||||
subplot_titles=[f"Analyse {r['analysis']}" for r in results] + metrics)
|
||||
|
||||
analyse = dict(legendgroup="analyse", legendgrouptitle_text="Analyse")
|
||||
pts = result["points"]
|
||||
x = [p["t"] for p in pts]
|
||||
ref = [p["facts"].get("ref_v") for p in pts]
|
||||
hover = [f"anomalie={p['anomaly']}<br>" + "<br>".join(f"{k}={val}" for k, val in p["facts"].items())
|
||||
for p in pts]
|
||||
fig.add_scatter(x=x, y=[p["value"] for p in pts], name="écart", text=hover,
|
||||
hovertemplate="%{y:.3f} V<br>%{text}", line=dict(color="black"), row=1, col=1, **analyse)
|
||||
fig.add_scatter(x=x, y=[p["facts"].get("ma_v") for p in pts], name="moyenne 7 j",
|
||||
line=dict(color="royalblue"), row=1, col=1, secondary_y=True, **analyse)
|
||||
fig.add_scatter(x=x, y=ref, name="référence (max 30 j)", line=dict(color="green", dash="dot"),
|
||||
row=1, col=1, secondary_y=True, **analyse)
|
||||
fig.add_scatter(x=x, y=[None if r is None else r + ec.THRESHOLD_V for r in ref], name="seuil",
|
||||
line=dict(color="red", dash="dash"), row=1, col=1, secondary_y=True, **analyse)
|
||||
fig.add_hline(y=ec.THRESHOLD_V, line=dict(color="black", dash="dash"), row=1, col=1)
|
||||
for p in per:
|
||||
fig.add_vrect(x0=p["start"], x1=p["end"] or x[-1], fillcolor="red", opacity=0.15,
|
||||
line_width=0, row=1, col=1)
|
||||
fig.update_yaxes(title_text="écart [V]", row=1, col=1, secondary_y=False)
|
||||
fig.update_yaxes(title_text="BusVoltage moyennée [V]", row=1, col=1, secondary_y=True)
|
||||
for row, result in enumerate(results, start=1):
|
||||
analyse = dict(legendgroup=result["analysis"], legendgrouptitle_text=f"Analyse {result['analysis']}")
|
||||
thr = result["rule"]["threshold_v"]
|
||||
pts = result["points"]
|
||||
x = [p["t"] for p in pts]
|
||||
ref = [p["facts"].get("ref_v") for p in pts]
|
||||
hover = [f"écart={p['value'] if p['value'] is None else round(p['value'], 3)}<br>anomalie={p['anomaly']}<br>"
|
||||
+ "<br>".join(f"{k}={val}" for k, val in p["facts"].items()) for p in pts]
|
||||
fig.add_scatter(x=x, y=[p["facts"].get("ma_v") for p in pts], name="moyenne 7 j", text=hover,
|
||||
hovertemplate="%{y:.3f} V<br>%{text}", line=dict(color="royalblue"), row=row, col=1,
|
||||
**analyse)
|
||||
fig.add_scatter(x=x, y=[None if r is None else r + thr for r in ref], name=f"seuil (max 30 j {thr:+} V)",
|
||||
line=dict(color="red", dash="dash"), row=row, col=1, **analyse)
|
||||
for p in ec.periods(pts):
|
||||
fig.add_vrect(x0=p["start"], x1=p["end"] or x[-1], fillcolor="red", opacity=0.15,
|
||||
line_width=0, row=row, col=1)
|
||||
fig.update_yaxes(title_text="BusVoltage moyennée [V]", row=row, col=1)
|
||||
|
||||
mesures = dict(legendgroup="mesures", legendgrouptitle_text="Mesures")
|
||||
for row, m in enumerate(metrics, start=2):
|
||||
for row, m in enumerate(metrics, start=n + 1):
|
||||
s = series[m]
|
||||
fig.add_scatter(x=sorted(s), y=[s[t] for t in sorted(s)], name=m, line=dict(width=1),
|
||||
row=row, col=1, **mesures)
|
||||
for a, b in gaps(series["BusVoltage"]):
|
||||
fig.add_vrect(x0=a, x1=b, fillcolor="gray", opacity=0.3, line_width=0, row=2, col=1)
|
||||
fig.add_vrect(x0=a, x1=b, fillcolor="gray", opacity=0.3, line_width=0, row=n + 1, col=1)
|
||||
fig.update_xaxes(showticklabels=True) # dates sous chaque graphique, pas seulement le dernier
|
||||
fig.update_yaxes(fixedrange=True) # zoom horizontal seulement : l'ordonnée est recalée par AUTOSCALE_Y_JS
|
||||
fig.update_layout(title=f"{station} : analyse {ec.RULE['id']}", height=300 * (1 + len(metrics)),
|
||||
fig.update_layout(title=f"{station} : analyses " + ", ".join(r["analysis"] for r in results),
|
||||
height=300 * (n + len(metrics)),
|
||||
legend=dict(groupclick="toggleitem"))
|
||||
return fig
|
||||
|
||||
|
||||
def main(argv=None):
|
||||
ap = argparse.ArgumentParser(description="Graphique HTML de l'analyse MA7D_DROP")
|
||||
ap = argparse.ArgumentParser(description="Graphique HTML des analyses énergétiques")
|
||||
ap.add_argument("paths", nargs="+", help="fichiers CSV et/ou dossiers")
|
||||
ap.add_argument("--out", default="out", help="dossier de sortie (défaut : out/)")
|
||||
a = ap.parse_args(argv)
|
||||
@@ -113,9 +112,8 @@ def main(argv=None):
|
||||
if "BusVoltage" not in series:
|
||||
print(f"{station} : ignorée, pas de BusVoltage")
|
||||
continue
|
||||
result = ec.run(series)
|
||||
path = os.path.join(a.out, f"{station}_energy.html")
|
||||
figure(station, series, result, ec.periods(result["points"])).write_html(
|
||||
figure(station, series, [ec.run(series), ec.run_midnight(series)]).write_html(
|
||||
path, include_plotlyjs="cdn", post_script=AUTOSCALE_Y_JS, config={"scrollZoom": True})
|
||||
print(path)
|
||||
paths.append(path)
|
||||
|
||||
Reference in new issue
Block a user