diff --git a/tools/import/extract.py b/tools/import/extract.py index ba5e8d5..d71251a 100644 --- a/tools/import/extract.py +++ b/tools/import/extract.py @@ -502,6 +502,52 @@ def _geno_key(genodict): return "|".join(f"{locus}:{','.join(sorted(m[locus]))}" for locus in sorted(m)) +# --- "presence wins" merge rule (Julian) ------------------------------------- +# When two source variants of the SAME animal differ ONLY by a token PRESENT in one and +# ABSENT in the other — a whole locus (e.g. spsp recorded in one chart, omitted in another) +# or a modifier on the same base allele (e^f vs e, i.e. the [f] marker) — keep the present +# token; that is NOT a conflict. A genuine VALUE contradiction (different filled alleles: +# E vs e, D vs d, c^h vs c^chm) OR unknown-vs-filled (D- vs DD, the '?' second allele) STILL +# quarantines for human decision. (Markers/flags WP/DP/WFNZ/hörend are already tags/flags, +# never part of the genotype, so they never reach here.) +def _split_allele(a): + return tuple(a.split("^", 1)) if "^" in a else (a, "") + + +def _alleles_compatible(a, b): + if a == b: + return True + if a == "?" or b == "?": + return False # unknown vs filled = contradiction (D- vs DD) + (ba, ma), (bb, mb) = _split_allele(a), _split_allele(b) + if ba != bb: + return False # different base allele = real value diff (E vs e) + return ma == "" or mb == "" # same base, modifier present-vs-absent -> presence wins + + +def _pair_compatible(p, q): + if len(p) != 2 or len(q) != 2: + return p == q + return ((_alleles_compatible(p[0], q[0]) and _alleles_compatible(p[1], q[1])) or + (_alleles_compatible(p[0], q[1]) and _alleles_compatible(p[1], q[0]))) + + +def _genotype_conflict(mapped_list): + """True only if two variants GENUINELY contradict at a shared locus. A locus present in + one variant and absent in another is fine (presence wins); so is a modifier present-vs- + absent on the same base allele. Replaces the old `len(distinct geno keys) > 1` test.""" + loci = set() + for m in mapped_list: + loci.update(m.keys()) + for locus in loci: + pairs = [m[locus] for m in mapped_list if locus in m] + for i in range(len(pairs)): + for j in range(i + 1, len(pairs)): + if not _pair_compatible(pairs[i], pairs[j]): + return True + return False + + def dedup(animals): """Merge by normalise(call-name)+DOB, with the canonical Zucht as DISCRIMINATOR (Julian: same name+DOB+Zucht = same animal; different Zucht = @@ -552,6 +598,7 @@ def dedup(animals): parent_refs = list(base["parentRefs"]) genos = set() geno_keys = set() # GEN-3b: conflict on NORMALIZED genotype (Uw==G) not raw text + mapped_variants = [] # mapped8locus per variant — for the 'presence wins' conflict test farb = set() deaths = set() deaf_seen = set() @@ -567,6 +614,7 @@ def dedup(animals): if a["genotype"]["mapped8locus"]: genos.add(a["genotype"]["rawGenotype"]) geno_keys.add(_geno_key(a["genotype"])) + mapped_variants.append(a["genotype"]["mapped8locus"]) if a["farbschlag"]: farb.add(a["farbschlag"]) if a["death"]: @@ -603,8 +651,9 @@ def dedup(animals): "conflict": False, } merged.append(out) - # conflict: same animal, disagreeing NORMALIZED genotype (Uw==G) or farbschlag or death - if len(geno_keys) > 1 or len(farb) > 1 or len(deaths) > 1: + # conflict: same animal, GENUINELY disagreeing genotype (presence-vs-absence is NOT a + # conflict — Julian's 'presence wins') or >1 distinct farbschlag or >1 distinct death. + if _genotype_conflict(mapped_variants) or len(farb) > 1 or len(deaths) > 1: out["conflict"] = True conflicts.append({ "id": out["id"], "name": base["name"], "dob": out["dob"], diff --git a/tools/import/output/review-report.md b/tools/import/output/review-report.md index 167b53a..bda11ff 100644 --- a/tools/import/output/review-report.md +++ b/tools/import/output/review-report.md @@ -8,7 +8,7 @@ _Automatisch erzeugt von `tools/import/extract.py` — **noch nichts in die Date - Nach Zusammenführung (eindeutige Tiere): **622** - davon mit Geburtsdatum: 327 - in mehreren Dateien gefunden (Dubletten zusammengeführt): 158 -- Konflikte zur Klärung: **19** +- Konflikte zur Klärung: **15** - Mehrdeutige / unvollständige Einträge (ohne Name+Datum): **310** - Fotos zugeordnet: **137** - Würfe aus der Wurfchronik: **752** @@ -26,7 +26,6 @@ Gleiches Tier (Name+Datum), aber widersprüchliche Angaben in verschiedenen Date | Tier | Geburtsdatum | abweichende Genotypen | abweichende Farbschläge | Sterbedaten | Dateien | |---|---|---|---|---|---| | Ella | 10.06.2019 | Aa C D- ee[f] GG P- spsp // Aa Cc[chm] D- ee[f] UwUw P- spsp | Algierfuchsschimmel, hell | 03.02.2023 | Stammbaum von Akio Kids, Stammbaum von CP-Fuchs, CP-Sa Sp von Unity, Stammbaum von Valentino Firehearts Kids | -| Louis von den Kleinen Chaoten | 15.07.2017 | Aa Cc[] D- Ee Gg P- spsp // Aa Cc[chm] D- Ee Uwuw[d] P- spsp | — | 01.07.2020 | Stammbaum von Akio Kids, Stammbaum von CP-Fuchs, CP-Sa Sp von Unity | | Zuleika von den Kleinen Chaoten | 24.10.2015 | aa c[chm]c[h] D- E G P- spsp // aa c[chm]c[h] D- Ee Gg P- spsp // aa c[chm]c[h] DD Ee Gg P- spsp | — | 24.02.2019 | Stammbaum von Akio Kids, Stammbaum von CP-Fuchs, CP-Sa Sp von Unity, Stammbaum von Valentino Firehearts Kids | | Vestra von den Schlossmäusen | 08.02.2019 | Aa Cc[chm] D- EE GG PP Spsp [WP] // Aa Cc[chm] DD EE GG PP Spsp [WP] | — | 26.05.2023 | Stammbaum von Akio Kids, Stammbaum von CP-Fuchs, CP-Sa Sp von Unity, Stammbaum von Fire Kids, Stammbaum von Valentino Firehearts Kids | | Flint von den Kleinen Chaoten | 23.12.2017 | aa Cc[chm] D- ee Gg P- spsp | — | 10.05.2021 // 10.05.2022 | Stammbaum von Akio Kids, Stammbaum von CP-Fuchs, CP-Sa Sp von Unity | @@ -34,12 +33,9 @@ Gleiches Tier (Name+Datum), aber widersprüchliche Angaben in verschiedenen Date | Milka of LennyLengo | 09.12.2018 | aa C- dd E- Gg P- Spsp // aa Cc[h] dd EE Gg P- Spsp | — | 22.12.2021 | Stammbaum von Alberto Kids, Stammbaum von Stella Kids | | Silvain von den Kleinen Chaoten | 27.03.2022 | aa c[chm]c[chm] Dd Ee[-] Gg P- Spsp // aa c[chm]c[chm] Dd ee[-] Gg Pp Spsp | — | 31.12.2024 | Stammbaum von Alberto Kids, Stammbaum von CP-Fuchs, CP-Sa Sp von Unity | | Enya von den Kleinen Chaoten | 01.11.2017 | Aa c[chm]c[chm] D- ee[-] G- P- spsp // Aa c[chm]c[chm] D- ee[-] Uwuw[d] P- spsp | — | — | Stammbaum von Alberto Kids, Stammbaum von Fire Kids, Stammbaum von Kohlief, Goldfuchsef Sp von Chrissi, Stammbaum von Stella Kids | -| Little Hero of Black Forest | 22.02.2018 | AA CC DD EE GG PP [WFNZ] // AA CC DD EE GG PP spsp [WFNZ] | — | 18.06.2021 | Stammbaum von Alberto Kids, Stammbaum von CP-Fuchs, CP-Sa Sp von Unity, Stammbaum von Fire Kids, Stammbaum von Kohlief, Goldfuchsef Sp von Chrissi, Stammbaum von Stella Kids, Stammbaum von Valentino Firehearts Kids | | Molly of Black Forest | 13.09.2021 | /+, Aa Cc[chm] D- Ee gg P- spsp // Aa Cc[chm] Dd Ee gg Pp spsp | — | 03.05.2021 | Stammbaum von Alberto Kids, Stammbaum von CP-Fuchs, CP-Sa Sp von Unity | | Little Runner's Big Ben | 03.02.2020 | Aa Cc[chm] DD Ee Gg PP Spsp // Aa Cc[chm] DD Ee Gg Pp Spsp | — | 14.10.2023 | Stammbaum von CP-Fuchs, CP-Sa Sp von Unity, Stammbaum von Fire Kids, Stammbaum von Goldfuchs Sp (Pikachu) Kids, Stammbaum von Kohlief, Goldfuchsef Sp von Chrissi, Stammbaum von Valentino Firehearts Kids, Stammbaum von Watarus Kids | -| Daja of Little Rose | 16.05.2021 | aa chmchm D- EE Gg P- // aa chmchm D- EE Gg P- spsp | — | — | Stammbaum von CP-Fuchs, CP-Sa Sp von Unity, Stammbaum von Fire Kids, Stammbaum von Valentino Firehearts Kids | | Vance Jr. von den Kleinen Chaoten | 10.04.2022 | aa Cc[hm] Dd Ee gg P- Spsp // aa Cc[hm] Dd Ee gg P- spsp | Kohlfuchs, hell | — | Stammbaum von Fire Kids, Stammbaum von Stella Kids | -| Ichika von den Kleinen Chaoten | 19.04.2020 | aa CC D- ee Gg pp spsp // aa CC D- ee[f] Gg pp spsp | — | 27.11.2023 | Stammbaum von Goldfuchs Sp (Pikachu) Kids, Stammbaum von Watarus Kids | | Victoria Welby gen. Welby v.d. Kleinen Chaoten | 16.01.2023 | Aa CC D- Ee[f] Gg pp Spsp [DP] // Aa CC D- ee[f] Gg pp Spsp [DP] | Goldfuchsschimmel Punktschecke DP | 17.02.2026 | Stammbaum von Goldfuchs Sp (Pikachu) Kids, Stammbaum von Kohlief, Goldfuchsef Sp von Chrissi, Stammbaum von Watarus Kids | | Zac gen. Action von den Kleinen Chaoten | 25.12.2020 | aa C- D- Ee G- Pp Spsp [DP] // aa CC D- Ee G- Pp Spsp [DP] | — | 31.01.2025 | Stammbaum von Goldfuchs Sp (Pikachu) Kids, Stammbaum von Kohlief, Goldfuchsef Sp von Chrissi, Stammbaum von Watarus Kids | | Hanami von den Kleinen Chaoten | 10.09.2015 | aa Cc[chm] D- Ee gg P- spsp | — | 12.12.2019 // 14.01.2020 | Stammbaum von Kentucky, Stammbaum von Stella Kids | diff --git a/tools/import/test_extract.py b/tools/import/test_extract.py index 8caaf28..2e5c9c0 100644 --- a/tools/import/test_extract.py +++ b/tools/import/test_extract.py @@ -104,6 +104,23 @@ check("missing decisions file tolerated (returns 0)", try: os.remove(dec_path) except OSError: pass +# --- "presence wins" conflict rule (Julian) --- +# present-vs-absent (whole locus or [f] modifier) is NOT a conflict; differing filled values are. +check("spsp present vs locus absent -> no conflict", + not e._genotype_conflict([{"Sp": ["sp", "sp"]}, {}])) +check("ee[f] vs ee ([f] modifier present/absent) -> no conflict", + not e._genotype_conflict([{"E": ["e", "e^f"]}, {"E": ["e", "e"]}])) +check("DD vs D- (unknown vs filled) -> conflict", + e._genotype_conflict([{"D": ["D", "D"]}, {"D": ["D", "?"]}])) +check("Ee vs ee (different base allele) -> conflict", + e._genotype_conflict([{"E": ["E", "e"]}, {"E": ["e", "e"]}])) +check("C- vs Cc[h] -> conflict", + e._genotype_conflict([{"C": ["C", "?"]}, {"C": ["C", "c^h"]}])) +check("c[h] vs c[chm] (different modifiers) -> conflict", + not e._alleles_compatible("c^h", "c^chm")) +check("identical genotypes -> no conflict", + not e._genotype_conflict([{"A": ["A", "a"]}, {"A": ["A", "a"]}])) + # --- name-bleed guard (a parent name is not a Farbschlag) --- check("v.d. name rejected", e.looks_like_animal_name("Tennessee von den Kleinen Chaoten")) check("gen.+v.d. name rejected", e.looks_like_animal_name("Victoria Welby gen. Welby v.d. Kleinen Chaoten"))