From 13a39ea20855ebaa5747caac47ce0177b3ff8a1d Mon Sep 17 00:00:00 2001 From: Stefan Kroboth Date: Fri, 3 Nov 2023 19:23:58 +0100 Subject: [PATCH] Clippy --- argmin/src/solver/conjugategradient/cg.rs | 4 ++-- argmin/src/solver/linesearch/morethuente.rs | 8 ++++---- argmin/src/solver/particleswarm/mod.rs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/argmin/src/solver/conjugategradient/cg.rs b/argmin/src/solver/conjugategradient/cg.rs index cb1bb7ccd..47276291c 100644 --- a/argmin/src/solver/conjugategradient/cg.rs +++ b/argmin/src/solver/conjugategradient/cg.rs @@ -247,10 +247,10 @@ mod tests { assert_relative_eq!(b[0], 1.0, epsilon = f64::EPSILON); assert_relative_eq!(b[1], 2.0, epsilon = f64::EPSILON); - let r0 = vec![2.0f64, 2.0]; + let r0 = [2.0f64, 2.0]; assert_relative_eq!(r0[0], r.as_ref().unwrap()[0], epsilon = f64::EPSILON); assert_relative_eq!(r0[1], r.as_ref().unwrap()[1], epsilon = f64::EPSILON); - let pp = vec![-2.0f64, -2.0]; + let pp = [-2.0f64, -2.0]; assert_relative_eq!(pp[0], p.as_ref().unwrap()[0], epsilon = f64::EPSILON); assert_relative_eq!(pp[1], p.as_ref().unwrap()[1], epsilon = f64::EPSILON); assert_relative_eq!(rtr, 8.0, epsilon = f64::EPSILON); diff --git a/argmin/src/solver/linesearch/morethuente.rs b/argmin/src/solver/linesearch/morethuente.rs index db9fdead4..5c915bddd 100644 --- a/argmin/src/solver/linesearch/morethuente.rs +++ b/argmin/src/solver/linesearch/morethuente.rs @@ -544,7 +544,7 @@ fn cstep( info = 1; bound = true; let theta = float!(3.0) * (stx.fx - stp.fx) / (stp.x - stx.x) + stx.gx + stp.gx; - let tmp = vec![theta, stx.gx, stp.gx]; + let tmp = [theta, stx.gx, stp.gx]; // Check for a NaN or Inf in tmp before sorting if tmp.iter().any(|n| n.is_nan() || n.is_infinite()) { return Err(argmin_error!( @@ -578,7 +578,7 @@ fn cstep( info = 2; bound = false; let theta = float!(3.0) * (stx.fx - stp.fx) / (stp.x - stx.x) + stx.gx + stp.gx; - let tmp = vec![theta, stx.gx, stp.gx]; + let tmp = [theta, stx.gx, stp.gx]; // Check for a NaN or Inf in tmp before sorting if tmp.iter().any(|n| n.is_nan() || n.is_infinite()) { return Err(argmin_error!( @@ -612,7 +612,7 @@ fn cstep( info = 3; bound = true; let theta = float!(3.0) * (stx.fx - stp.fx) / (stp.x - stx.x) + stx.gx + stp.gx; - let tmp = vec![theta, stx.gx, stp.gx]; + let tmp = [theta, stx.gx, stp.gx]; // Check for a NaN or Inf in tmp before sorting if tmp.iter().any(|n| n.is_nan() || n.is_infinite()) { return Err(argmin_error!( @@ -662,7 +662,7 @@ fn cstep( bound = false; if brackt { let theta = float!(3.0) * (stp.fx - sty.fx) / (sty.x - stp.x) + sty.gx + stp.gx; - let tmp = vec![theta, sty.gx, stp.gx]; + let tmp = [theta, sty.gx, stp.gx]; // Check for a NaN or Inf in tmp before sorting if tmp.iter().any(|n| n.is_nan() || n.is_infinite()) { return Err(argmin_error!( diff --git a/argmin/src/solver/particleswarm/mod.rs b/argmin/src/solver/particleswarm/mod.rs index 8230252d6..42e1021fb 100644 --- a/argmin/src/solver/particleswarm/mod.rs +++ b/argmin/src/solver/particleswarm/mod.rs @@ -198,8 +198,8 @@ where let mut particles = positions .into_iter() - .zip(velocities.into_iter()) - .zip(costs.into_iter()) + .zip(velocities) + .zip(costs) .map(|((p, v), c)| Particle::new(p, c, v)) .collect::>();