From 5f7cc2df7953c150d631e0f2efa5fbd5d686efce Mon Sep 17 00:00:00 2001 From: HEnquist Date: Wed, 7 Oct 2020 22:31:59 +0200 Subject: [PATCH] Bump num-complex to 0.3, transpose to 0.2 --- Cargo.toml | 6 +++--- src/algorithm/dft.rs | 2 +- src/twiddles.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8340ed62..878bde9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,11 +12,11 @@ categories = ["algorithms", "compression", "multimedia::encoding", "science"] license = "MIT OR Apache-2.0" [dependencies] -num-complex = "0.2" +num-complex = "0.3" +num-integer = "0.1.43" num-traits = "0.2" -num-integer = "0.1" strength_reduce = "^0.2.1" -transpose = "0.1" +transpose = "0.2" [dev-dependencies] rand = "0.5" diff --git a/src/algorithm/dft.rs b/src/algorithm/dft.rs index 523b9969..4850d11e 100644 --- a/src/algorithm/dft.rs +++ b/src/algorithm/dft.rs @@ -100,7 +100,7 @@ mod unit_tests { let mut sum = Zero::zero(); for (i, &x) in signal.iter().enumerate() { let angle = -1f32 * (i * k) as f32 * 2f32 * f32::consts::PI / signal.len() as f32; - let twiddle = Complex::from_polar(&1f32, &angle); + let twiddle = Complex::from_polar(1f32, angle); sum = sum + twiddle * x; } diff --git a/src/twiddles.rs b/src/twiddles.rs index ae283110..d05d4c3a 100644 --- a/src/twiddles.rs +++ b/src/twiddles.rs @@ -18,7 +18,7 @@ pub fn single_twiddle(i: usize, fft_len: usize, inverse: bool) -> Com -2f64 * f64::consts::PI }; - let c = Complex::from_polar(&One::one(), &(constant * i as f64 / fft_len as f64)); + let c = Complex::from_polar(One::one(), constant * i as f64 / fft_len as f64); Complex { re: FromPrimitive::from_f64(c.re).unwrap(), @@ -51,7 +51,7 @@ mod unit_tests { for len in 1..10 { let actual: Vec> = generate_twiddle_factors(len, false); - let expected: Vec> = (0..len).map(|i| Complex::from_polar(&1f32, &(constant * i as f32 / len as f32))).collect(); + let expected: Vec> = (0..len).map(|i| Complex::from_polar(1f32, constant * i as f32 / len as f32)).collect(); assert!(compare_vectors(&actual, &expected), "len = {}", len) }