Shift two properties from DctParameters to OscillParameters

Issue #500: Shift Min and MaxOscillationFrequency properties from DctParameters to OscillParameters. These two are properties of an oscillation and not of a DCT.
QutEcoacoustics · Jun 28, 2021 · 943ac26 · 943ac26
1 parent 0b46e3b
commit 943ac26
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/AudioAnalysisTools/DctParameters.cs b/src/AudioAnalysisTools/DctParameters.cs
@@ -27,20 +27,6 @@ public abstract class DctParameters : CommonParameters
         /// <value>A value representing a minimum amplitude threshold in the range `[0, 1]`.</value>
         public double DctThreshold { get; set; } = 0.5;
 
-        /// <summary>
-        /// Gets or sets the minimum OSCILLATIONS PER SECOND
-        /// Ignore oscillation rates below the min amplitude above the max threshold.
-        /// </summary>
-        /// <value>The value in oscillations per second.</value>
-        public int MinOscillationFrequency { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum OSCILLATIONS PER SECOND
-        /// Ignore oscillation rates below the min &amp; above the max threshold.
-        /// </summary>
-        /// <value>The value in oscillations per second.</value>
-        public int MaxOscillationFrequency { get; set; }
-
         /// <summary>
         /// Gets or sets the Event threshold - use this to determine FP / FN trade-off for events.
         /// </summary>

diff --git a/src/AudioAnalysisTools/Ocillations/OscillationParameters.cs b/src/AudioAnalysisTools/Ocillations/OscillationParameters.cs
@@ -12,5 +12,18 @@ namespace AnalysisPrograms.Recognizers.Base
     [YamlTypeTag(typeof(OscillationParameters))]
     public class OscillationParameters : DctParameters
     {
+        /// <summary>
+        /// Gets or sets the minimum OSCILLATIONS PER SECOND
+        /// Ignore oscillation rates below the min threshold.
+        /// </summary>
+        /// <value>The value in oscillations per second.</value>
+        public double? MinOscillationFrequency { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum OSCILLATIONS PER SECOND
+        /// Ignore oscillation rates above the max threshold.
+        /// </summary>
+        /// <value>The value in oscillations per second.</value>
+        public double? MaxOscillationFrequency { get; set; }
     }
 }