From 2367a8e47f669a1c46880a1de6086f3180be82ec Mon Sep 17 00:00:00 2001 From: Anders Olsson Date: Thu, 25 Oct 2018 21:41:23 +0200 Subject: [PATCH] Fmt. --- src/factor_graph.rs | 20 ++++++++++++++---- src/gaussian.rs | 1 - src/lib.rs | 49 +++++++++++++++++++-------------------------- 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/factor_graph.rs b/src/factor_graph.rs index 607411b..594d6a3 100644 --- a/src/factor_graph.rs +++ b/src/factor_graph.rs @@ -99,7 +99,10 @@ impl PriorFactor { } pub fn start(&self, variable_arena: &mut VariableArena) { - debug!("Prior::down var={:?}, value={:?}", self.variable.index, self.gaussian); + debug!( + "Prior::down var={:?}, value={:?}", + self.variable.index, self.gaussian + ); variable_arena .get_mut(self.variable) @@ -143,7 +146,10 @@ impl LikelihoodFactor { let a = 1.0 / (1.0 + self.variance * (x.pi() - fx.pi())); let gaussian = Gaussian::from_pi_tau(a * (x.pi() - fx.pi()), a * (x.tau() - fx.tau())); - debug!("Likelihood::up var={:?}, value={:?}", self.mean.index, gaussian); + debug!( + "Likelihood::up var={:?}, value={:?}", + self.mean.index, gaussian + ); variable_arena .get_mut(self.mean) @@ -160,7 +166,10 @@ impl LikelihoodFactor { let a = 1.0 / (1.0 + self.variance * (y.pi() - fy.pi())); let gaussian = Gaussian::from_pi_tau(a * (y.pi() - fy.pi()), a * (y.tau() - fy.tau())); - debug!("Likelihood::down var={:?}, value={:?}", self.value.index, gaussian); + debug!( + "Likelihood::down var={:?}, value={:?}", + self.value.index, gaussian + ); variable_arena .get_mut(self.value) @@ -359,7 +368,10 @@ impl TruncateFactor { let gaussian = Gaussian::from_pi_tau(c / m_w, (d + sqrt_c * v) / m_w); - debug!("Trunc::up var={:?}, value={:?}", self.variable.index, gaussian); + debug!( + "Trunc::up var={:?}, value={:?}", + self.variable.index, gaussian + ); variable_arena .get_mut(self.variable) diff --git a/src/gaussian.rs b/src/gaussian.rs index ad26d15..e63c975 100644 --- a/src/gaussian.rs +++ b/src/gaussian.rs @@ -13,7 +13,6 @@ impl fmt::Debug for Gaussian { } } - impl Gaussian { pub fn from_pi_tau(pi: f64, tau: f64) -> Gaussian { Gaussian { pi, tau } diff --git a/src/lib.rs b/src/lib.rs index 75a6396..ef9b47b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -92,16 +92,20 @@ where let rating_count = ratings.len(); let team_count = ranks.len(); - let rating_vars = (0..rating_count).map(|_| variable_arena.create()).collect::>(); + let rating_vars = (0..rating_count) + .map(|_| variable_arena.create()) + .collect::>(); let perf_vars = ratings .iter() - .map(|(_, team)| { - (variable_arena.create(), *team) - }) + .map(|(_, team)| (variable_arena.create(), *team)) .collect::>(); - let team_perf_vars = (0..team_count).map(|_| variable_arena.create()).collect::>(); - let team_diff_vars = (0..team_count - 1).map(|_| variable_arena.create()).collect::>(); + let team_perf_vars = (0..team_count) + .map(|_| variable_arena.create()) + .collect::>(); + let team_diff_vars = (0..team_count - 1) + .map(|_| variable_arena.create()) + .collect::>(); let mut factor_id = 0; @@ -109,16 +113,12 @@ where .iter() .zip(ratings.iter().map(|(rating, _)| rating)) .map(|(rating_var, rating)| { - let gaussian = Gaussian::from_mu_sigma(rating.mu(), (rating.sigma().powi(2) + tau_sqr).sqrt()); + let gaussian = + Gaussian::from_mu_sigma(rating.mu(), (rating.sigma().powi(2) + tau_sqr).sqrt()); factor_id += 1; - PriorFactor::new( - &mut variable_arena, - factor_id, - *rating_var, - gaussian, - ) + PriorFactor::new(&mut variable_arena, factor_id, *rating_var, gaussian) }) .collect::>(); @@ -128,13 +128,7 @@ where .map(|(rating_var, perf)| { factor_id += 1; - LikelihoodFactor::new( - &mut variable_arena, - factor_id, - *rating_var, - *perf, - beta_sqr, - ) + LikelihoodFactor::new(&mut variable_arena, factor_id, *rating_var, *perf, beta_sqr) }) .collect::>(); @@ -175,7 +169,6 @@ where teams.to_vec(), vec![1.0, -1.0], ) - }) .collect::>(); @@ -197,7 +190,6 @@ where draw_margin(DRAW_PROBABILITY, BETA, player_count as f64), ranks[i] == ranks[i + 1], ) - }) .collect::>();; @@ -239,11 +231,9 @@ where rating_vars .iter() .map(|variable| variable_arena.get(*variable).unwrap().get_value()) - .map(|value| { - Rating { - mu: value.mu(), - sigma: value.sigma(), - } + .map(|value| Rating { + mu: value.mu(), + sigma: value.sigma(), }) .collect::>() } @@ -372,7 +362,10 @@ mod tests { Rating::new(16.79337409436942, 6.348053083319977), ]; - let ratings = rate(&[(alice, 0), (bob, 1), (chris, 2), (darren, 3)], &[0, 1, 2, 3]); + let ratings = rate( + &[(alice, 0), (bob, 1), (chris, 2), (darren, 3)], + &[0, 1, 2, 3], + ); for (rating, expected) in ratings.iter().zip(expected_ratings.iter()) { assert_relative_eq!(rating, expected, epsilon = EPSILON);