Fix tests for powerfull owl

Issue #370 efactor POwerful Owl test so that it accepts an array of decibel thresholds. The test results are no different after extensive refactoring.
QutEcoacoustics · Oct 14, 2020 · cbab908 · cbab908
1 parent 9df9bf5
commit cbab908
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 43 deletions.
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.NinoxStrenua.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.NinoxStrenua.yml
@@ -19,58 +19,24 @@ SegmentOverlap: 0
 # Each of these profiles will be analyzed
 # This profile is required for the species-specific recogniser and must have the current name.
 Profiles:
-    StrenuaSyllable6db: !ForwardTrackParameters
+    StrenuaSyllable: !ForwardTrackParameters
         ComponentName: RidgeTrack 
         SpeciesName: NinoxStrenua
         FrameSize: 1024
         FrameStep: 256
         WindowFunction: HANNING
-        DecibelThreshold: 6.0
+        DecibelThresholds:
+            - 6.0
+            - 12.0
+            - 18.0
+            - 24.0
+            - 30.0
         # min and max of the freq band to search
         MinHertz: 300          
         MaxHertz: 600
         MinDuration: 0.2
         MaxDuration: 0.9
-
-    StrenuaSyllable12db: !ForwardTrackParameters
-        ComponentName: RidgeTrack 
-        SpeciesName: NinoxStrenua
-        FrameSize: 1024
-        FrameStep: 256
-        WindowFunction: HANNING
-        DecibelThreshold: 12.0
-        # min and max of the freq band to search
-        MinHertz: 300          
-        MaxHertz: 600
-        MinDuration: 0.2
-        MaxDuration: 0.9
-
-    StrenuaSyllable24db: !ForwardTrackParameters
-        ComponentName: RidgeTrack 
-        SpeciesName: NinoxStrenua
-        FrameSize: 1024
-        FrameStep: 256
-        WindowFunction: HANNING
-        DecibelThreshold: 24.0
-        # min and max of the freq band to search
-        MinHertz: 300          
-        MaxHertz: 600
-        MinDuration: 0.2
-        MaxDuration: 0.9
-
-    StrenuaSyllable30db: !ForwardTrackParameters
-        ComponentName: RidgeTrack 
-        SpeciesName: NinoxStrenua
-        FrameSize: 1024
-        FrameStep: 256
-        WindowFunction: HANNING
-        DecibelThreshold: 30.0
-        # min and max of the freq band to search
-        MinHertz: 300          
-        MaxHertz: 600
-        MinDuration: 0.2
-        MaxDuration: 0.9
-
+
 #################### POST-PROCESSING of EVENTS ###################
 
 # The first two post-processing steps are to combine overlapping/proximal/sequential events 

diff --git a/tests/Acoustics.Test/AnalysisPrograms/Recognizers/PowerfulOwlTests.cs b/tests/Acoustics.Test/AnalysisPrograms/Recognizers/PowerfulOwlTests.cs
@@ -54,7 +54,7 @@ public void TestRecognizer()
 
             Assert.AreEqual(7, events.Count);
             Assert.IsNull(scoreTrack);
-            Assert.AreEqual(4, plots.Count);
+            Assert.AreEqual(5, plots.Count);
             Assert.AreEqual(2580, sonogram.FrameCount);
 
             Assert.IsInstanceOfType(events[1], typeof(CompositeEvent));