From 4531fb32728918cb3fb080c84960f1fb7c0fa2a3 Mon Sep 17 00:00:00 2001 From: Anders Olsson Date: Wed, 24 Oct 2018 20:16:16 +0200 Subject: [PATCH] Fmt. --- src/factor_graph.rs | 55 ++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 36 deletions(-) diff --git a/src/factor_graph.rs b/src/factor_graph.rs index c5d66bf..2b2bf75 100644 --- a/src/factor_graph.rs +++ b/src/factor_graph.rs @@ -131,10 +131,7 @@ impl LikelihoodFactor { pub fn update_mean(&self, variable_arena: &mut VariableArena) { let (x, fx) = variable_arena .get(self.value) - .map(|variable| ( - variable.get_value(), - variable.get_message(self.id) - )) + .map(|variable| (variable.get_value(), variable.get_message(self.id))) .unwrap(); let a = 1.0 / (1.0 + self.variance * (x.pi() - fx.pi())); @@ -149,10 +146,7 @@ impl LikelihoodFactor { pub fn update_value(&self, variable_arena: &mut VariableArena) { let (y, fy) = variable_arena .get(self.mean) - .map(|variable| ( - variable.get_value(), - variable.get_message(self.id) - )) + .map(|variable| (variable.get_value(), variable.get_message(self.id))) .unwrap(); let a = 1.0 / (1.0 + self.variance * (y.pi() - fy.pi())); @@ -202,15 +196,14 @@ impl SumFactor { fy: Vec, a: &[f64], ) { - let (sum_pi, sum_tau) = a.iter().zip(y.iter().zip(fy.iter())) - .fold((0.0, 0.0), |(pi, tau), (a, (y, fy))| { - let x = *y / *fy; + let (sum_pi, sum_tau) = + a.iter() + .zip(y.iter().zip(fy.iter())) + .fold((0.0, 0.0), |(pi, tau), (a, (y, fy))| { + let x = *y / *fy; - ( - pi + a.powi(2) / x.pi(), - tau + a * x.tau() / x.pi() - ) - }); + (pi + a.powi(2) / x.pi(), tau + a * x.tau() / x.pi()) + }); let new_pi = 1.0 / sum_pi; let new_tau = new_pi * sum_tau; @@ -224,15 +217,13 @@ impl SumFactor { } pub fn update_sum(&self, variable_arena: &mut VariableArena) { - let (y, fy) = self.terms + let (y, fy) = self + .terms .iter() .map(|term| { variable_arena .get(*term) - .map(|variable| ( - variable.get_value(), - variable.get_message(self.id) - )) + .map(|variable| (variable.get_value(), variable.get_message(self.id))) .unwrap() }) .unzip(); @@ -244,7 +235,8 @@ impl SumFactor { let idx_term = self.terms[index]; let idx_coeff = self.coeffs[index]; - let a = self.coeffs + let a = self + .coeffs .iter() .enumerate() .map(|(i, coeff)| { @@ -256,22 +248,16 @@ impl SumFactor { }) .collect::>(); - let (y, fy) = self.terms + let (y, fy) = self + .terms .iter() .enumerate() .map(|(i, term)| { - let variable = if i == index { - self.sum - } else { - *term - }; + let variable = if i == index { self.sum } else { *term }; variable_arena .get(variable) - .map(|variable| ( - variable.get_value(), - variable.get_message(self.id) - )) + .map(|variable| (variable.get_value(), variable.get_message(self.id))) .unwrap() }) .unzip(); @@ -330,10 +316,7 @@ impl TruncateFactor { pub fn update(&self, variable_arena: &mut VariableArena) { let (x, fx) = variable_arena .get(self.variable) - .map(|variable| ( - variable.get_value(), - variable.get_message(self.id) - )) + .map(|variable| (variable.get_value(), variable.get_message(self.id))) .unwrap(); let c = x.pi() - fx.pi();