max_min: increase step_size to 2

This brings another performance win of 5% while only losing accuracy on a negligible level.
phip1611 · May 4, 2024 · b537a84 · b537a84
1 parent 0d908eb
commit b537a84
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/beat_detector.rs b/src/beat_detector.rs
@@ -217,7 +217,7 @@ mod tests {
             //
             // As long as it is reasonable small, I think this is good, I guess?
             // [0]: https://electronics.stackexchange.com/questions/372692/low-pass-filter-delay
-            Some(942)
+            Some(943)
         );
         assert_eq!(detector.update_and_detect_beat(core::iter::empty()), None);
     }
@@ -245,13 +245,13 @@ mod tests {
         let mut detector = BeatDetector::new(header.sampling_rate as f32, false);
         assert_eq!(
             simulate_dynamic_audio_source(256, &samples, &mut detector),
-            &[830]
+            &[829]
         );
 
         let mut detector = BeatDetector::new(header.sampling_rate as f32, false);
         assert_eq!(
             simulate_dynamic_audio_source(2048, &samples, &mut detector),
-            &[830]
+            &[829]
         );
     }
 
@@ -263,7 +263,7 @@ mod tests {
         let mut detector = BeatDetector::new(header.sampling_rate as f32, false);
         assert_eq!(
             simulate_dynamic_audio_source(2048, &samples, &mut detector),
-            &[1310, 8639]
+            &[1311, 8639]
         );
     }
 
@@ -275,7 +275,7 @@ mod tests {
         let mut detector = BeatDetector::new(header.sampling_rate as f32, true);
         assert_eq!(
             simulate_dynamic_audio_source(2048, &samples, &mut detector),
-            &[12936, 93794, 101457, 189599, 270784, 278469]
+            &[12935, 93793, 101457, 189599, 270783, 278469]
         );
     }
 
@@ -287,7 +287,7 @@ mod tests {
         let mut detector = BeatDetector::new(header.sampling_rate as f32, false);
         assert_eq!(
             simulate_dynamic_audio_source(2048, &samples, &mut detector),
-            &[29077, 31225, 47052, 65812, 83769, 101994, 120138, 138130]
+            &[29077, 31225, 47051, 65813, 83769, 101995, 120139, 138129]
         );
     }
 
@@ -299,7 +299,7 @@ mod tests {
         let mut detector = BeatDetector::new(header.sampling_rate as f32, true);
         assert_eq!(
             simulate_dynamic_audio_source(2048, &samples, &mut detector),
-            &[31334, 47164, 65922, 84221, 102108, 120247, 138561]
+            &[31333, 47165, 65923, 84221, 102109, 120247, 138561]
         );
     }
 }
diff --git a/src/envelope_iterator.rs b/src/envelope_iterator.rs
@@ -338,7 +338,7 @@ mod tests {
             let peak_sample_index = 1430;
             assert_eq!(
                 find_descending_peak_trend_end(&history, peak_sample_index).map(|info| info.index),
-                Some(7098)
+                Some(7101)
             )
         }
         // sample1: double beat
@@ -351,13 +351,13 @@ mod tests {
             let peak_sample_index = 1634;
             assert_eq!(
                 find_descending_peak_trend_end(&history, peak_sample_index).map(|info| info.index),
-                Some(6974)
+                Some(6979)
             );
 
             let peak_sample_index = 8961;
             assert_eq!(
                 find_descending_peak_trend_end(&history, peak_sample_index).map(|info| info.index),
-                Some(16141)
+                Some(16142)
             );
         }
         // holiday: single beat
@@ -389,7 +389,7 @@ mod tests {
             .take(1)
             .map(|info| (info.from.index, info.to.index))
             .collect::<Vec<_>>();
-        assert_eq!(&envelopes, &[(410, 7098)])
+        assert_eq!(&envelopes, &[(411, 7098)])
     }
 
     #[test]
@@ -420,6 +420,6 @@ mod tests {
         let envelopes = EnvelopeIterator::new(&history, None)
             .map(|info| (info.from.index, info.to.index))
             .collect::<Vec<_>>();
-        assert_eq!(&envelopes, &[(256, 1971)]);
+        assert_eq!(&envelopes, &[(259, 1972)]);
     }
 }
diff --git a/src/max_min_iterator.rs b/src/max_min_iterator.rs
@@ -80,7 +80,7 @@ impl Iterator for MaxMinIterator<'_> {
             .take(sample_count)
             // TODO by increasing this, we also have high performance
             //  improvement chances.
-            .step_by(1)
+            .step_by(2)
             .max_by(|(_x_index, &x_value), (_y_index, &y_value)| {
                 if libm::fabsf(x_value) > libm::fabsf(y_value) {
                     Ordering::Greater
@@ -119,7 +119,7 @@ mod tests {
                 (543, 0.39106417),
                 (865, -0.068865016),
                 (1027, 0.24600971),
-                (1302, -0.3068636)
+                (1301, -0.30671102)
             ]
         );
     }