General bug fixes for recognizers

Reorganized config recognizers to simplify layout and prevent confusing errors. Also discovered event files were not being serialized properly. Fixed with a cast.
QutEcoacoustics · Mar 15, 2018 · 668d06b · 668d06b
1 parent 5d6368f
commit 668d06b
Show file tree

Hide file tree

Showing 32 changed files with 58 additions and 58 deletions.
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Ecosounds.MultiRecognizer.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Ecosounds.MultiRecognizer.yml
@@ -44,5 +44,5 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/EcosoundsFW.MultiRecognizer.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/EcosoundsFW.MultiRecognizer.yml
@@ -34,5 +34,5 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Stark.CriniaTinnula.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Stark.CriniaTinnula.yml
@@ -72,6 +72,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Stark.LitoriaFreycineti.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Stark.LitoriaFreycineti.yml
@@ -81,6 +81,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Stark.LitoriaOlong.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Stark.LitoriaOlong.yml
@@ -49,6 +49,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.ArdeaInsignis.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.ArdeaInsignis.yml
@@ -44,6 +44,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.CriniaRemota.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.CriniaRemota.yml
@@ -39,6 +39,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.CycloranaNovaehollandiae.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.CycloranaNovaehollandiae.yml
@@ -47,6 +47,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.IctalurusFurcatus.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.IctalurusFurcatus.yml
@@ -46,6 +46,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LewiniaPectoralis.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LewiniaPectoralis.yml
@@ -52,6 +52,6 @@ DisplayCsvImage: false
 
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LimnodynastesConvex.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LimnodynastesConvex.yml
@@ -36,6 +36,5 @@ SaveSonogramImages: Never
 # DisplayCsvImage is obsolete - ensure it remains set to: false
 DisplayCsvImage: false
 
-IndexPropertiesConfig: ".\\IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaBicolor.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaBicolor.yml
@@ -47,6 +47,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaCaerulea.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaCaerulea.yml
@@ -43,6 +43,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaFallax.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaFallax.yml
@@ -81,6 +81,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaInermis.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaInermis.yml
@@ -47,6 +47,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaMicrobelos.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaMicrobelos.yml
@@ -47,6 +47,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaNasuta.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaNasuta.yml
@@ -42,6 +42,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaNasutaOLD.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaNasutaOLD.yml
@@ -46,6 +46,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaPallida.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaPallida.yml
@@ -45,6 +45,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaRothii.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaRothii.yml
@@ -50,6 +50,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaRubella.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaRubella.yml
@@ -46,6 +46,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaWatjulumOLD.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaWatjulumOLD.yml
@@ -45,6 +45,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaWatjulumensis.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.LitoriaWatjulumensis.yml
@@ -43,6 +43,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.PlatyplectrumOrnatum.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.PlatyplectrumOrnatum.yml
@@ -35,5 +35,5 @@ SaveSonogramImages: Never
 DisplayCsvImage: false
 
 IndexPropertiesConfig: ".\\IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.RhinellaMarina.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.RhinellaMarina.yml
@@ -43,6 +43,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.UperoleiaLithomoda.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.UperoleiaLithomoda.yml
@@ -36,5 +36,5 @@ SaveSonogramImages: Never
 DisplayCsvImage: false
 
 IndexPropertiesConfig: ".\\IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.UperoleiaMimula.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.UperoleiaMimula.yml
@@ -47,6 +47,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Truskinger.ExempliGratia.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Truskinger.ExempliGratia.yml
@@ -65,6 +65,6 @@ DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
 # Other config files to reference
-IndexPropertiesConfig: "./IndexPropertiesConfigHiRes.yml"
-HighResolutionIndicesConfig: "./Towsey.AcousticHiResIndicesForRecognisers.yml"
+
+HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...
diff --git a/...sisConfigFiles/SpectrogramConfigHiRes.yml → .../SpectrogramFalseColourConfig.HighRes.yml b/...sisConfigFiles/SpectrogramConfigHiRes.yml → .../SpectrogramFalseColourConfig.HighRes.yml
diff --git a/...ey.AcousticHiResIndicesForRecognisers.yml → ...y.Acoustic.HiResIndicesForRecognisers.yml b/...ey.AcousticHiResIndicesForRecognisers.yml → ...y.Acoustic.HiResIndicesForRecognisers.yml
@@ -55,7 +55,7 @@ LowResColourMap1: ACI-ENT-EVN
 LowResColourMap2: BGN-POW-EVN
 
 
-IndexPropertiesConfig: './IndexPropertiesConfigHiRes.yml'
+IndexPropertiesConfig: './IndexPropertiesConfig.HiRes.yml'
 SpectrogramConfig: './SpectrogramConfigHiRes.yml'
 ...
 
diff --git a/src/AnalysisPrograms/Recognizers/Base/RecognizerBase.cs b/src/AnalysisPrograms/Recognizers/Base/RecognizerBase.cs
@@ -299,7 +299,7 @@ private void SummarizeHighResolutionIndices(
 
         public override void WriteEventsFile(FileInfo destination, IEnumerable<EventBase> results)
         {
-            Csv.WriteToCsv(destination, results);
+            Csv.WriteToCsv(destination, results.Select(x => (AcousticEvent)x));
         }
 
         public override void WriteSummaryIndicesFile(FileInfo destination, IEnumerable<SummaryIndexBase> results)

diff --git a/src/AudioAnalysisTools/LongDurationSpectrograms/LDSpectrogramConfig.cs b/src/AudioAnalysisTools/LongDurationSpectrograms/LDSpectrogramConfig.cs
@@ -10,13 +10,14 @@ namespace AudioAnalysisTools.LongDurationSpectrograms
     using System.Collections.Generic;
     using System.IO;
     using Acoustics.Shared;
+    using Acoustics.Shared.ConfigFile;
     using Newtonsoft.Json;
     using YamlDotNet.Serialization;
 
     /// <summary>
     /// CONFIG CLASS FOR the class LDSpectrogramRGB
     /// </summary>
-    public class LdSpectrogramConfig
+    public class LdSpectrogramConfig : Config
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LdSpectrogramConfig"/> class.
@@ -105,7 +106,7 @@ public double CalculateYAxisTickInterval(double sampleRate, double frameWidth)
         /// </returns>
         public static LdSpectrogramConfig ReadYamlToConfig(FileInfo path)
         {
-            var config = Yaml.Deserialize<LdSpectrogramConfig>(path);
+            var config = ConfigFile.Deserialize<LdSpectrogramConfig>(path);
             return config;
         }