Merge pull request #272 from QutEcoacoustics/Issue-#238_FlyingFoxReco…

…gnizer Closes #238 flying fox recognizer Also included an attempt at a new oscillation index.
QutEcoacoustics · Nov 14, 2019 · 8b68587 · 8b68587
2 parents cc8b834 + ed54c06
commit 8b68587
Show file tree

Hide file tree

Showing 13 changed files with 690 additions and 451 deletions.
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.PteropusSpecies.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.PteropusSpecies.yml
@@ -32,8 +32,9 @@ Profiles:
   Wingbeats:
     MinHz: 200          
     MaxHz: 2000
+    DecibelThreshold: 6.0
     # duration of DCT in seconds 
-    DctDuration: 0.8
+    DctDuration: 0.5
     # minimum acceptable value of a DCT coefficient
     DctThreshold: 0.5
     # ignore oscillation rates below the min & above the max threshold
@@ -46,7 +47,7 @@ Profiles:
     MinDuration: 1.0
     MaxDuration: 10.0
     # Event threshold - use this to determine FP / FN trade-off for events.
-    EventThreshold: 0.60
+    EventThreshold: 0.5
   #Agonist:
   # This notation means the Groote profile has all of the settings that the Standard profile has,
   # however, the MinHz and MaxHz properties have been overridden.

diff --git a/src/AnalysisPrograms/Recognizers/LitoriaCaerulea.cs b/src/AnalysisPrograms/Recognizers/LitoriaCaerulea.cs
@@ -1,4 +1,4 @@
-// --------------------------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 // <copyright file="LitoriaCaerulea.cs" company="QutEcoacoustics">
 // All code in this file and all associated files are the copyright and property of the QUT Ecoacoustics Research Group (formerly MQUTeR, and formerly QUT Bioacoustics Research Group).
 // </copyright>
@@ -193,7 +193,7 @@ public override RecognizerResults Recognize(AudioRecording recording, Config con
             double dctThreshold = recognizerConfig.DctThreshold;
             double minOscRate = 1 / recognizerConfig.MaxPeriod;
             double maxOscRate = 1 / recognizerConfig.MinPeriod;
-            var dctScores = Oscillations2012.DetectOscillations(croakScoreArray, framesPerSecond, dctDuration, minOscRate, maxOscRate, dctThreshold);
+            Oscillations2019.DetectOscillations(croakScoreArray, framesPerSecond, decibelThreshold, dctDuration, minOscRate, maxOscRate, dctThreshold, out double[] dctScores, out double[] oscFreq);
 
             // ######################################################################
             // ii: DO THE ANALYSIS AND RECOVER SCORES OR WHATEVER

diff --git a/src/AnalysisPrograms/Recognizers/PteropusSpecies.cs b/src/AnalysisPrograms/Recognizers/PteropusSpecies.cs
diff --git a/src/AnalysisPrograms/Sandpit.cs b/src/AnalysisPrograms/Sandpit.cs
@@ -291,11 +291,14 @@ public static void Audio2CsvOverOneFile()
 
             // FLYING FOX RECORDINGS
             //string recordingPath = @"C:\Ecoacoustics\WavFiles\BradLawData\FlyingFox\20190127_Bellingen_Feeding_SM4.wav";
-            //string recordingPath = @"C:\Ecoacoustics\WavFiles\FlyingFox\20190115_Bellingen_Feeding.wav";
+            string recordingPath = @"D:\Ecoacoustics\WavFiles\FlyingFox\20190115_Bellingen_Feeding.wav";
+            //string recordingPath = @"C:\Ecoacoustics\WavFiles\FlyingFox\20190115_Bellingen_Feeding_minute6.wav";
+            //string recordingPath = @"C:\Ecoacoustics\WavFiles\FlyingFox\20190115_Bellingen_Feeding_minute6_OneChannel22050.wav";
             //string recordingPath = @"C:\Ecoacoustics\WavFiles\FlyingFox\20190121_2_Bellingen_Feeding.wav";
-            string recordingPath = @"C:\Ecoacoustics\WavFiles\FlyingFox\20190127_Bellingen_Feeding_SM4.wav";
+            //string recordingPath = @"C:\Ecoacoustics\WavFiles\FlyingFox\20190127_Bellingen_Feeding_SM4.wav";
             string configPath = @"C:\Work\GitHub\audio-analysis\src\AnalysisConfigFiles\RecognizerConfigFiles\Towsey.PteropusSpecies.yml";
-            string outputPath = @"C:\Ecoacoustics\Output\BradLaw\FlyingFox";
+            //string outputPath = @"C:\Ecoacoustics\Output\BradLaw\FlyingFox";
+            string outputPath = @"C:\Ecoacoustics\FlyingFox";
 
             // TSHERING DEMA BHUTAN RECORDINGS
             //string recordingPath = @"C:\SensorNetworks\WavFiles\TsheringDema\WBH12HOURS-D_20160403_120000.wav";
@@ -358,7 +361,6 @@ public static void Audio2CsvOverOneFile()
             //string outputPath = @"C:\Ecoacoustics\Output\Test\Test24HourRecording\Delete";
             //string configPath = @"C:\Work\GitHub\audio-analysis\src\AnalysisConfigFiles\Towsey.Acoustic.yml";
 
-
             // Ivan Campos recordings
             //string recordingPath = @"G:\SensorNetworks\WavFiles\Ivancampos\INCIPO01_20161031_024006_898.wav";
             //string outputPath = @"G:\SensorNetworks\Output\IvanCampos\17";
@@ -420,7 +422,7 @@ public static void Audio2CsvOverOneFile()
             //string outputPath = @"C:\Ecoacoustics\Output\SERF\SERFIndicesNew_2013June19";
             //string configPath = @"C:\Work\GitHub\audio-analysis\src\AnalysisConfigFiles\Towsey.Acoustic.yml";
 
-          // USE 24-hour data or parts of from MEZ, TASMAn ISLAND, liz Znidersic
+            // USE 24-hour data or parts of from MEZ, TASMAn ISLAND, liz Znidersic
             // these are six hour recordings
             //string recordingPath = @"C:\Ecoacoustics\WavFiles\LizZnidersic\TasmanIsland2015_Unit2_Mez\SM304256_0+1_20151114_031652.wav";
             //string outputPath = @"C:\Ecoacoustics\Output\Test\Test24HourRecording\TasmanIslandMez\04";