From a5c6e8b8a26e628b955eae9ed7f2737a08cc566e Mon Sep 17 00:00:00 2001 From: Anders Olsson Date: Mon, 16 May 2022 10:40:28 +0200 Subject: [PATCH] Fix issue with kernel macro --- Cargo.toml | 12 ++++++------ src/kernel.rs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5c08bf7..331f53e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -lapacke = "0.5" -ndarray = { version = "0.15", features = ["approx", "blas"] } +lapacke = "0.5.0" +ndarray = { version = "0.15.4", features = ["approx", "blas"] } [dev-dependencies] approx = "0.4" -blas-src = { version = "0.8", features = ["openblas"] } -openblas-src = { version = "0.10", features = ["cblas", "system"] } -rand = "0.8" -time = { version = "0.3", features = ["parsing", "macros"] } +blas-src = { version = "0.8.0", features = ["openblas"] } +openblas-src = { version = "0.10.4", features = ["cblas", "system"] } +rand = "0.8.5" +time = { version = "0.3.9", features = ["parsing", "macros"] } diff --git a/src/kernel.rs b/src/kernel.rs index 3ca1bd3..94cc591 100644 --- a/src/kernel.rs +++ b/src/kernel.rs @@ -558,7 +558,7 @@ macro_rules! tuple_impls { fn state_mean(&self, t: f64) -> Array1 { let ($($name,)+) = &self; - Array1::from_iter([$($name.state_mean(t).into_iter(),)+].into_iter().flatten().cloned()) + Array1::from_iter([$($name.state_mean(t).into_iter(),)+].into_iter().flatten()) } fn state_cov(&self, t: f64) -> Array2 { @@ -590,7 +590,7 @@ macro_rules! tuple_impls { fn measurement_vector(&self) -> Array1 { let ($($name,)+) = &self; - Array1::from_iter([$($name.measurement_vector().into_iter(),)+].into_iter().flatten().cloned()) + Array1::from_iter([$($name.measurement_vector().into_iter(),)+].into_iter().flatten()) } fn feedback(&self) -> Array2 {