Grade visibility, add the periodic effect and the slow drift to the morning journal (D-056)
- Visibility: v0 kept after a measured trial of a simpler version (archived); two levels, Reduced and No visibility - Thermal: a 24-hour sinusoid confirms the daily wave, split into thermal expansion and contraction events - Jumps tested from the first measurement; turbulence never kept over a shift to check (CLARIDEN) - Data gaps say whether camera images exist; Displacements trends become slow drift events - Threshold registry moved to vues-deplacements/contexte/seuils-du-journal.md; plan points 11 to 17, 38 and 41 validated Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
4ac95ae1ca
commit
86547f089b
16 files changed
+475
-143
No files matched your search
@@ -3,7 +3,9 @@
|
||||
|
||||
Chaque épisode reçoit sa catégorie d'après son détecteur et son label. Un saut revenu à la normale qui chevauche une
|
||||
perte de visibilité, un passage ou une turbulence y est absorbé ; un saut qui dure ou trop récent pour savoir ne l'est
|
||||
jamais. Deux événements de même catégorie à moins d'une heure n'en font qu'un. Chaque événement reçoit sa phrase
|
||||
jamais ; une turbulence qui chevauche un saut à vérifier n'est pas gardée (un vrai mouvement agite aussi les courbes :
|
||||
le matin du mouvement de CLARIDEN, point 14 du plan). Deux événements de même catégorie à moins d'une heure n'en font
|
||||
qu'un. Chaque événement reçoit sa phrase
|
||||
(point 9, validées le 2026-10-24) : ce qui s'est passé et quoi en faire, sans conditionnel ; la cause n'est dite que si la
|
||||
catégorie l'établit, sinon les images la montrent. Pas de fonction detect : le chargeur ne prend pas ce fichier pour un
|
||||
détecteur.
|
||||
@@ -21,21 +23,27 @@ from donnees import charger # noqa: E402
|
||||
# ignore : zone grisée (None : comme le dit le détecteur, la turbulence n'est grisée que forte) ; process : bouton
|
||||
# Images, rien, ou Images et lien vers Diagnosis. L'ordre est celui des lignes de la frise.
|
||||
CATEGORIES = {
|
||||
"visibilite_perdue": {"label": "Loss of visibility", "ignore": True, "process": "images"},
|
||||
"visibilite_reduite": {"label": "Reduced visibility", "ignore": False, "process": "images"}, # en retrait (point 38)
|
||||
"visibilite_nulle": {"label": "No visibility", "ignore": True, "process": "images"},
|
||||
"passage": {"label": "Passing obstacle", "ignore": True, "process": "images"},
|
||||
"cible_masquee": {"label": "Target hidden", "ignore": True, "process": "images"},
|
||||
"turbulence": {"label": "Heat haze", "ignore": None, "process": "aucun"},
|
||||
"cycle_thermique": {"label": "Daily thermal cycle", "ignore": False, "process": "aucun"},
|
||||
"dilatation_thermique": {"label": "Thermal expansion", "ignore": False, "process": "aucun"}, # effet périodique
|
||||
"contraction_thermique": {"label": "Thermal contraction", "ignore": False, "process": "aucun"}, # (point 41)
|
||||
"trou": {"label": "No data", "ignore": False, "process": "aucun"},
|
||||
"saut_bref": {"label": "Brief jump", "ignore": True, "process": "images"},
|
||||
"a_verifier": {"label": "Shift to check", "ignore": False, "process": "verifier"},
|
||||
}
|
||||
# (détecteur, label de l'épisode) -> catégorie ; puis détecteur seul ; un détecteur inconnu garde son nom
|
||||
LABELS = {("visibilite", "Poor visibility"): "visibilite_perdue", ("visibilite", "Brief obstruction"): "passage",
|
||||
("visibilite", "Target obscured"): "cible_masquee", ("sauts", "Sudden jump, back to normal"): "saut_bref",
|
||||
("sauts", "Lasting shift"): "a_verifier", ("sauts", "Jump, not back yet"): "a_verifier"}
|
||||
KINDS = {"turbulence": "turbulence", "thermique": "cycle_thermique", "trous": "trou"}
|
||||
HOSTS = {"visibilite_perdue", "passage", "turbulence"} # ce qui absorbe un saut revenu à la normale (point 5)
|
||||
# (détecteur, label, niveau de l'épisode) -> catégorie ; puis détecteur seul ; un détecteur inconnu garde son nom
|
||||
LABELS = {("visibilite", "Poor visibility", "reduced"): "visibilite_reduite",
|
||||
("visibilite", "Poor visibility", "none"): "visibilite_nulle",
|
||||
("visibilite", "Brief obstruction", None): "passage", ("visibilite", "Target obscured", None): "cible_masquee",
|
||||
("sauts", "Sudden jump, back to normal", None): "saut_bref", ("sauts", "Lasting shift", None): "a_verifier",
|
||||
("sauts", "Jump, not back yet", None): "a_verifier",
|
||||
("thermique", "Thermal expansion", None): "dilatation_thermique",
|
||||
("thermique", "Thermal contraction", None): "contraction_thermique"}
|
||||
KINDS = {"turbulence": "turbulence", "trous": "trou"}
|
||||
HOSTS = {"visibilite_reduite", "visibilite_nulle", "passage", "turbulence"} # absorbent un saut revenu (point 5)
|
||||
MERGE = timedelta(hours=1) # même catégorie à moins d'une heure : un seul événement (point 5, 2026-10-24)
|
||||
|
||||
|
||||
@@ -59,7 +67,7 @@ def detecteurs():
|
||||
|
||||
|
||||
def categorie(ep):
|
||||
return LABELS.get((ep["kind"], ep["label"])) or KINDS.get(ep["kind"]) or ep["kind"]
|
||||
return LABELS.get((ep["kind"], ep["label"], ep.get("level"))) or KINDS.get(ep["kind"]) or ep["kind"]
|
||||
|
||||
|
||||
def overlap(a, b):
|
||||
@@ -77,16 +85,18 @@ def phrase(cat, groupe, sensors, references):
|
||||
sauts = [e for e in groupe[1:] if categorie(e) == "saut_bref"]
|
||||
jumped = len({s for e in sauts for s in e["sensors"]})
|
||||
lasting = len({s for e in groupe if categorie(e) == "a_verifier" for s in e.get("lasting", [])})
|
||||
refs = ", including the reference targets" if references & set(sensors) else ""
|
||||
text = {
|
||||
"visibilite_perdue": f"The camera could not see {targets(n)} clearly"
|
||||
f"{', including the reference targets' if references & set(sensors) else ''}. "
|
||||
"The curves in this period are not reliable: ignore them.",
|
||||
"visibilite_nulle": f"The camera could not see {targets(n)} clearly{refs}. "
|
||||
"The curves in this period are not reliable: ignore them.",
|
||||
"visibilite_reduite": f"The camera saw {targets(n)} less clearly than usual{refs}. "
|
||||
"The data in this period are less precise: use them with care.",
|
||||
"passage": f"Something passed in front of {targets(n)} for a single measurement. Ignore this point on the curves.",
|
||||
"cible_masquee": f"{', '.join(sensors)} {'was' if one else 'were'} hidden several times while the targets around "
|
||||
f"{'it' if one else 'them'} stayed clear. Ignore {'its curve' if one else 'their curves'} in this period.",
|
||||
"turbulence": "Warm air made the readings shake. The small fast wiggles are not movement.",
|
||||
"cycle_thermique": "The structure and the camera warm up during the day and cool down at night. "
|
||||
"This wave comes back every day: nothing to do.",
|
||||
"dilatation_thermique": "The structure expands in the day heat. This daily wave is normal: nothing to do.",
|
||||
"contraction_thermique": "The structure contracts as it cools down. This daily wave is normal: nothing to do.",
|
||||
"saut_bref": f"{targets(n).capitalize()} jumped and came back. This is not a movement: ignore it.",
|
||||
"a_verifier": (f"{targets(n).capitalize()} shifted and {'has' if one else 'have'} not come back yet." if not lasting
|
||||
else f"{targets(n).capitalize()} shifted and stayed shifted." if lasting == n
|
||||
@@ -104,7 +114,8 @@ def evenement(groupe, references):
|
||||
cat = categorie(groupe[0])
|
||||
c = CATEGORIES.get(cat, {"label": groupe[0]["label"], "ignore": None, "process": "aucun"})
|
||||
sensors = [] if any(not e["sensors"] for e in groupe) else list(dict.fromkeys(s for e in groupe for s in e["sensors"]))
|
||||
return {"start": min(e["start"] for e in groupe), "end": max(e["end"] for e in groupe), "category": cat,
|
||||
main = [e for e in groupe if categorie(e) == cat] # la durée est celle des épisodes principaux, pas des sauts absorbés
|
||||
return {"start": min(e["start"] for e in main), "end": max(e["end"] for e in main), "category": cat,
|
||||
"label": c["label"], "text": phrase(cat, groupe, sensors, references),
|
||||
"ignore": c["ignore"] if c["ignore"] is not None else any(e["ignore"] for e in groupe if categorie(e) == cat),
|
||||
"sensors": sensors, "process": c["process"], "episodes": groupe}
|
||||
@@ -114,6 +125,8 @@ def classer(episodes, references=frozenset()):
|
||||
"""Épisodes de tous les détecteurs -> événements triés par début (règles : docstring du module) ; references : les
|
||||
capteurs global_ref, pour la phrase."""
|
||||
eps = sorted(episodes, key=lambda e: e["start"])
|
||||
checks = [e for e in eps if categorie(e) == "a_verifier"] # un vrai mouvement n'est jamais pris pour de la turbulence
|
||||
eps = [e for e in eps if categorie(e) != "turbulence" or not any(overlap(e, c) for c in checks)]
|
||||
hosts = [e for e in eps if categorie(e) in HOSTS]
|
||||
host = {id(e): next((h for h in hosts if overlap(e, h)), None) for e in eps if categorie(e) == "saut_bref"}
|
||||
groupes = {id(e): [e] for e in eps if not host.get(id(e))}
|
||||
@@ -123,7 +136,8 @@ def classer(episodes, references=frozenset()):
|
||||
merged = []
|
||||
for g in groupes.values():
|
||||
prev = next((m for m in reversed(merged) if categorie(m[0]) == categorie(g[0])), None)
|
||||
if prev and datetime.fromisoformat(g[0]["start"]) - datetime.fromisoformat(max(e["end"] for e in prev)) < MERGE:
|
||||
end = max((e["end"] for e in prev if categorie(e) == categorie(g[0])), default=None) if prev else None
|
||||
if end and datetime.fromisoformat(g[0]["start"]) - datetime.fromisoformat(end) < MERGE:
|
||||
prev += g
|
||||
else:
|
||||
merged.append(g)
|
||||
|
||||
Reference in new issue
Block a user