Use of StackVec in player_probs

obsidiandynamics · Dec 26, 2023 · 4e8cf3b · 4e8cf3b
1 parent 3ac3e64
commit 4e8cf3b
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 50 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,7 @@ exclude = ["/images", "/bin", "/.idea", "/.github", "/coverage", "/doc", "/examp
 
 [workspace.dependencies]
 anyhow = "1.0.75"
+bincode = "2.0.0-rc.3"
 chrono = "0.4.31"
 clap = { version =  "4.4.6", features = ["derive"] }
 racing_scraper = "0.0.18"
@@ -32,7 +33,6 @@ strum = "0.25.0"
 strum_macros = "0.25.3"
 serde = { version = "1.0.189", features = ["derive"] }
 serde_json = "1.0.107"
-bincode = "2.0.0-rc.3"
 stanza = "0.5.1"
 thiserror = "1.0.50"
 rustc-hash = "1.1.0"

diff --git a/brumby-soccer/benches/cri_interval.rs b/brumby-soccer/benches/cri_interval.rs
@@ -1,4 +1,5 @@
 use criterion::{criterion_group, criterion_main, Criterion};
+use brumby::sv;
 
 use brumby_soccer::interval;
 use brumby_soccer::interval::{Config, PruneThresholds, BivariateProbs, TeamProbs, UnivariateProbs};
@@ -13,7 +14,7 @@ fn criterion_benchmark(c: &mut Criterion) {
                     h2_goals: BivariateProbs { home: 0.25, away: 0.25, common: 0.25 },
                     assists: UnivariateProbs { home: 1.0, away: 1.0 },
                 },
-                player_probs: vec![],
+                player_probs: sv![],
                 prune_thresholds: PruneThresholds {
                     max_total_goals,
                     min_prob: 1e-6,

diff --git a/brumby-soccer/benches/cri_isolate.rs b/brumby-soccer/benches/cri_isolate.rs
@@ -1,5 +1,6 @@
 use brumby_soccer::domain::{OfferType, OutcomeType, Player, Side};
 use criterion::{criterion_group, criterion_main, Criterion};
+use brumby::sv;
 
 use brumby_soccer::interval::{explore, Exploration, Config, BivariateProbs, PruneThresholds, PlayerProbs, TeamProbs, UnivariateProbs};
 use brumby_soccer::interval::query::isolate;
@@ -15,7 +16,7 @@ fn criterion_benchmark(c: &mut Criterion) {
                     h2_goals: BivariateProbs { home: 0.25, away: 0.25, common: 0.25 },
                     assists: UnivariateProbs { home: 1.0, away: 1.0 },
                 },
-                player_probs: vec![(player, PlayerProbs { goal: Some(0.25), assist: None })],
+                player_probs: sv![(player, PlayerProbs { goal: Some(0.25), assist: None })],
                 prune_thresholds: PruneThresholds {
                     max_total_goals,
                     min_prob: 1e-6,

diff --git a/brumby-soccer/src/bin/soc_prices2.rs b/brumby-soccer/src/bin/soc_prices2.rs
@@ -12,6 +12,7 @@ use tracing::{debug, info};
 use brumby::hash_lookup::HashLookup;
 use brumby::market::{Market, Overround, OverroundMethod, PriceBounds};
 use brumby::probs::SliceExt;
+use brumby::sv;
 use brumby_soccer::data::{download_by_id, ContestSummary, SoccerFeedId};
 use brumby_soccer::domain::{Offer, OfferType, OutcomeType, Over, Period, Score};
 use brumby_soccer::fit::{away_booksum, home_booksum, ErrorType, FittingErrors};
@@ -451,7 +452,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
                         away: 1.0,
                     },
                 },
-                player_probs: vec![(
+                player_probs: sv![(
                     player.clone(),
                     PlayerProbs {
                         goal: Some(*prob),
@@ -530,7 +531,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
                         away: 1.0,
                     },
                 },
-                player_probs: vec![(
+                player_probs: sv![(
                     player.clone(),
                     PlayerProbs {
                         goal: Some(*prob),
@@ -643,7 +644,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
                     h2_goals: BivariateProbs::from(adj_optimal_h2.as_slice()),
                     assists: assist_probs.clone(),
                 },
-                player_probs: vec![(
+                player_probs: sv![(
                     player.clone(),
                     PlayerProbs {
                         goal: None,
@@ -1000,7 +1001,7 @@ fn explore_scores(h1_goals: BivariateProbs, h2_goals: BivariateProbs) -> Explora
                     away: 1.0,
                 },
             },
-            player_probs: vec![],
+            player_probs: sv![],
             prune_thresholds: PruneThresholds {
                 max_total_goals: MAX_TOTAL_GOALS_FULL,
                 min_prob: 0.0,

diff --git a/brumby-soccer/src/domain.rs b/brumby-soccer/src/domain.rs
@@ -1,6 +1,3 @@
-use std::iter::{Filter, Zip};
-use std::slice::Iter;
-
 use bincode::Encode;
 
 use brumby::hash_lookup::HashLookup;

diff --git a/brumby-soccer/src/fit.rs b/brumby-soccer/src/fit.rs
@@ -2,7 +2,7 @@ use std::time::Instant;
 
 use tracing::debug;
 
-use brumby::{factorial, poisson};
+use brumby::{factorial, poisson, sv};
 use brumby::capture::Capture;
 use brumby::linear::matrix::Matrix;
 use brumby::opt::{
@@ -333,7 +333,7 @@ fn fit_first_goalscorer_one(
             h2_goals: h2_goals.clone(),
             assists: UnivariateProbs::default(),
         },
-        player_probs: vec![(
+        player_probs: sv![(
             player.clone(),
             PlayerProbs {
                 goal: Some(0.0),
@@ -436,7 +436,7 @@ fn fit_anytime_goalscorer_one(
             h2_goals: h2_goals.clone(),
             assists: UnivariateProbs::default(),
         },
-        player_probs: vec![(
+        player_probs: sv![(
             player.clone(),
             PlayerProbs {
                 goal: Some(0.0),
@@ -541,7 +541,7 @@ fn fit_anytime_assist_one(
             h2_goals: h2_goals.clone(),
             assists: assist_probs.clone(),
         },
-        player_probs: vec![(
+        player_probs: sv![(
             player.clone(),
             PlayerProbs {
                 goal: None,

diff --git a/brumby-soccer/src/interval.rs b/brumby-soccer/src/interval.rs
@@ -12,13 +12,14 @@ use crate::domain::{Player, Score, Side};
 mod assist;
 pub mod query;
 
-const PLAYERS: usize = 4;
+const NUM_PLAYERS: usize = 3;
+const NUM_PLAYER_STATS: usize = NUM_PLAYERS + 1;
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub struct Prospect {
     pub ht_score: Score,
     pub ft_score: Score,
-    pub stats: StackVec<PlayerStats, PLAYERS>,
+    pub stats: StackVec<PlayerStats, NUM_PLAYER_STATS>,
     pub first_scorer: Option<usize>,
 }
 impl Prospect {
@@ -188,7 +189,7 @@ pub struct TeamProbs {
 pub struct Config {
     pub intervals: u8,
     pub team_probs: TeamProbs,
-    pub player_probs: Vec<(Player, PlayerProbs)>,
+    pub player_probs: StackVec<(Player, PlayerProbs), NUM_PLAYERS>,
     pub prune_thresholds: PruneThresholds,
     pub expansions: Expansions,
 }

diff --git a/brumby-soccer/src/interval/query.rs b/brumby-soccer/src/interval/query.rs
@@ -106,6 +106,7 @@ pub fn isolate_set(
 
 #[cfg(test)]
 mod tests {
+    use brumby::sv;
     use crate::domain::{Period, Score, Side};
     use crate::interval::{explore, Config, BivariateProbs, TeamProbs, UnivariateProbs};
 
@@ -121,7 +122,7 @@ mod tests {
                     h2_goals: BivariateProbs { home: 0.25, away: 0.25, common: 0.25 },
                     assists: UnivariateProbs { home: 1.0, away: 1.0 },
                 },
-                player_probs: vec![],
+                player_probs: sv![],
                 prune_thresholds: Default::default(),
                 expansions: Expansions {
                     ht_score: false,
@@ -163,7 +164,7 @@ mod tests {
                     h2_goals: BivariateProbs { home: 0.25, away: 0.25, common: 0.25 },
                     assists: UnivariateProbs { home: 1.0, away: 1.0 },
                 },
-                player_probs: vec![],
+                player_probs: sv![],
                 prune_thresholds: Default::default(),
                 expansions: Expansions {
                     ht_score: false,
@@ -225,7 +226,7 @@ mod tests {
                     h2_goals: BivariateProbs { home: 0.25, away: 0.25, common: 0.25 },
                     assists: UnivariateProbs { home: 1.0, away: 1.0 },
                 },
-                player_probs: vec![],
+                player_probs: sv![],
                 prune_thresholds: Default::default(),
                 expansions: Expansions {
                     ht_score: false,

diff --git a/brumby-soccer/src/interval/query/anytime_assist.rs b/brumby-soccer/src/interval/query/anytime_assist.rs
@@ -41,6 +41,7 @@ pub(crate) fn filter(query: &QuerySpec, prospect: &Prospect) -> bool {
 #[cfg(test)]
 mod tests {
     use assert_float_eq::*;
+    use brumby::sv;
     use super::*;
     use crate::domain::{Period, Score, Side};
     use crate::interval::{explore, Config, PlayerProbs, BivariateProbs, TeamProbs, UnivariateProbs};
@@ -71,7 +72,7 @@ mod tests {
                     },
                     assists: UnivariateProbs { home: 0.5, away: 1.0 },
                 },
-                player_probs: vec![
+                player_probs: sv![
                     (
                         alice.clone(),
                         PlayerProbs {
@@ -85,7 +86,7 @@ mod tests {
                             goal: Some(0.4),
                             assist: Some(0.4),
                         },
-                    ),
+                    )
                 ],
                 prune_thresholds: Default::default(),
                 expansions: Expansions {
@@ -162,7 +163,7 @@ mod tests {
                     },
                     assists: UnivariateProbs { home: 0.3, away: 0.4 },
                 },
-                player_probs: vec![
+                player_probs: sv![
                     (
                         alice.clone(),
                         PlayerProbs {
@@ -176,7 +177,7 @@ mod tests {
                             goal: Some(0.4),
                             assist: Some(0.4),
                         },
-                    ),
+                    )
                 ],
                 prune_thresholds: Default::default(),
                 expansions: Expansions {

diff --git a/brumby-soccer/src/interval/tests.rs b/brumby-soccer/src/interval/tests.rs
@@ -51,7 +51,7 @@ fn explore_2x2() {
                 h2_goals: BivariateProbs { home: 0.25, away: 0.25, common: 0.25 },
                 assists: UnivariateProbs { home: 1.0, away: 1.0 },
             },
-            player_probs: vec![],
+            player_probs: sv![],
             prune_thresholds: Default::default(),
             expansions: Default::default(),
         },
@@ -267,7 +267,7 @@ fn explore_2x2_pruned_2_goals() {
                 h2_goals: BivariateProbs { home: 0.25, away: 0.25, common: 0.25 },
                 assists: UnivariateProbs { home: 1.0, away: 1.0 },
             },
-            player_probs: vec![],
+            player_probs: sv![],
             prune_thresholds: PruneThresholds {
                 max_total_goals: 2,
                 min_prob: 0.0,
@@ -409,7 +409,7 @@ fn explore_3x3() {
                 h2_goals: BivariateProbs { home: 0.25, away: 0.25, common: 0.25 },
                 assists: UnivariateProbs { home: 1.0, away: 1.0 },
             },
-            player_probs: vec![],
+            player_probs: sv![],
             prune_thresholds: Default::default(),
             expansions: Default::default(),
         },
@@ -431,7 +431,7 @@ fn explore_4x4() {
                 h2_goals: BivariateProbs { home: 0.25, away: 0.25, common: 0.25 },
                 assists: UnivariateProbs { home: 1.0, away: 1.0 },
             },
-            player_probs: vec![],
+            player_probs: sv![],
             prune_thresholds: Default::default(),
             expansions: Default::default(),
         },
@@ -454,7 +454,7 @@ fn explore_1x1_player_goal() {
                 h2_goals: BivariateProbs { home: 0.25, away: 0.25, common: 0.25 },
                 assists: UnivariateProbs { home: 1.0, away: 1.0 },
             },
-            player_probs: vec![(player.clone(), PlayerProbs { goal: Some(0.25), assist: None })],
+            player_probs: sv![(player.clone(), PlayerProbs { goal: Some(0.25), assist: None })],
             prune_thresholds: Default::default(),
             expansions: Default::default(),
         },
@@ -635,7 +635,7 @@ fn explore_2x2_player_goal() {
                 h2_goals: BivariateProbs { home: 0.25, away: 0.25, common: 0.25 },
                 assists: UnivariateProbs { home: 0.5, away: 0.5 },
             },
-            player_probs: vec![(player.clone(), PlayerProbs { goal: Some(0.25), assist: None })],
+            player_probs: sv![(player.clone(), PlayerProbs { goal: Some(0.25), assist: None })],
             prune_thresholds: Default::default(),
             expansions: Default::default(),
         },
@@ -681,7 +681,7 @@ fn explore_2x2_player_goal_asymmetric() {
                 h2_goals: BivariateProbs { home: 0.3, away: 0.2, common: 0.1 },
                 assists: UnivariateProbs { home: 1.0, away: 1.0 },
             },
-            player_probs: vec![(player.clone(), PlayerProbs { goal: Some(0.25), assist: None })],
+            player_probs: sv![(player.clone(), PlayerProbs { goal: Some(0.25), assist: None })],
             prune_thresholds: Default::default(),
             expansions: Default::default(),
         },

diff --git a/brumby-soccer/src/model.rs b/brumby-soccer/src/model.rs
@@ -13,6 +13,7 @@ use brumby::capture::Capture;
 use brumby::hash_lookup::HashLookup;
 use brumby::market::{Market, Overround, PriceBounds};
 use brumby::probs::SliceExt;
+use brumby::sv;
 use brumby::timed::Timed;
 
 use crate::domain::error::{InvalidOffer, InvalidOutcome, MissingOutcome, UnvalidatedOffer};
@@ -232,7 +233,7 @@ impl Model {
             let mut cache_stats = CacheStats::default();
             for outcome in &stub.outcomes {
                 let player_probs = match outcome.get_player() {
-                    None => vec![],
+                    None => sv![],
                     Some(player) => {
                         let mut player_probs = PlayerProbs::default();
                         if requires_player_goal_probs {
@@ -241,7 +242,7 @@ impl Model {
                         if requires_player_assist_probs {
                             player_probs.assist = Some(self.require_player_assist_prob(player)?);
                         }
-                        vec![(player.clone(), player_probs)]
+                        sv![(player.clone(), player_probs)]
                     }
                 };
 
@@ -286,7 +287,7 @@ impl Model {
                     config: interval::Config {
                         intervals: self.config.intervals,
                         team_probs,
-                        player_probs: vec![],
+                        player_probs: sv![],
                         prune_thresholds,
                         expansions: reqs,
                     },

diff --git a/brumby-soccer/src/scoregrid.rs b/brumby-soccer/src/scoregrid.rs
@@ -10,7 +10,7 @@ use crate::interval::{explore, Config, PruneThresholds, BivariateProbs, TeamProb
 use brumby::linear::matrix::Matrix;
 use brumby::multinomial::bivariate_binomial;
 use brumby::probs::SliceExt;
-use brumby::{factorial, poisson};
+use brumby::{factorial, poisson, sv};
 use crate::domain::OfferType::CorrectScore;
 use crate::interval::query::requirements;
 
@@ -168,7 +168,7 @@ pub fn from_interval(
                 h2_goals,
                 assists: UnivariateProbs { home: 1.0, away: 1.0 },
             },
-            player_probs: vec![],
+            player_probs: sv![],
             prune_thresholds: PruneThresholds {
                 max_total_goals,
                 min_prob: 0.0,

diff --git a/brumby/Cargo.toml b/brumby/Cargo.toml
@@ -12,6 +12,7 @@ exclude.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
+bincode = { workspace = true }
 clap = { workspace = true }
 racing_scraper = { workspace = true }
 serde_json = { workspace = true }