Patched EPR to work as IAnalyzer

Original hash: 249d1a5
QutEcoacoustics · May 26, 2015 · 1af6900 · 1af6900
1 parent 5cde607
commit 1af6900
Show file tree

Hide file tree

Showing 5 changed files with 185 additions and 102 deletions.
diff --git a/AudioAnalysis/AnalysisBase/AnalysisSettings.cs b/AudioAnalysis/AnalysisBase/AnalysisSettings.cs
@@ -54,6 +54,10 @@ public AnalysisSettings()
         {
             this.ConfigDict = new Dictionary<string, string>();
             this.SegmentTargetSampleRate = AppConfigHelper.DefaultTargetSampleRate;
+            this.SegmentMaxDuration = TimeSpan.FromMinutes(1);
+            this.SegmentMinDuration = TimeSpan.FromSeconds(20);
+            this.SegmentMediaType = MediaTypes.MediaTypeWav;
+            this.SegmentOverlapDuration = TimeSpan.Zero;
         }
 
         /// <summary>

diff --git a/AudioAnalysis/AnalysisConfigFiles/Ecosounds.GroundParrot.yml b/AudioAnalysis/AnalysisConfigFiles/Ecosounds.GroundParrot.yml
@@ -0,0 +1,17 @@
+---
+## General Parameters
+AnalysisName: Ecosounds.GroundParrot
+ResampleRate: 22050
+
+# default value is 4.0/15.0 = 0.2666
+EprNormalizedMinScore: ~
+
+## IAnalyzer Settings
+SaveIntermediateWavFiles: false
+SaveIntermediateCsvFiles: true
+SaveSonogramImages: true
+ParallelProcessing: true
+
+IndexPropertiesConfig: ".\\IndexPropertiesConfig.yml"
+AedConfig: ".\\Ecosounds.AED.yml"
+...
diff --git a/AudioAnalysis/AnalysisPrograms/AED.cs b/AudioAnalysis/AnalysisPrograms/AED.cs
@@ -115,9 +115,6 @@ public override AnalysisSettings DefaultSettings
                                SegmentMinDuration = TimeSpan.FromSeconds(20), 
                                SegmentMediaType = MediaTypes.MediaTypeWav, 
                                SegmentOverlapDuration = TimeSpan.Zero, 
-
-                               // TODO: retrieve from app config after merge
-                               SegmentTargetSampleRate = 22050
                            };
             }
         }