Plot DAILY_BATTERY_TREND as the fourth analysis panel
One bar per day for the night-end voltage delta, coloured by trend (blue better, grey stable, red worse), with the 0.05 V dead band. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
005e006b2f
commit
e058a2e3e7
1 file changed
+34
-3
+34
-3
@@ -1,6 +1,6 @@
|
|||||||
"""Graphique HTML des analyses énergétiques, un panneau par analyse (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, docs/analyses/analyse_02.md, docs/analyses/analyse_03.md
|
Documentation : docs/analyses/analyse_01.md à analyse_04.md
|
||||||
"""
|
"""
|
||||||
import argparse
|
import argparse
|
||||||
import os
|
import os
|
||||||
@@ -9,6 +9,7 @@ from plotly.subplots import make_subplots
|
|||||||
|
|
||||||
import energy_check as ec
|
import energy_check as ec
|
||||||
import battery_state as bs
|
import battery_state as bs
|
||||||
|
import battery_trend as bt
|
||||||
|
|
||||||
# Plotly ne recale pas l'ordonnée sur la plage visible : après chaque zoom ou déplacement horizontal,
|
# 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),
|
# ce script recalcule l'axe vertical de chaque graphique sur les points visibles (5 % de marge),
|
||||||
@@ -94,6 +95,33 @@ def daily_state_panel(fig, result, row):
|
|||||||
fig.update_yaxes(title_text="BusVoltage [V]", row=row, col=1)
|
fig.update_yaxes(title_text="BusVoltage [V]", row=row, col=1)
|
||||||
|
|
||||||
|
|
||||||
|
# Tendances de DAILY_BATTERY_TREND : paire divergente bleu/rouge et gris neutre du skill dataviz
|
||||||
|
# (vert/rouge refusé par son validateur : deutéranopie, ΔE 5,9). Chaque tendance a aussi sa légende et son survol.
|
||||||
|
TREND_STYLE = {"BETTER": ("mieux", "#2a78d6"), "STABLE": ("stable", "#8c8c8c"), "WORSE": ("pire", "#d03b3b")}
|
||||||
|
|
||||||
|
|
||||||
|
def daily_trend_panel(fig, result, row):
|
||||||
|
"""Panneau DAILY_BATTERY_TREND : écart de fin de nuit J − J−1 en barres, couleur = tendance (fiche analyse_04)."""
|
||||||
|
group = dict(legendgroup=result["analysis"], legendgrouptitle_text=f"Analyse {result['analysis']}")
|
||||||
|
pts, db = result["points"], result["rule"]["night_end_deadband_v"]
|
||||||
|
x = [p["t"] for p in pts]
|
||||||
|
# Zone morte tracée comme une courbe (un point par jour, None entre +db et −db) : visible au zoom (D-013).
|
||||||
|
fig.add_scatter(x=x + [None] + x, y=[db] * len(x) + [None] + [-db] * len(x), name=f"zone morte ±{db} V",
|
||||||
|
mode="lines", hoverinfo="skip", line=dict(color="#52514e", dash="dash", width=1),
|
||||||
|
row=row, col=1, **group)
|
||||||
|
for trend, (label, color) in TREND_STYLE.items():
|
||||||
|
sel = [p for p in pts if p["facts"]["trend"] == trend and p["value"] is not None]
|
||||||
|
if not sel:
|
||||||
|
continue
|
||||||
|
hover = [f"{p['t']:%Y-%m-%d} : {label} (décidé par {p['facts']['decided_by']})<br>"
|
||||||
|
f"{p['facts']['state_prev']} → {p['facts']['state']}<br>"
|
||||||
|
+ "<br>".join(f"{k}={v}" for k, v in p["facts"].items() if k.startswith("delta")) for p in sel]
|
||||||
|
fig.add_bar(x=[p["t"] for p in sel], y=[p["value"] for p in sel], name=label, marker_color=color,
|
||||||
|
width=0.8 * 86_400_000, hovertext=hover, hovertemplate="%{hovertext}<extra></extra>",
|
||||||
|
row=row, col=1, **group)
|
||||||
|
fig.update_yaxes(title_text="Δ fin de nuit [V]", row=row, col=1)
|
||||||
|
|
||||||
|
|
||||||
def gaps(v):
|
def gaps(v):
|
||||||
"""Plages de créneaux sans BusVoltage : [(premier créneau vide, première valeur suivante)]."""
|
"""Plages de créneaux sans BusVoltage : [(premier créneau vide, première valeur suivante)]."""
|
||||||
out, start = [], None
|
out, start = [], None
|
||||||
@@ -120,6 +148,9 @@ def figure(station, series, results):
|
|||||||
if result["analysis"] == bs.RULE["id"]:
|
if result["analysis"] == bs.RULE["id"]:
|
||||||
daily_state_panel(fig, result, row)
|
daily_state_panel(fig, result, row)
|
||||||
continue
|
continue
|
||||||
|
if result["analysis"] == bt.RULE["id"]:
|
||||||
|
daily_trend_panel(fig, result, row)
|
||||||
|
continue
|
||||||
analyse = dict(legendgroup=result["analysis"], legendgrouptitle_text=f"Analyse {result['analysis']}")
|
analyse = dict(legendgroup=result["analysis"], legendgrouptitle_text=f"Analyse {result['analysis']}")
|
||||||
thr = result["rule"]["threshold_v"]
|
thr = result["rule"]["threshold_v"]
|
||||||
pts = result["points"]
|
pts = result["points"]
|
||||||
@@ -151,7 +182,7 @@ def figure(station, series, results):
|
|||||||
fig.update_yaxes(fixedrange=True) # zoom horizontal seulement : l'ordonnée est recalée par AUTOSCALE_Y_JS
|
fig.update_yaxes(fixedrange=True) # zoom horizontal seulement : l'ordonnée est recalée par AUTOSCALE_Y_JS
|
||||||
fig.update_layout(title=f"{station} : analyses " + ", ".join(r["analysis"] for r in results),
|
fig.update_layout(title=f"{station} : analyses " + ", ".join(r["analysis"] for r in results),
|
||||||
height=300 * (n + len(metrics)),
|
height=300 * (n + len(metrics)),
|
||||||
legend=dict(groupclick="toggleitem"))
|
barmode="overlay", legend=dict(groupclick="toggleitem"))
|
||||||
return fig
|
return fig
|
||||||
|
|
||||||
|
|
||||||
@@ -167,7 +198,7 @@ def main(argv=None):
|
|||||||
print(f"{station} : ignorée, pas de BusVoltage")
|
print(f"{station} : ignorée, pas de BusVoltage")
|
||||||
continue
|
continue
|
||||||
path = os.path.join(a.out, f"{station}_energy.html")
|
path = os.path.join(a.out, f"{station}_energy.html")
|
||||||
figure(station, series, [ec.run(series), ec.run_midnight(series), bs.run(series)]).write_html(
|
figure(station, series, [ec.run(series), ec.run_midnight(series), bs.run(series), bt.run(series)]).write_html(
|
||||||
path, include_plotlyjs="cdn", post_script=AUTOSCALE_Y_JS, config={"scrollZoom": True})
|
path, include_plotlyjs="cdn", post_script=AUTOSCALE_Y_JS, config={"scrollZoom": True})
|
||||||
print(path)
|
print(path)
|
||||||
paths.append(path)
|
paths.append(path)
|
||||||
|
|||||||
Reference in new issue
Block a user