From a26c2acc49a03b544d54a088b660618b5de9a64c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Tue, 26 Dec 2017 14:02:25 +0200 Subject: Updated GTK version and fixed linting issues from Clippy --- src/transforms.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/transforms.rs') diff --git a/src/transforms.rs b/src/transforms.rs index caa1480..a5df637 100644 --- a/src/transforms.rs +++ b/src/transforms.rs @@ -116,10 +116,10 @@ mod tests { use std::f32::consts::PI; const SAMPLE_RATE: f32 = 44100.0; - const FRAMES: usize = 512; + const FRAMES: u16 = 512; fn frequency_resolution() -> f32 { - SAMPLE_RATE / 2.0 / FRAMES as f32 + SAMPLE_RATE / 2.0 / f32::from(FRAMES) } fn sin_arg(f: f32, t: f32, phase: f32) -> f32 { @@ -129,14 +129,14 @@ mod tests { fn sample_sinusoud(amplitude: f32, frequency: f32, phase: f32) -> Vec { (0..FRAMES) .map(|x| { - let t = x as f32 / SAMPLE_RATE; + let t = f32::from(x) / SAMPLE_RATE; sin_arg(frequency, t, phase).sin() * amplitude }).collect() } #[test] fn correlation_on_sine_wave() { - let frequency = 440.0 as f32; //concert A + let frequency = 440.0f32; //concert A let samples = sample_sinusoud(1.0, frequency, 0.0); let fundamental = find_fundamental_frequency(&samples, SAMPLE_RATE).expect("Find fundamental returned None"); -- cgit v1.2.3