Fix merge commit, add noise reduction type to generic recognizer

QutEcoacoustics · Apr 9, 2021 · c2e49ab · c2e49ab
1 parent a89b786
commit c2e49ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/docs/technical/apidoc/HarmonicParameters.md b/docs/technical/apidoc/HarmonicParameters.md
@@ -52,4 +52,4 @@ at that index is the formant amplitude. The index with largest amplitude
 indicates the likely formant gap, but `DctThreshold` sets the minimum
 acceptable amplitude value. Lowering `DctThreshold` increases the likelihood
 that random noise will be accepted as a true set of formants; increasing
-`DctThreshold` increases the likelihood that a target set of formants is rejected.
+`DctThreshold` increases the likelihood that a target set of formants is rejected.
diff --git a/src/AnalysisPrograms/Recognizers/GenericRecognizer.cs b/src/AnalysisPrograms/Recognizers/GenericRecognizer.cs
@@ -193,7 +193,6 @@ public override RecognizerResults Recognize(
                     }
                 }
             }
-
             return results;
         }
 
@@ -461,7 +460,7 @@ private static SonogramConfig ParametersToSonogramConfig(CommonParameters common
                 WindowStep = windowStep,
                 WindowOverlap = (windowSize - windowStep) / (double)windowSize,
                 WindowFunction = common.WindowFunction?.ToString(),
-                NoiseReductionType = NoiseReductionType.Standard,
+                NoiseReductionType = common.NoiseReductionType ?? NoiseReductionType.Standard,
                 NoiseReductionParameter = common.BgNoiseThreshold ?? 0.0,
             };
         }

diff --git a/src/AudioAnalysisTools/CommonParameters.cs b/src/AudioAnalysisTools/CommonParameters.cs
@@ -4,6 +4,7 @@
 
 namespace AnalysisPrograms.Recognizers.Base
 {
+    using AudioAnalysisTools.DSP;
     using TowseyLibrary;
 
     /// <summary>
@@ -81,5 +82,12 @@ public abstract class CommonParameters
         /// Units are decibels.
         /// </summary>
         public double?[] DecibelThresholds { get; set; }
+
+        /// <summary>
+        /// The type of noise reduction to use.
+        /// Defaults to <see cref="NoiseReductionType.Standard"/>.
+        /// </summary>
+        /// <value>One of the <see cref="NoiseReductionType"/> values.</value>
+        public NoiseReductionType? NoiseReductionType { get; set; }
     }
 }