Third of the five remaining items on #23. `add_events_with_prior` and `TimeSlice::add_events` took `Vec<Vec<f64>>` and `Vec<Vec<Vec<f64>>>` where an empty vec meant "not supplied" — so an empty outer vec and a genuinely empty event list were the same value, and every reader had to know which. Both are now `Option`, and the "not supplied" branches read as `None` arms rather than `is_empty()` checks. Two things fell out of the change that a sentinel would have hidden: The tie pre-check iterated `results` directly. Under `Option` it needs `.iter().flatten()`, which makes explicit that a `None` results list has no ties to reject — previously an empty vec silently skipped the same loop and looked identical to "checked, found nothing". `MismatchedShape.got` could no longer be `results.len()`, because at the point of the error there may be no vec to take a length from. It is now computed as `map_or(0, Vec::len)` before the error is built. MSRV note: my first draft used let-chains for the two validations. Those need Rust 1.88 and this crate pins 1.85 — it compiled locally on 1.98 and would have failed only in the MSRV CI job. Rewritten with `is_some_and`, and verified by installing 1.85.0 and building against it rather than by assuming the removal was complete. Breaking: `TimeSlice::add_events` is public. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01T5SYDExxL4vZgvunrcNSMc
48 lines
1.5 KiB
Rust
48 lines
1.5 KiB
Rust
use criterion::{Criterion, criterion_group, criterion_main};
|
|
use trueskill_tt::{
|
|
BETA, Competitor, ConvergenceOptions, EventKind, GAMMA, KeyTable, MU, P_DRAW, Rating, SIGMA,
|
|
TimeSlice, drift::ConstantDrift, gaussian::Gaussian, storage::CompetitorStore,
|
|
};
|
|
|
|
fn criterion_benchmark(criterion: &mut Criterion) {
|
|
let mut index_map = KeyTable::new();
|
|
|
|
let a = index_map.get_or_create("a");
|
|
let b = index_map.get_or_create("b");
|
|
let c = index_map.get_or_create("c");
|
|
|
|
let mut agents: CompetitorStore<i64, ConstantDrift> = CompetitorStore::new();
|
|
|
|
for agent in [a, b, c] {
|
|
agents.insert(
|
|
agent,
|
|
Competitor {
|
|
rating: Rating::new(Gaussian::from_ms(MU, SIGMA), BETA, ConstantDrift(GAMMA)),
|
|
..Default::default()
|
|
},
|
|
);
|
|
}
|
|
|
|
let mut composition = Vec::new();
|
|
let mut results = Vec::new();
|
|
let mut weights = Vec::new();
|
|
|
|
for _ in 0..100 {
|
|
composition.push(vec![vec![a], vec![b]]);
|
|
results.push(vec![1.0, 0.0]);
|
|
weights.push(vec![vec![1.0], vec![1.0]]);
|
|
}
|
|
|
|
let kinds = vec![EventKind::Ranked; composition.len()];
|
|
|
|
let mut time_slice = TimeSlice::new(1, P_DRAW, ConvergenceOptions::default());
|
|
time_slice.add_events(composition, Some(results), Some(weights), kinds, &agents);
|
|
|
|
criterion.bench_function("Batch::iteration", |b| {
|
|
b.iter(|| time_slice.iteration(0, &agents))
|
|
});
|
|
}
|
|
|
|
criterion_group!(benches, criterion_benchmark);
|
|
criterion_main!(benches);
|