From 5a54d460c9443b7b16f9f865468e22178c6d85d8 Mon Sep 17 00:00:00 2001 From: Anders Olsson Date: Tue, 7 Jun 2022 10:01:01 +0200 Subject: [PATCH] Small clean up --- examples/abcdef.rs | 20 ++++++++++---------- src/fitter/recursive.rs | 5 +++-- src/storage.rs | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/examples/abcdef.rs b/examples/abcdef.rs index 8c68fbb..98acdcd 100644 --- a/examples/abcdef.rs +++ b/examples/abcdef.rs @@ -5,11 +5,11 @@ use kickscore as ks; fn main() { let mut model = ks::model::Binary::probit(); - for player in &["A", "B", "C", "D", "E", "F"] { - let kernel: [Box; 2] = [ - Box::new(ks::kernel::Constant::new(1.0)), - Box::new(ks::kernel::Matern52::new(0.5, 1.0)), - ]; + for player in ["A", "B", "C", "D", "E", "F"] { + let kernel = ( + ks::kernel::Constant::new(1.0), + ks::kernel::Matern52::new(0.5, 1.0), + ); model.add_item(player, kernel); } @@ -18,7 +18,7 @@ fn main() { model.fit(); - for player in &["A", "B", "C", "D", "E", "F"] { + for player in ["A", "B", "C", "D", "E", "F"] { let (mu, sigma) = model.item_score(player, 1.25); println!("{}: mu={} sigma={}", player, mu, sigma); @@ -28,7 +28,7 @@ fn main() { model.fit(); - for player in &["A", "B", "C", "D", "E", "F"] { + for player in ["A", "B", "C", "D", "E", "F"] { let (mu, sigma) = model.item_score(player, 1.25); println!("{}: mu={} sigma={}", player, mu, sigma); @@ -38,7 +38,7 @@ fn main() { model.fit(); - for player in &["A", "B", "C", "D", "E", "F"] { + for player in ["A", "B", "C", "D", "E", "F"] { let (mu, sigma) = model.item_score(player, 1.25); println!("{}: mu={} sigma={}", player, mu, sigma); @@ -48,7 +48,7 @@ fn main() { model.fit(); - for player in &["A", "B", "C", "D", "E", "F"] { + for player in ["A", "B", "C", "D", "E", "F"] { let (mu, sigma) = model.item_score(player, 1.25); println!("{}: mu={} sigma={}", player, mu, sigma); @@ -58,7 +58,7 @@ fn main() { model.fit(); - for player in &["A", "B", "C", "D", "E", "F"] { + for player in ["A", "B", "C", "D", "E", "F"] { let (mu, sigma) = model.item_score(player, 1.25); println!("{}: mu={} sigma={}", player, mu, sigma); diff --git a/src/fitter/recursive.rs b/src/fitter/recursive.rs index b9039c7..2993dfb 100644 --- a/src/fitter/recursive.rs +++ b/src/fitter/recursive.rs @@ -7,6 +7,7 @@ use crate::kernel::Kernel; use super::Fitter; +#[derive(Clone)] pub struct Recursive { ts_new: Vec, kernel: K, @@ -232,7 +233,7 @@ impl Fitter for Recursive { self.ts .iter() .position(|tc| t <= tc) - .unwrap_or_else(|| self.ts.len()) + .unwrap_or(self.ts.len()) }); for (i, nxt) in locations.into_iter().enumerate() { @@ -415,7 +416,7 @@ mod tests { } fn data_loglik() -> f64 { - -17.357282245711051 + -17.35728224571105 } fn data_ts_pred() -> &'static [f64] { diff --git a/src/storage.rs b/src/storage.rs index 526848b..154c4de 100644 --- a/src/storage.rs +++ b/src/storage.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use crate::item::Item; /* -pub trait Storage { +pub trait Backend { type Key; type IterKeys: