Change Scale Type names

Issue #332 Change names of hte main frequency scale types and remove old methods that used to do tests.
QutEcoacoustics · Aug 4, 2020 · e847cb7 · e847cb7
1 parent ea1e55f
commit e847cb7
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 340 deletions.
diff --git a/src/AudioAnalysisTools/DSP/DSP_Filters.cs b/src/AudioAnalysisTools/DSP/DSP_Filters.cs
@@ -78,7 +78,7 @@ public static void TestMethod_GenerateSignal2()
             int sampleRate = 64000;
             double duration = 30; // signal duration in seconds
             int[] harmonics = { 500, 1000, 2000, 4000, 8000 };
-            var freqScale = new FrequencyScale(FreqScaleType.Linear125Octaves7Tones28Nyquist32000);
+            var freqScale = new FrequencyScale(FreqScaleType.Linear125OctaveTones28Nyquist32000);
             string path = @"C:\SensorNetworks\Output\Sonograms\UnitTestSonograms\SineSignal2.png";
             var recording = GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine);
 

diff --git a/src/AudioAnalysisTools/DSP/FrequencyScale.cs b/src/AudioAnalysisTools/DSP/FrequencyScale.cs
diff --git a/src/AudioAnalysisTools/Indices/IndexCalculate.cs b/src/AudioAnalysisTools/Indices/IndexCalculate.cs
@@ -159,14 +159,14 @@ public static IndexCalculateResult Analysis(
             // Linear or Octave or Mel frequency scale? Set Linear as default.
             var freqScale = new FrequencyScale(nyquist: nyquist, frameSize: frameSize, hertzGridInterval: 1000);
             var freqScaleType = config.FrequencyScale;
-            bool octaveScale = freqScaleType == FreqScaleType.Linear125Octaves7Tones28Nyquist32000;
+            bool octaveScale = freqScaleType == FreqScaleType.Linear125OctaveTones28Nyquist32000;
             bool melScale = freqScaleType == FreqScaleType.Mel;
             if (octaveScale)
             {
                 // only allow one octave scale at the moment - for Jasco marine recordings.
                 // ASSUME fixed Occtave scale - USEFUL ONLY FOR JASCO 64000sr MARINE RECORDINGS
                 // If you wish to use other octave scale types then need to put in the config file and and set up recovery here.
-                freqScale = new FrequencyScale(FreqScaleType.Linear125Octaves7Tones28Nyquist32000);
+                freqScale = new FrequencyScale(FreqScaleType.Linear125OctaveTones28Nyquist32000);
 
                 // Recalculate the spectrogram according to octave scale. This option works only when have high SR recordings.
                 dspOutput1.AmplitudeSpectrogram = OctaveFreqScale.AmplitudeSpectra(

diff --git a/src/AudioAnalysisTools/Indices/IndexCalculateConfig.cs b/src/AudioAnalysisTools/Indices/IndexCalculateConfig.cs
@@ -150,7 +150,7 @@ public FreqScaleType FrequencyScale
                 switch (value)
                 {
                     case FreqScaleType.Linear:
-                    case FreqScaleType.Octave:
+                    case FreqScaleType.LinearOctaveStandard:
                         this.frequencyScale = value;
                         break;
                     default:

diff --git a/src/AudioAnalysisTools/LongDurationSpectrograms/LDSpectrogramRGB.cs b/src/AudioAnalysisTools/LongDurationSpectrograms/LDSpectrogramRGB.cs
@@ -195,13 +195,13 @@ public LDSpectrogramRGB(LdSpectrogramConfig config, IndexGenerationData indexGen
 
                 //break;
                 case "Linear62Octaves7Tones31Nyquist11025":
-                    fst = FreqScaleType.Linear62Octaves7Tones31Nyquist11025;
+                    fst = FreqScaleType.Linear62OctaveTones31Nyquist11025;
                     this.FreqScale = new FrequencyScale(fst);
                     throw new ArgumentException("Linear62Octaves7Tones31Nyquist11025 Scale is not yet implemented");
 
                 //break;
                 case "Linear125Octaves6Tones30Nyquist11025":
-                    fst = FreqScaleType.Linear125Octaves6Tones30Nyquist11025;
+                    fst = FreqScaleType.Linear125OctaveTones30Nyquist11025;
                     this.FreqScale = new FrequencyScale(fst);
                     break;
                 case "Octaves24Nyquist32000":
@@ -211,7 +211,7 @@ public LDSpectrogramRGB(LdSpectrogramConfig config, IndexGenerationData indexGen
 
                 //break;
                 case "Linear125Octaves7Tones28Nyquist32000":
-                    fst = FreqScaleType.Linear125Octaves7Tones28Nyquist32000;
+                    fst = FreqScaleType.Linear125OctaveTones28Nyquist32000;
                     this.FreqScale = new FrequencyScale(fst);
                     break;
                 default:

diff --git a/src/AudioAnalysisTools/SpectralPeakTracks.cs b/src/AudioAnalysisTools/SpectralPeakTracks.cs
@@ -388,7 +388,7 @@ public static SpectralPeakTracks CalculateSpectralPeakTracks(AudioRecording reco
             double[,] decibelSpectrogram;
             if (octaveScale)
             {
-                var freqScale = new FrequencyScale(FreqScaleType.Linear125Octaves7Tones28Nyquist32000);
+                var freqScale = new FrequencyScale(FreqScaleType.Linear125OctaveTones28Nyquist32000);
                 decibelSpectrogram = OctaveFreqScale.DecibelSpectra(dspOutput.AmplitudeSpectrogram, dspOutput.WindowPower, sampleRate, epsilon, freqScale);
             }
             else

diff --git a/tests/Acoustics.Test/AnalysisPrograms/AnalyzeLongRecordings/TestAnalyzeLongRecording.cs b/tests/Acoustics.Test/AnalysisPrograms/AnalyzeLongRecordings/TestAnalyzeLongRecording.cs
@@ -154,7 +154,7 @@ public void TestAnalyzeSr64000Recording()
             var recordingPath = this.outputDirectory.CombineFile(recordingName + ".wav");
             WavWriter.WriteWavFileViaFfmpeg(recordingPath, recording.WavReader);
 
-            var fst = FreqScaleType.Linear125Octaves7Tones28Nyquist32000;
+            var fst = FreqScaleType.Linear125OctaveTones28Nyquist32000;
             var freqScale = new FrequencyScale(fst);
 
             /*