`Member::with_prior` and `with_drift_scale` were consumed only on the branch that *creates* a competitor — `priors.remove` sat inside `if !self.agents.contains(..)`. Supplying either for a key the history already knew did nothing at all: no error, no warning, and output computed from the default prior. A prior applied on a competitor's very first event and was silently discarded ever after. Configuration now applies whenever supplied. Two details this forced: Configuration is tracked per *field* rather than as a merged `Rating`. A member setting only `drift_scale` must not also assert the default prior, or it would silently undo a prior seeded on an earlier event. Slice state has to be refreshed. `drift_scale` is re-derived on every forward pass, but a prior is written into the competitor's earliest slice once, at ingestion, and `iteration` refreshes only slices after the first. Without the refresh a late prior would reach the drift terms and nothing else — a subtler version of the drop being fixed. This was caught by a test, not by reading the code. Conflicting values for one competitor within a single batch are now `ConflictingCompetitorConfig` rather than resolved by iteration order. Events in a batch are unordered, so "last one wins" would make the result depend on traversal — and `tests/ingestion_equivalence.rs` exists to rule exactly that out. Repeating the same value stays inert, which is the shape callers get when configuration is a property of the domain. That invariant turned out to be tested only for *unconfigured* competitors: every helper in that file built members with `Member::new`. Extended to cover configured ones, including a check that configuration changes the fit at all, so the order tests cannot pass vacuously. `with_prior` had no coverage under `tests/` whatsoever, which is how this survived. Adds `tests/competitor_config.rs`. `drift_scale_is_ignored_after_first_appearance` asserted the old behaviour and now asserts the new one. It was written as a deliberate change-detector — "moving the capture would be a visible break, not a silent one" — so it inverted rather than being deleted. Also removes `InferenceError::ConvergenceFailed` and `NegativePrecision`, which no code path ever constructed: public variants advertising failure modes no caller could observe. Partial #20 — its other items were already resolved, except `Outcome::winner` still panicking. BREAKING CHANGE: `prior` and `drift_scale` now take effect for competitors the history already knows, where they were previously ignored; a batch supplying conflicting values for one competitor is now an error. `InferenceError::ConvergenceFailed` and `InferenceError::NegativePrecision` are removed. Closes #10. Refs #20. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hcFjNDmHXZF8URGLku5zZ
176 lines
5.3 KiB
Rust
176 lines
5.3 KiB
Rust
//! Typed event description for bulk ingestion.
|
|
//!
|
|
//! `Event<T, K>` is the public event shape taken by `History::add_events`. It
|
|
//! is a typed front end, not a replacement: `add_events` flattens it into the
|
|
//! nested `Vec<Vec<Vec<Index>>>` / `Vec<Vec<f64>>` / `Vec<Vec<Vec<f64>>>` that
|
|
//! the internal `add_events_with_prior` chokepoint still takes, and which
|
|
//! `record_winner` and `record_draw` also route through.
|
|
|
|
use smallvec::SmallVec;
|
|
|
|
use crate::{gaussian::Gaussian, outcome::Outcome, time::Time};
|
|
|
|
/// A single match at time `time` involving some number of teams.
|
|
#[derive(Clone, Debug)]
|
|
pub struct Event<T: Time, K> {
|
|
pub time: T,
|
|
pub teams: SmallVec<[Team<K>; 4]>,
|
|
pub outcome: Outcome,
|
|
}
|
|
|
|
/// A team: list of members competing together.
|
|
#[derive(Clone, Debug)]
|
|
pub struct Team<K> {
|
|
pub members: SmallVec<[Member<K>; 4]>,
|
|
}
|
|
|
|
impl<K> Team<K> {
|
|
#[must_use]
|
|
pub fn new() -> Self {
|
|
Self {
|
|
members: SmallVec::new(),
|
|
}
|
|
}
|
|
|
|
pub fn with_members<I: IntoIterator<Item = Member<K>>>(members: I) -> Self {
|
|
Self {
|
|
members: members.into_iter().collect(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<K> Default for Team<K> {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
/// One member of a team, identified by user key `K`.
|
|
///
|
|
/// `weight` applies per event and defaults to 1.0.
|
|
///
|
|
/// `prior` and `drift_scale` are **competitor configuration**, not per-event
|
|
/// values. Setting either applies to the competitor for the whole history, not
|
|
/// just to this event, and applies whenever it is supplied — including on a key
|
|
/// the history already knows. Because configuration lives on the competitor and
|
|
/// `converge` refits from competitor state, configuring one late still refits
|
|
/// the whole history rather than taking effect only from that event onward.
|
|
///
|
|
/// Repeating the same value is inert, which is the expected shape when the
|
|
/// configuration is a property of the domain. Supplying two *different* values
|
|
/// for one competitor within a single batch is
|
|
/// `InferenceError::ConflictingCompetitorConfig`: events in a batch have no
|
|
/// order, so there would be no well-defined winner.
|
|
#[derive(Clone, Debug)]
|
|
pub struct Member<K> {
|
|
pub key: K,
|
|
pub weight: f64,
|
|
pub prior: Option<Gaussian>,
|
|
/// Multiplier on the drift *variance* this competitor accumulates.
|
|
/// `None` means 1.0.
|
|
pub drift_scale: Option<f64>,
|
|
}
|
|
|
|
impl<K> Member<K> {
|
|
pub fn new(key: K) -> Self {
|
|
Self {
|
|
key,
|
|
weight: 1.0,
|
|
prior: None,
|
|
drift_scale: None,
|
|
}
|
|
}
|
|
|
|
pub fn with_weight(mut self, weight: f64) -> Self {
|
|
self.weight = weight;
|
|
self
|
|
}
|
|
|
|
/// Set this competitor's starting skill estimate.
|
|
///
|
|
/// Captured at the competitor's first appearance; see the type docs.
|
|
pub fn with_prior(mut self, prior: Gaussian) -> Self {
|
|
self.prior = Some(prior);
|
|
self
|
|
}
|
|
|
|
/// Scale how fast this competitor drifts, relative to the history's drift.
|
|
///
|
|
/// The scale multiplies the drift *variance*, so it is in the same units as
|
|
/// `gamma`: `ConstantDrift(g)` at `scale = s` behaves exactly as
|
|
/// `ConstantDrift(g * s)` would for this competitor alone.
|
|
///
|
|
/// `0.0` pins the competitor still — useful for a reference point that
|
|
/// shares a scale with moving competitors but should not itself move: a bot
|
|
/// at a known strength, a rating floor, a course difficulty.
|
|
///
|
|
/// Captured at the competitor's first appearance; see the type docs.
|
|
/// Must be finite and non-negative, or ingestion fails with
|
|
/// [`InferenceError::InvalidParameter`](crate::InferenceError::InvalidParameter).
|
|
pub fn with_drift_scale(mut self, scale: f64) -> Self {
|
|
self.drift_scale = Some(scale);
|
|
self
|
|
}
|
|
}
|
|
|
|
/// Convenience: a member is a user key with default weight 1.0 and no prior.
|
|
impl<K> From<K> for Member<K> {
|
|
fn from(key: K) -> Self {
|
|
Self::new(key)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::Outcome;
|
|
|
|
#[test]
|
|
fn member_new_has_unit_weight_no_prior() {
|
|
let m = Member::new("alice");
|
|
assert_eq!(m.key, "alice");
|
|
assert_eq!(m.weight, 1.0);
|
|
assert!(m.prior.is_none());
|
|
assert!(m.drift_scale.is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn member_builder_methods_chain() {
|
|
let m = Member::new("alice")
|
|
.with_weight(0.5)
|
|
.with_prior(Gaussian::from_ms(20.0, 5.0))
|
|
.with_drift_scale(0.0);
|
|
assert_eq!(m.weight, 0.5);
|
|
assert!(m.prior.is_some());
|
|
assert_eq!(m.drift_scale, Some(0.0));
|
|
}
|
|
|
|
#[test]
|
|
fn member_from_key() {
|
|
let m: Member<&str> = "bob".into();
|
|
assert_eq!(m.key, "bob");
|
|
assert_eq!(m.weight, 1.0);
|
|
}
|
|
|
|
#[test]
|
|
fn team_with_members_collects() {
|
|
let t: Team<&str> = Team::with_members([Member::new("a"), Member::new("b")]);
|
|
assert_eq!(t.members.len(), 2);
|
|
}
|
|
|
|
#[test]
|
|
fn event_construction() {
|
|
use smallvec::smallvec;
|
|
let e: Event<i64, &str> = Event {
|
|
time: 1,
|
|
teams: smallvec![
|
|
Team::with_members([Member::new("a")]),
|
|
Team::with_members([Member::new("b")]),
|
|
],
|
|
outcome: Outcome::winner(0, 2),
|
|
};
|
|
assert_eq!(e.teams.len(), 2);
|
|
assert_eq!(e.time, 1);
|
|
}
|
|
}
|