From de4b32465147a5a460e5a382be2718b81343eb0f Mon Sep 17 00:00:00 2001 From: Anders Olsson Date: Mon, 13 Jun 2022 11:35:08 +0200 Subject: [PATCH] Remove Display impl, better to use Debug --- README.md | 3 ++- src/gaussian.rs | 25 ++----------------------- src/player.rs | 12 ------------ 3 files changed, 4 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 1a32353..a46f319 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,5 @@ Rust port of [TrueSkillThroughTime.py](https://github.com/glandfried/TrueSkillTh ## Todo -- [ ] Change `time` to always be a u64 (or usize)? +- [ ] Add examples (use same TrueSkillThroughTime.py) +- [ ] Change `time` to always be a u64 (or usize?) diff --git a/src/gaussian.rs b/src/gaussian.rs index 5c7f7f4..e502b9f 100644 --- a/src/gaussian.rs +++ b/src/gaussian.rs @@ -1,4 +1,3 @@ -use std::fmt; use std::ops; use crate::{utils, MU, SIGMA}; @@ -38,26 +37,12 @@ impl Gaussian { ((self.mu() - m.mu()).abs(), (self.sigma() - m.sigma()).abs()) } - pub fn exclude(&self, m: Gaussian) -> Gaussian { - Gaussian::new( + pub fn exclude(&self, m: Gaussian) -> Self { + Self::new( self.mu() - m.mu(), (self.sigma().powi(2) - m.sigma().powi(2)).sqrt(), ) } - - /* - def forget(self,gamma,t): - return Gaussian(self.mu, math.sqrt(self.sigma**2 + t*gamma**2)) - - def delta(self, M): - return abs(self.mu - M.mu) , abs(self.sigma - M.sigma) - - def exclude(self, M): - return Gaussian(self.mu - M.mu, math.sqrt(self.sigma**2 - M.sigma**2) ) - - def isapprox(self, M, tol=1e-4): - return (abs(self.mu - M.mu) < tol) and (abs(self.sigma - M.sigma) < tol) - */ } impl Default for Gaussian { @@ -69,12 +54,6 @@ impl Default for Gaussian { } } -impl fmt::Display for Gaussian { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "N(mu={:.3}, sigma={:.3})", self.mu, self.sigma) - } -} - impl ops::Add for Gaussian { type Output = Gaussian; diff --git a/src/player.rs b/src/player.rs index c0d1e8a..14c6a5a 100644 --- a/src/player.rs +++ b/src/player.rs @@ -1,5 +1,3 @@ -use std::fmt; - use crate::{Gaussian, BETA, GAMMA, N_INF}; #[derive(Clone, Copy, Debug)] @@ -35,13 +33,3 @@ impl Default for Player { Player::new(Gaussian::default(), BETA, GAMMA, N_INF) } } - -impl fmt::Display for Player { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!( - f, - "Player({}, beta={:.3}, gamma={:.3})", - self.prior, self.beta, self.gamma - ) - } -}