From 71b795d9ed49177b66a4004eedc056c18266d248 Mon Sep 17 00:00:00 2001 From: Anders Olsson Date: Wed, 27 Oct 2021 11:33:54 +0200 Subject: [PATCH] Use array impl instead of vec --- examples/kickscore-basics.rs | 8 ++++---- examples/nba-history.rs | 2 +- src/utils.rs | 1 - tests/kickscore-basics.rs | 2 +- tests/nba-history.rs | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/kickscore-basics.rs b/examples/kickscore-basics.rs index 6c7b862..9aaee97 100644 --- a/examples/kickscore-basics.rs +++ b/examples/kickscore-basics.rs @@ -12,7 +12,7 @@ fn main() { let k_tom = ks::kernel::Exponential::new(1.0, 1.0); // Jerry's skill has a constant offset and smooth dynamics. - let k_jerry: Vec> = vec![ + let k_jerry: [Box; 2] = [ Box::new(ks::kernel::Constant::new(1.0)), Box::new(ks::kernel::Matern52::new(0.5, 1.0)), ]; @@ -37,20 +37,20 @@ fn main() { model.fit(); // We can predict a future outcome... - let (p_win, _p_los) = model.probabilities(&[&"Jerry"], &[&"Tom"], 4.0); + let (p_win, _p_los) = model.probabilities(&["Jerry"], &["Tom"], 4.0); println!( "Chances that Jerry beats Tom at t = 4.0: {:.1}%", 100.0 * p_win ); // ... or simulate what could have happened in the past. - let (p_win, _p_los) = model.probabilities(&[&"Jerry"], &[&"Tom"], 2.0); + let (p_win, _p_los) = model.probabilities(&["Jerry"], &["Tom"], 2.0); println!( "Chances that Jerry beats Tom at t = 2.0: {:.1}%", 100.0 * p_win ); - let (p_win, _p_los) = model.probabilities(&[&"Jerry"], &[&"Tom"], -1.0); + let (p_win, _p_los) = model.probabilities(&["Jerry"], &["Tom"], -1.0); println!( "Chances that Jerry beats Tom at t = -1.0: {:.1}%", 100.0 * p_win diff --git a/examples/nba-history.rs b/examples/nba-history.rs index f463724..9e70778 100644 --- a/examples/nba-history.rs +++ b/examples/nba-history.rs @@ -57,7 +57,7 @@ fn main() -> Result<(), Box> { let mut model = ks::model::Binary::new(ks::model::binary::Observation::Probit); for team in teams { - let kernel: Vec> = vec![ + let kernel: [Box; 2] = [ Box::new(ks::kernel::Constant::new(0.03)), Box::new(ks::kernel::Matern32::new(0.138, 1.753 * seconds_in_year)), ]; diff --git a/src/utils.rs b/src/utils.rs index ad8a4f2..a7a4834 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,4 +1,3 @@ -use std::cmp::Ordering; use std::f64::consts::{PI, SQRT_2, TAU}; use crate::math::erfc; diff --git a/tests/kickscore-basics.rs b/tests/kickscore-basics.rs index dcc7f98..e793656 100644 --- a/tests/kickscore-basics.rs +++ b/tests/kickscore-basics.rs @@ -11,7 +11,7 @@ fn kickscore_basic() { let k_tom = ks::kernel::Exponential::new(1.0, 1.0); - let k_jerry: Vec> = vec![ + let k_jerry: [Box; 2] = [ Box::new(ks::kernel::Constant::new(1.0)), Box::new(ks::kernel::Matern52::new(0.5, 1.0)), ]; diff --git a/tests/nba-history.rs b/tests/nba-history.rs index 3c67719..96da27f 100644 --- a/tests/nba-history.rs +++ b/tests/nba-history.rs @@ -61,7 +61,7 @@ fn nba_history() { let mut model = ks::model::Binary::new(ks::model::binary::Observation::Probit); for team in teams { - let kernel: Vec> = vec![ + let kernel: [Box; 2] = [ Box::new(ks::kernel::Constant::new(0.03)), Box::new(ks::kernel::Matern32::new(0.138, 1.753 * seconds_in_year)), ];