Six of fifteen variants carried a `&'static str` discriminator, about
thirty magic strings between them, and the only thing a caller could do
with one was print it. Four new enums replace them:
Parameter 13 variants, replacing 9 strings in InvalidParameter
Shape 4 variants, replacing 10 in MismatchedShape
OutcomeKind 2 variants, replacing WrongOutcomeKind's three fields
CompetitorField 2 variants, replacing ConflictingCompetitorConfig's
`InvalidProbability` folds into `InvalidParameter` as
`Parameter::PDraw`. It was a bespoke variant for one scalar while every
other scalar shared `InvalidParameter`, and it omitted the parameter
name — so the same parameter had two mechanisms.
`JointUnavailable { reason: &'static str }` splits into `EmptyHistory`,
`JointRequiresScoredEvents` and `NotPositiveDefinite`. The three are
conditions a caller branches on differently — add events, use
`predict_win_probabilities`, or reconsider the priors — and telling them
apart used to mean string-matching English. One test already proved the
distinction was load-bearing: the blanket conversion mapped the
empty-history case onto the ranked one and `an_empty_history_has_no_joint`
caught it immediately.
`NonFiniteResult` splits into `NonFiniteStep { context, step }` and
`NonFiniteSkill { mu, sigma }`. One `step: (f64, f64)` field was
carrying a sweep step from `converge` and a skill's own moments from a
prediction — two situations in one variant, and a field name that could
only be right for one of them.
`InvalidParameter { name: "beta with point-mass skills" }` becomes
`NoPerformanceVariance`. It was never a parameter out of range: both
values are individually valid and it is their combination that leaves
nothing varying.
Three `Display` impls did not meet the standard the others set, and the
typed data is what makes fixing them possible:
before drift variance is invalid: NaN
after drift variance must be finite and non-negative (got NaN)
before kinds: expected length 3, got 2
after the outcome describes a different number of teams than the
event has: expected 3, got 2
before Game::ranked: expected Outcome::Ranked, got Outcome::Scored
after expected Outcome::Ranked, got Outcome::Scored; call
Game::scored for a scored outcome
`Parameter::range()` states each parameter's actual bounds, which no
`&'static str` name could have. `error::message_tests` renders every one
and asserts each is a sentence rather than a label, and that the three
above now carry a range or a next step.
The four internal `MismatchedShape` kinds — `results`, `times`, `kinds`,
and the weights array — collapse to `Shape::Internal`, whose `Display`
says plainly that reaching it is a bug in this crate. They are checks on
`add_events_with_prior`'s own parallel arrays and are unreachable
through the public API; they stay checked rather than becoming
`debug_assert!`s, because release is where this crate's defects hide.
Closes #74.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011hcFjNDmHXZF8URGLku5zZ
87 lines
3.4 KiB
Rust
87 lines
3.4 KiB
Rust
use std::fmt::Debug;
|
|
|
|
use crate::time::Time;
|
|
|
|
/// Governs how much a competitor's skill can drift between two time points.
|
|
///
|
|
/// Generic over `T: Time` so seasonal or calendar-aware drift is expressible
|
|
/// without going through `i64`.
|
|
pub trait Drift<T: Time>: Copy + Debug + Send + Sync {
|
|
/// Variance added to the skill prior for elapsed time `from -> to`.
|
|
///
|
|
/// Called with `from <= to`; returning zero means no drift accumulates.
|
|
fn variance_delta(&self, from: &T, to: &T) -> f64;
|
|
|
|
/// Variance added for a pre-computed elapsed count (in the same units as
|
|
/// `T::elapsed_to`). Used where the elapsed is already cached as `i64`.
|
|
fn variance_for_elapsed(&self, elapsed: i64) -> f64;
|
|
}
|
|
|
|
/// Simple constant-per-unit-time drift.
|
|
///
|
|
/// For `Time = i64`: variance added is `(to - from) * gamma^2`.
|
|
/// For `Time = Untimed`: elapsed is always 0, so drift is always 0.
|
|
///
|
|
/// # Why the field is private
|
|
///
|
|
/// `gamma` enters only as `gamma * gamma`, so a negative value is squared away:
|
|
/// measured against the old public-field form, `ConstantDrift(-0.0833)` produced
|
|
/// results **bit identical** to `ConstantDrift(0.0833)`. The sign was neither
|
|
/// rejected nor honoured — it vanished. That is the same sign-absorption `HistoryBuilder::sigma`,
|
|
/// `HistoryBuilder::beta`, `Gaussian::from_ms` and `Rating::new` all reject.
|
|
///
|
|
/// It could not be checked while the field was a public tuple position, because
|
|
/// there was no constructor to intercept. Validating inside
|
|
/// `variance_for_elapsed` would have been worse: it runs inside the sweep, so a
|
|
/// construction-time mistake would panic mid-inference — and `Gaussian::from_ms`
|
|
/// is a worked example of why that is the wrong place for a guard, where
|
|
/// rejecting NaN turned the `NonFiniteStep` reporting path into a crash.
|
|
///
|
|
/// So [`ConstantDrift::new`] is the only way in, and it checks. Read the value
|
|
/// back with [`ConstantDrift::gamma`].
|
|
///
|
|
/// A non-finite gamma is caught a second time regardless:
|
|
/// `History::converge` validates the drift variance each competitor actually
|
|
/// accumulates, which also covers a custom [`Drift`] implementation.
|
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
|
pub struct ConstantDrift(f64);
|
|
|
|
impl ConstantDrift {
|
|
/// Drift of `gamma` standard deviations per unit time.
|
|
///
|
|
/// # Panics
|
|
///
|
|
/// Panics unless `gamma` is finite and non-negative.
|
|
///
|
|
/// The field is private and this is the only constructor precisely so that
|
|
/// there is somewhere to check. While it was a public tuple field there was
|
|
/// nothing to intercept, and a negative gamma was silently squared away —
|
|
/// see the type docs.
|
|
#[must_use]
|
|
pub fn new(gamma: f64) -> Self {
|
|
assert!(
|
|
gamma.is_finite() && gamma >= 0.0,
|
|
"gamma must be finite and non-negative (got {gamma}); it is only ever \
|
|
squared, so a negative value would silently behave as its absolute value"
|
|
);
|
|
Self(gamma)
|
|
}
|
|
|
|
/// Standard deviations of drift accumulated per unit time.
|
|
#[must_use]
|
|
pub fn gamma(&self) -> f64 {
|
|
self.0
|
|
}
|
|
}
|
|
|
|
impl<T: Time> Drift<T> for ConstantDrift {
|
|
fn variance_delta(&self, from: &T, to: &T) -> f64 {
|
|
let elapsed = from.elapsed_to(to).max(0) as f64;
|
|
elapsed * self.0 * self.0
|
|
}
|
|
|
|
fn variance_for_elapsed(&self, elapsed: i64) -> f64 {
|
|
elapsed.max(0) as f64 * self.0 * self.0
|
|
}
|
|
}
|