diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_differential.ml | 44 |
1 files changed, 39 insertions, 5 deletions
diff --git a/test/test_differential.ml b/test/test_differential.ml index cf5b95f..4d6aab0 100644 --- a/test/test_differential.ml +++ b/test/test_differential.ml @@ -88,11 +88,25 @@ exact, narrow field-diff SET, not "anything goes"). 13 January (register ยง6's long-open "Baptism of the Lord" item) is - EMPIRICALLY CONFIRMED FIXED, not allow-listed: colitur's slug/rank/colour - for 13 January already equal lectio's exactly, in all 46 years (the - sanctoral wiring landed in Task 11's "13 Jan now resolves to the Baptism - of the Lord" review note). The only residual difference there is season - (covered by Layer C's C1, the Jan 6-13 boundary) -- see the report. *) + EMPIRICALLY CONFIRMED FIXED, not separately allow-listed, ONLY in the 39 + of 46 years it is NOT a Sunday: colitur's slug/rank/colour equal + lectio's fixture exactly there (the sanctoral wiring landed in Task 11's + "13 Jan now resolves to the Baptism of the Lord" review note), and the + only residual difference on those 39 rows is season (covered by Layer + C's C1, the Jan 6-13 boundary). + + CORRECTED (ef-rebootstrap fix round 1, F2): this note previously said + "in all 46 years" and "the only residual difference is season" without + qualification -- WRONG once `commemoration-of-the-baptism-of-the-lord` + became `subject = Lord` (ef-rebootstrap): on the remaining 7 years (13 + January itself falls on a Sunday: 2008, 2013, 2019, 2030, 2036, 2041, + 2047), RG16(a) now makes colitur observe the Baptism itself where it + used to observe the Sunday -- the OBSERVED SLUG differs from lectio's + fixture too, not merely colour. Allow-listed separately as C13 + (`data/ef/expected-divergences.sexp`), whose own note has the full + account, including a live cross-check against lectio's CURRENT engine + (not the committed fixture, which predates lectio's own equivalent + fix) -- see the report. *) module Cal = Colitur_kernel.Calendar module Layer = Colitur_kernel.Layer @@ -430,12 +444,32 @@ let fixed_iii_class_reclassified_slugs = "john-damascene"; "john-of-capistrano"; "john-of-god"; "patrick"; "sts-felicitas-perpetua"; "thomas-aquinas"; "vincent-ferrer" ] +(* C13 (ef-rebootstrap fix round 1, F2): the 7 years 13 January falls on a + Sunday within 2005-2050 -- independently re-derived, not copied from a + prior figure: `date -d <year>-01-13 +%A` = Sunday in exactly these 7 + (2005-2050 is 46 years; 13 January cycles through the 7 weekdays with + the usual leap-year irregularity, landing on Sunday this many times). + A LITERAL list, not a predicate on [jan_6_13_slug] (which already, and + correctly, admits this exact slug for the other 39 non-Sunday years in + the window) -- checked BEFORE C1 below in the if/elif chain specifically + so it intercepts these 7 dates first; leaving C1's own guard as it was + would have let [jan_6_13_slug]'s pre-existing admission of this slug + silently absorb them into C1's count instead, the exact gap fix round 1 + found: C1's own [expected_rows] is a bare row COUNT, blind to WHICH of + two different diff shapes produced it, so a real shape change here + (colitur's own OBSERVED CELEBRATION on these 7 dates, not merely its + colour) could move underneath the pin without the pin ever moving. *) +let jan13_lord_sunday_dates_2005_2050 = + [ "2008-01-13"; "2013-01-13"; "2019-01-13"; "2030-01-13"; "2036-01-13"; "2041-01-13"; "2047-01-13" ] + (* [layer_c_reason l c diffs] returns the [data/ef/expected-divergences.sexp] [id] this row-pair's remaining (post Layer A/B) diff set belongs to, or [None] if nothing here explains it (a genuine, uncovered failure). *) let layer_c_reason (l : row) (c : row) diffs = let m = month_of_date l.date and d = day_of_date l.date in if diffs = [] then None + else if List.mem l.date jan13_lord_sunday_dates_2005_2050 && diffs = [ Season; Slug_f; Colour_f ] then + Some "C13" else if m = 1 && d >= 6 && d <= 13 && subset diffs [ Season; Colour_f; Slug_f ] |