colregs 0.3.0 → 0.3.2

package/docs/part-b-invariants.md

@@ -34,9 +34,9 @@ suffix naming what distinguishes them.
 - Insertion appends a suffix and never renumbers; a suffix names something and
   is not an ordinal (`REQ-INV-2`).
 - The paragraph is the unit (ADR 0001): an invariant reading several takes the
-  id of the one stating its operative content, as entry `14b` does.
+  id of the one stating its operative content, as entry `rule:14b` does.
 - `INV-` is a type prefix on a citation-derived name — the one departure from
-  `docs/identifiers.md`, because `13a` is already an entry id. Jurisdiction is a
+  `docs/identifiers.md`, because `rule:13a` is already an entry id. Jurisdiction is a
   dimension (`REQ-SCOPE-2`, `Q-8`); only `intl` is populated.
 
 ---
@@ -46,7 +46,7 @@ suffix naming what distinguishes them.
 A **situation** is the record of `REQ-CAT-4` and `REQ-CAT-6`: two per-vessel
 fact records, a kinematic state each, relative geometry, history and the
 environment, addressed as `<subject>:<class>:<key>`, subject in
-`own`/`other`/`pair`. A **trace** is a sequence of situations for one ordered
+`self`/`other`/`pair`. A **trace** is a sequence of situations for one ordered
 pair, sampled at *t*₀ < *t*₁ < … . Each invariant is a property of one state
 ("at every state") or relates two or more ("at every state after", "from the
 first state at which") — the whole content of §4.1's `conduct` category, and
@@ -74,18 +74,18 @@ latches the result against the geometry that follows.
 `13(b)` under 11 · classification · single-state · `✎`
 
 **Invariant.** At any state at which the two vessels are in sight of one
-another and both underway, own is deemed to be overtaking other exactly when
-own is coming up with other and own bears, from other, more than 22.5° abaft
+another and both underway, self is deemed to be overtaking other exactly when
+self is coming up with other and self bears, from other, more than 22.5° abaft
 other's beam — `other:geo:rel_bearing_deg` strictly inside (112.5°, 247.5°).
 The sector is open at both ends (*more than* 22.5°: a vessel on the edge is
 not overtaking); its edges are the forward edges of Rule 21(c)'s sternlight
 arc, which 13(b)'s second limb states in light terms.
 
 - **Undetermined term.** "Coming up with" is a speed comparison the model cannot
-  express (`Q-46`); `13b-overtaking` substitutes `pair:geo:tcpa_s > 0`, which
+  express (`Q-46`); `rule:13b` substitutes `pair:geo:tcpa_s > 0`, which
   admits a pair closing because the vessel ahead stopped. This states the rule.
 - **Not stated by 13(b).** Risk of collision: `Q-50`.
-- Entries: `13b-overtaking`, `13b-overtaken`;
+- Entries: `rule:13b`;
   `situation.constants.overtaking_sector_from_deg`/`_to_deg` (ink). Settled by
   P2.2's Alloy sector model: a partition, or a bearing that falls in both.
 
@@ -93,16 +93,18 @@ arc, which 13(b)'s second limb states in light terms.
 
 `13(b)` · classification, derived · single-state · `✎`
 
-**Invariant.** Where `INV-13b` holds of own with respect to other, the
+**Invariant.** Where `INV-13b` holds of self with respect to other, the
 encounter type of the pair is `overtaking` read from *either* subject: the
 vessel being overtaken is in an overtaking, not a crossing, though the
 overtaking vessel bears forward of her beam.
 
 - **Why separate.** A formalisation carrying encounter type per vessel
   classifies the overtaken side as a crossing, two types on one pair.
-- Entries: `13b-overtaking`, `13b-overtaken`, each other's `when` with subjects
-  swapped. Settled by P4.2 carrying the type on the pair and TLC finding no
-  state where the subjects disagree.
+- **2026-09-16.** The two-entry form this section recorded is reversed by
+  ADR 0015 as rewritten: 13(b) is one symmetric entry, the same sector object
+  read on either subject under `any_of`. The invariant is unchanged.
+- Entries: `rule:13b`. Settled by P4.2 carrying the type on the pair and TLC
+  finding no state where the subjects disagree.
 
 ### INV-13a — the overtaking vessel keeps out of the way
 
@@ -116,7 +118,7 @@ roles displace any role Rules 4–18 would otherwise assign to either vessel.
 well as Rules 14 and 15.
 
 - **Not stated by 13(a).** Risk of collision: `Q-50`.
-- Entries: `13a`, overriding all eleven Rule 18 and all three Rule 12 entries.
+- Entries: `rule:13a`, overriding all eleven Rule 18 and all three Rule 12 entries.
   Settled by P4.2's role assignment: the override is or is not needed to keep
   "never both give-way" true.
 
@@ -125,13 +127,13 @@ well as Rules 14 and 15.
 `13(d)` · classification · temporal, a state to every later state of the
 encounter · `✎`
 
-**Invariant.** Let *s* be the first state of an encounter at which own is
+**Invariant.** Let *s* be the first state of an encounter at which self is
 deemed to be overtaking other. At every state of that encounter after *s*,
-until own is finally past and clear, the encounter type of the pair is
+until self is finally past and clear, the encounter type of the pair is
 `overtaking` whatever the relative bearings then are; in particular it is not
 `crossing`, and the tests of Rules 14 and 15 do not apply to the pair.
 
-- **State remembered.** One directional boolean per subject per encounter (own
+- **State remembered.** One directional boolean per subject per encounter (self
   was, earlier in this encounter, the overtaking vessel), plus the time of *s*
   for a monitor that says when the duty attached; window *s* to finally past and
   clear. Reading only the current state is wrong in the direction the paragraph
@@ -142,8 +144,8 @@ until own is finally past and clear, the encounter type of the pair is
   model's is its segmentation, and no bearing or range is invented here.
 - **Readings in doubt.** Two: what arms the latch, `Q-51`; what it forbids,
   `Q-52`.
-- Entries: `13d`, reading `own`/`other:hist:was_overtaking` and no geometry; the
-  `was_overtaking: false` gates on `14b`, `15a-crossing`, `15a-give-way`
+- Entries: `rule:13d`, reading `self`/`other:hist:was_overtaking` and no geometry; the
+  `was_overtaking: false` gates on `rule:14b`, `rule:15a:crossing`, `rule:15a:keep_out_of_the_way`
   implement `Q-52`'s *broad* reading. Settled by `Q-51`, `Q-52`, then TLC on a
   three-state trace of an overtaking drawing out onto the bow.
 
@@ -151,15 +153,15 @@ until own is finally past and clear, the encounter type of the pair is
 
 `13(d)` second limb · precedence · temporal, as `INV-13d` · `✎`
 
-**Invariant.** With *s* as in `INV-13d`, at every state after *s* until own is
-finally past and clear, own holds `give-way` and other `stand-on`, whatever the
+**Invariant.** With *s* as in `INV-13d`, at every state after *s* until self is
+finally past and clear, self holds `give-way` and other `stand-on`, whatever the
 bearings. Separate from `INV-13d` because the two limbs come apart: a reading
 on which 13(d) forbids only the *crossing* reclassification still preserves
 the duty by its second clause, and a formalisation deriving role from encounter
 type alone cannot distinguish `Q-52`'s readings.
 
 - **State remembered.** As `INV-13d`.
-- Entries: `13a`'s `any_of` second limb, `own:hist:was_overtaking: true` — role
+- Entries: `rule:13a`'s `any_of` second limb, `self:hist:was_overtaking: true` — role
   asserted from the latch directly, keeping the limbs separable. Settled by
   `Q-52`.
 
@@ -174,7 +176,7 @@ type alone cannot distinguish `Q-52`'s readings.
 **Invariant.** At any state at which two power-driven vessels are in sight,
 both underway, with risk of collision, and neither latched under `INV-13d`, a
 head-on situation is deemed to exist exactly when each sees the other ahead or
-nearly ahead: `own:geo:rel_bearing_deg` and `other:geo:rel_bearing_deg` each
+nearly ahead: `self:geo:rel_bearing_deg` and `other:geo:rel_bearing_deg` each
 in [0°, 11.25°] ∪ [348.75°, 360°).
 
 - **Both bearings, not one.** 14(b)'s lights limb is a statement about the
@@ -186,7 +188,7 @@ in [0°, 11.25°] ∪ [348.75°, 360°).
   that way.
 - **Not formalised.** The night and day observation limbs are stated as the
   geometry they encode; a vessel that cannot see the lights has 14(c).
-- Entries: `14b`. Settled by `INV-13b`'s partition sweep plus a decision on the
+- Entries: `rule:14b`. Settled by `INV-13b`'s partition sweep plus a decision on the
   constant.
 
 ### INV-14a — both vessels alter to starboard
@@ -205,8 +207,8 @@ way; both are directed to act, and the duty is symmetric.
 - **Why it matters formally.** The one Section II encounter with no `stand-on`
   vessel, and why `INV-17a1-scope` has content.
 - Entries: none; `conduct`, in `known_omissions`, no conduct shape (`Q-45`);
-  `14a` is retired in `data/deprecated-identifiers.json`. Settled by the first
-  conduct monitor.
+  `14a` was never a name and is gone with the rest of the citation-derived ids
+  (ADR 0015). Settled by the first conduct monitor.
 
 ---
 
@@ -228,7 +230,7 @@ encounter type is `crossing` exactly when it is neither `overtaking` under
 - **Known incompleteness.** Two sailing vessels get no encounter type (Rules 14
   and 15 are gated on power, Rule 12 has no deeming paragraph): the Rules'. A
   pair with the history fact absent gets none: the model's (`Q-43`).
-- Entries: `15a-crossing`.
+- Entries: `rule:15a:crossing`.
 
 ### INV-15a-give-way — the vessel with the other to starboard gives way
 
@@ -239,9 +241,9 @@ vessel which has the other on her own starboard side holds `give-way` and the
 other holds `stand-on`.
 
 - **Undetermined term.** "On her own starboard side" has no sector in the
-  paragraph; the data reads `own:geo:rel_bearing_deg` in (0°, 112.5°], its upper
+  paragraph; the data reads `self:geo:rel_bearing_deg` in (0°, 112.5°], its upper
   edge 13(b)'s constant, so it is checkable against the partition.
-- Entries: `15a-give-way`, plus six `rel:overrides` from Rule 18 entries, since
+- Entries: `rule:15a:keep_out_of_the_way`, plus six `rel:overrides` from Rule 18 entries, since
   Rule 18's chapeau excepts Rules 9, 10 and 13 and no others.
 
 ### INV-15a-single — at most one give-way vessel in a crossing
@@ -253,7 +255,7 @@ bearings only
 under `INV-15a-give-way`.
 
 - **Why it is not free.** Both-starboard is a consistent *record* and an
-  impossible *situation* on a steady bearing: own's speed times the sine of her
+  impossible *situation* on a steady bearing: self's speed times the sine of her
   relative bearing equals minus other's speed times the sine of the aspect, so
   the bearings lie on opposite sides. A theorem at zero bearing rate, an
   observation elsewhere.
@@ -277,7 +279,7 @@ advancing position.
   segment ("ahead of" a moving vessel), and the state the role attached.
 - **Undetermined term.** "If the circumstances of the case admit" has nowhere to
   live — `modality` is one closed value, an action has no `effect` — `Q-31`.
-- Entries: none; a `gap` on `15a-give-way`.
+- Entries: none; a `gap` on `rule:15a:keep_out_of_the_way`.
 
 ---
 
@@ -443,7 +445,7 @@ discharge her obligation.
 - **Why separate.** The natural automaton takes the give-way duty as an input to
   its transitions; 17(d) says the arrow does not run back, so model two
   obligations holding concurrently, not one machine with one obligation.
-- Entries: none; nearest is 8(f)(ii)'s parallel for `shall-not-impede`, `8f3`.
+- Entries: none; nearest is 8(f)(ii)'s parallel for `shall-not-impede`, `rule:8f_iii`.
 
 ### INV-17-phases — the phase structure
 
@@ -485,9 +487,9 @@ governs.
 - **Why both directions.** "To nothing else" is what runs the `rel:overrides`
   edges from Rule 18 *to* Rules 12 and 15; got wrong once, found by a sweep
   (`Q-40`).
-- Entries: overrides on `13a` against all Rule 18 and Rule 12 entries; on
-  `18a1`–`18a3`, `18c1`–`18c2`, `18f1` against `15a-give-way`; on the Rule 18
-  entries that can meet two sailing vessels against `12a1`–`12a3`; a derived
+- Entries: overrides on `rule:13a` against all Rule 18 and Rule 12 entries; on
+  the 18(a)(i)–(iii) entries, the two 18(c) entries, `rule:18f_i` against `rule:15a:keep_out_of_the_way`; on the Rule 18
+  entries that can meet two sailing vessels against the three Rule 12 entries; a derived
   check asserts the hand-list of six against Rule 15 is complete.
 
 ### INV-18-order — the rank order
@@ -510,7 +512,7 @@ The subject holds `give-way`; the object `stand-on`.
   (`Q-32`) is the model's decode onto these ranks. A vessel constrained by her
   draught is a power-driven vessel for 18(a) and is ranked by it.
 - **Not stated by Rule 18.** Risk of collision and encounter type: `Q-50`.
-- Entries: `18a1`–`18a4`, `18b1`–`18b3`, `18c1`–`18c2`.
+- Entries: the four 18(a) entries, the three 18(b) entries, the two 18(c) entries.
 
 ### INV-18-partial — the order is partial, and the gaps are the Rules'
 
@@ -542,7 +544,7 @@ discharging `INV-16` requires of her.
 
 - **Why stated.** Read as a condition on the antecedent, it gives a roleless
   pair exactly when compliance is hard and the roles matter.
-- Entries: `18c1`, `18c2`, modality `shall-if-practicable` with effect
+- Entries: `rule:18c_i`, `rule:18c_ii`, modality `shall-if-practicable` with effect
   `give-way`/`stand-on` — `Q-31`'s shape, resolved only because the duty is a
   role.
 
@@ -563,8 +565,8 @@ is not relieved (8(f)(ii)).
   protected vessel a Rule 17 duty no paragraph confers — 8(f)(iii)'s content,
   and why `none` is explicit.
 - **Undetermined term.** "Exhibiting the signals in Rule 28" is a
-  display-compliance fact `18d1` does not read; the entry is wider (`Q-34`).
-- Entries: `18d1`, `8f3`.
+  display-compliance fact `rule:18d_i` does not read; the entry is wider (`Q-34`).
+- Entries: `rule:18d_i`, `rule:8f_iii`.
 
 ### INV-18f1 — the WIG craft keeps well clear
 
@@ -575,7 +577,7 @@ in flight near the surface, she holds `keep-clear` with respect to every other
 vessel — keeps well clear and avoids impeding their navigation — and the other
 holds `none`. `keep-clear` is outside the give-way/stand-on pairing and Rule 16.
 
-- Entries: `18f1`.
+- Entries: `rule:18f_i`.
 
 ---
 
@@ -601,9 +603,9 @@ not jointly exhaustive (`INV-19a-third-state`); Rule 19 supplements Section I
   cross it and back inside one encounter, and no paragraph says what becomes of
   a 13(d) latch or a Rule 17 phase: `Q-55`.
 - **Undetermined term.** "In or near an area of restricted visibility" has no
-  fact (3(l)'s atmospheric condition is nowhere in `data/facts.json`), so `19a`
+  fact (3(l)'s atmospheric condition is nowhere in `data/facts.json`), so `rule:19a`
   selects Section III for any pair not in sight — wider — and records a gap.
-- Entries: `11`, `19a`, complementary on `pair:geo:in_sight`.
+- Entries: `rule:11`, `rule:19a`, complementary on `pair:geo:in_sight`.
 
 ### INV-19a-noroles — Section III has no give-way and no stand-on vessel
 
@@ -633,7 +635,7 @@ excludes Section II, 19(a) excludes Rule 19, and only Section I governs.
 - **Why written down.** A hole forced by both scope paragraphs, which "not
   Section II, so Section III" will not have. The model closes it by dropping
   19(a)'s second conjunct — a decision, not a reading: `Q-56`.
-- Entries: `19a`'s `gap`.
+- Entries: `rule:19a`'s `gap`.
 
 ### INV-19b — safe speed, and engines ready
 
@@ -701,7 +703,7 @@ action in ample time.
 
 **Invariant.** Where `INV-19d-action`'s action is an alteration of course,
 then so far as possible the vessel shall not alter course to port for a vessel
-forward of her beam — `own:geo:rel_bearing_deg` in (270°, 360°) ∪ [0°, 90°) —
+forward of her beam — `self:geo:rel_bearing_deg` in (270°, 360°) ∪ [0°, 90°) —
 other than for a vessel being overtaken.
 
 - **The exception reaches across the switch.** "A vessel being overtaken" is
@@ -716,7 +718,7 @@ other than for a vessel being overtaken.
 
 **Invariant.** Where `INV-19d-action`'s action is an alteration of course,
 then so far as possible the vessel shall not alter course toward a vessel
-abeam or abaft her beam — `own:geo:rel_bearing_deg` in [90°, 270°].
+abeam or abaft her beam — `self:geo:rel_bearing_deg` in [90°, 270°].
 
 - **"Toward"** is the sign of the alteration against the other's bearing, not
   the resulting heading: toward when it reduces her relative bearing off the bow
@@ -758,7 +760,7 @@ paragraph of its own.
 
 `13(a)`, `15(a)`, `12(a)`, `18(a)–(c)` with 18's chapeau · precedence, derived
 · single-state · `✎`, asserted over consistent steady bearings only
-(`REQ-VERIFY-8`)
+(`REQ-VERIFY-8`), over the pooled two-frame read of ADR 0016
 
 **Invariant.** At every state, after every `rel:overrides` is applied, no pair
 holds `give-way` on both subjects, and none holds `stand-on` on both.
@@ -784,7 +786,8 @@ P2.2.
 
 ### INV-PB-one-role-source — a vessel holds one helm role at a time
 
-`13(a)`, `18` chapeau, with 16 and 17 · precedence, derived · single-state · `✎`
+`13(a)`, `18` chapeau, with 16 and 17 · precedence, derived · single-state · `✎`,
+over the pooled two-frame read of ADR 0016
 
 **Invariant.** After every `rel:overrides` is applied, no vessel holds both
 `give-way` and `stand-on` with respect to the same other vessel at the same