copy-paste issue 23

alesgenova#23 (comment)

src/detector/internals.rs

@@ -97,8 +97,34 @@ pub fn autocorrelation<T>(
     inv_fft.process_with_scratch(signal_complex, scratch_complex);
     copy_complex_to_real(signal_complex, result, ComplexComponent::Re);
 }
+pub fn pitch_from_peaks(
+    input: &[T],
+    sample_rate: usize,
+    clarity_threshold: T,
+    pick_threshold: T,
+    correction: PeakCorrection,
+) -> Option<Pitch>
+where
+    T: Float,
+{
+    let sample_rate = T::from_usize(sample_rate).unwrap();
+    let peaks = detect_peaks(input);
+    let peaks2 = detect_peaks(input);
+    let maxpeak = peaks2.max_by(|x, y| x.1.partial_cmp(&y.1).unwrap_or_else(|| Ordering::Equal));
+    let thresh2 = match maxpeak {
+        None => T::from(0).unwrap(),
+        Some(p) => p.1 * pick_threshold,
+    };
+    choose_peak(peaks, thresh2, clarity_threshold)
+        .map(|peak| correct_peak(peak, input, correction))
+        .map(|peak| Pitch {
+            frequency: sample_rate / peak.0,
+            clarity: peak.1 / input[0],
+        })
+}
+
 
-pub fn pitch_from_peaks<T>(
+pub fn OLD_pitch_from_peaks<T>(
     input: &[T],
     sample_rate: usize,
     clarity_threshold: T,

src/utils/peak.rs

@@ -91,6 +91,14 @@ pub fn detect_peaks<'a, T: Float>(arr: &'a [T]) -> impl Iterator<Item = (usize,
 pub fn choose_peak<I: Iterator<Item = (usize, T)>, T: Float>(
     mut peaks: I,
     threshold: T,
+    threshold2: T,
+) -> Option<(usize, T)> {
+    peaks.find(|p| p.1 > threshold && p.1 > threshold2)
+}
+
+pub fn OLD_choose_peak<I: Iterator<Item = (usize, T)>, T: Float>(
+    mut peaks: I,
+    threshold: T,
 ) -> Option<(usize, T)> {
     peaks.find(|p| p.1 > threshold)
 }