Two other methods impacted by change to method signature of Oscillati…

…on2012 Issue #500 Two other methods impacted by change to method signature of Oscillation2012 and change of min/maxOscFreq from int to double?
QutEcoacoustics · Jun 28, 2021 · 0b46e3b · 0b46e3b
1 parent 84c6ea2
commit 0b46e3b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/AudioAnalysisTools/Ocillations/Oscillations2019.cs b/src/AudioAnalysisTools/Ocillations/Oscillations2019.cs
@@ -25,8 +25,8 @@ public static void Execute(
             int maxHz,
             double decibelThreshold,
             double dctDuration,
-            int minOscFreq,
-            int maxOscFreq,
+            double minOscFreq,
+            double maxOscFreq,
             double dctThreshold,
             double scoreThreshold,
             double minDuration,
@@ -68,12 +68,14 @@ public static void Execute(
 
             events = Oscillations2012.ConvertOscillationScores2Events(
                 sonogram,
-                dctScores,
+                minDuration,
+                maxDuration,
                 minHz,
                 maxHz,
+                minOscFreq,
+                maxOscFreq,
+                dctScores,
                 scoreThreshold,
-                minDuration,
-                maxDuration,
                 segmentStartOffset);
         }
 

diff --git a/tests/Acoustics.Test/AnalysisPrograms/Recognizers/PteropusSpTests.cs b/tests/Acoustics.Test/AnalysisPrograms/Recognizers/PteropusSpTests.cs
@@ -69,15 +69,15 @@ public void TestGetWingBeatEvents()
             // Look for wing beats using oscillation detector
             Oscillations2012.Execute(
                 (SpectrogramStandard)this.sonogram,
+                minDurationSeconds,
+                maxDurationSeconds,
                 minHz,
                 maxHz,
+                minOscilFreq,
+                maxOscilFreq,
                 dctDuration,
-                (int)Math.Floor(minOscilFreq),
-                (int)Math.Floor(maxOscilFreq),
                 dctThreshold,
                 eventThreshold,
-                minDurationSeconds,
-                maxDurationSeconds,
                 out var bandDecibels,
                 out var oscScores,
                 out var acousticEvents,