Exposes the factor-graph machinery so power users can define custom
factors and schedules (see Game::custom in the next task). The
internal factor/ and schedule/ modules remain unchanged (still
referenced by Game's internals via crate::factor); the user-facing
public API goes through the new factors module re-exports:
pub use crate::factor::{BuiltinFactor, Factor, VarId, VarStore};
pub use crate::factor::rank_diff::RankDiffFactor;
pub use crate::factor::team_sum::TeamSumFactor;
pub use crate::factor::trunc::TruncFactor;
pub use crate::schedule::{EpsilonOrMax, Schedule, ScheduleReport};
#[allow(dead_code)] guards on the previously-pub(crate) items are
removed because the types are now referenced via the re-exports.
Promotes public methods on VarStore (len, alloc, get, set, clear, new)
and adds is_empty per clippy lint. Keeps marginals field private as an
implementation detail — users access via the public methods.
Part of T2 of docs/superpowers/specs/2026-04-23-trueskill-engine-redesign-design.md.
131 lines
4.0 KiB
Rust
131 lines
4.0 KiB
Rust
use crate::{
|
|
N_INF, approx, cdf,
|
|
factor::{Factor, VarId, VarStore},
|
|
gaussian::Gaussian,
|
|
};
|
|
|
|
/// EP truncation factor on a diff variable.
|
|
///
|
|
/// Implements the rectified-Gaussian approximation that turns a diff
|
|
/// distribution into a "this team rank-beats that team" or "tied" likelihood.
|
|
/// Stores its outgoing message to the diff variable so the cavity computation
|
|
/// produces the correct EP message on each propagation.
|
|
#[derive(Debug)]
|
|
pub struct TruncFactor {
|
|
pub diff: VarId,
|
|
pub margin: f64,
|
|
pub tie: bool,
|
|
/// Outgoing message to the diff variable (initial: N_INF, the EP identity).
|
|
pub(crate) msg: Gaussian,
|
|
/// Cached evidence (linear, not log) computed from the cavity on first propagation.
|
|
pub(crate) evidence_cached: Option<f64>,
|
|
}
|
|
|
|
impl TruncFactor {
|
|
pub fn new(diff: VarId, margin: f64, tie: bool) -> Self {
|
|
Self {
|
|
diff,
|
|
margin,
|
|
tie,
|
|
msg: N_INF,
|
|
evidence_cached: None,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Factor for TruncFactor {
|
|
fn propagate(&mut self, vars: &mut VarStore) -> (f64, f64) {
|
|
let marginal = vars.get(self.diff);
|
|
// Cavity: marginal divided by our outgoing message.
|
|
let cavity = marginal / self.msg;
|
|
|
|
// First-time-only: cache the evidence contribution from the cavity.
|
|
if self.evidence_cached.is_none() {
|
|
self.evidence_cached = Some(cavity_evidence(cavity, self.margin, self.tie));
|
|
}
|
|
|
|
// Apply the truncation approximation to the cavity.
|
|
let trunc = approx(cavity, self.margin, self.tie);
|
|
|
|
// New outgoing message such that cavity * new_msg = trunc.
|
|
let new_msg = trunc / cavity;
|
|
let old_msg = self.msg;
|
|
self.msg = new_msg;
|
|
|
|
// Update the marginal: marginal_new = cavity * new_msg = trunc.
|
|
vars.set(self.diff, trunc);
|
|
|
|
old_msg.delta(new_msg)
|
|
}
|
|
|
|
fn log_evidence(&self, _vars: &VarStore) -> f64 {
|
|
self.evidence_cached.unwrap_or(1.0).ln()
|
|
}
|
|
}
|
|
|
|
/// P(diff > margin) for non-tie, P(|diff| < margin) for tie.
|
|
fn cavity_evidence(diff: Gaussian, margin: f64, tie: bool) -> f64 {
|
|
if tie {
|
|
cdf(margin, diff.mu(), diff.sigma()) - cdf(-margin, diff.mu(), diff.sigma())
|
|
} else {
|
|
1.0 - cdf(margin, diff.mu(), diff.sigma())
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::factor::VarStore;
|
|
|
|
#[test]
|
|
fn idempotent_after_convergence() {
|
|
// After enough iterations, propagate should return ~0 delta.
|
|
let mut vars = VarStore::new();
|
|
let diff = vars.alloc(Gaussian::from_ms(2.0, 3.0));
|
|
|
|
let mut f = TruncFactor::new(diff, 0.0, false);
|
|
|
|
// Propagate many times; delta should drop toward 0.
|
|
let mut last = (f64::INFINITY, f64::INFINITY);
|
|
for _ in 0..20 {
|
|
last = f.propagate(&mut vars);
|
|
}
|
|
assert!(last.0 < 1e-10, "expected converged delta, got {}", last.0);
|
|
assert!(last.1 < 1e-10);
|
|
}
|
|
|
|
#[test]
|
|
fn evidence_cached_on_first_propagate() {
|
|
let mut vars = VarStore::new();
|
|
let diff = vars.alloc(Gaussian::from_ms(2.0, 3.0));
|
|
|
|
let mut f = TruncFactor::new(diff, 0.0, false);
|
|
assert!(f.evidence_cached.is_none());
|
|
|
|
f.propagate(&mut vars);
|
|
assert!(f.evidence_cached.is_some());
|
|
let first = f.evidence_cached.unwrap();
|
|
|
|
// Evidence should be P(diff > 0) for diff ~ N(2, 9) ≈ 0.748
|
|
assert!(first > 0.7);
|
|
assert!(first < 0.8);
|
|
|
|
// Subsequent propagations don't change it.
|
|
f.propagate(&mut vars);
|
|
assert_eq!(f.evidence_cached.unwrap(), first);
|
|
}
|
|
|
|
#[test]
|
|
fn tie_evidence_uses_two_sided() {
|
|
let mut vars = VarStore::new();
|
|
let diff = vars.alloc(Gaussian::from_ms(0.0, 2.0));
|
|
|
|
let mut f = TruncFactor::new(diff, 1.0, true);
|
|
f.propagate(&mut vars);
|
|
|
|
// For diff ~ N(0, 4), tie=true with margin=1: P(-1 < diff < 1) ≈ 0.383
|
|
let ev = f.evidence_cached.unwrap();
|
|
assert!(ev > 0.35 && ev < 0.42);
|
|
}
|
|
}
|