diff --git a/src/AudioAnalysisTools/Indices/IndexCalculate.cs b/src/AudioAnalysisTools/Indices/IndexCalculate.cs index 29d85bd31..05986e77c 100644 --- a/src/AudioAnalysisTools/Indices/IndexCalculate.cs +++ b/src/AudioAnalysisTools/Indices/IndexCalculate.cs @@ -387,8 +387,6 @@ public static IndexCalculateResult Analysis( deciBelSpectrogram = SNR.RemoveNeighbourhoodBackgroundNoise(deciBelSpectrogram, nhThreshold: 2.0); // iii: CALCULATE noise reduced AVERAGE DECIBEL SPECTRUM - // TODO: The method to calculate POW by averaging decibel values should be depracated. It is now replaced by index PMN. - spectralIndices.POW = SpectrogramTools.CalculateAvgSpectrumFromSpectrogram(deciBelSpectrogram); spectralIndices.PMN = SpectrogramTools.CalculateAvgDecibelSpectrumFromSpectrogram(deciBelSpectrogram); // iv: CALCULATE SPECTRAL COVER. diff --git a/tests/Acoustics.Test/AudioAnalysisTools/Indices/IndexCalculateTest.cs b/tests/Acoustics.Test/AudioAnalysisTools/Indices/IndexCalculateTest.cs index 7fad23be8..611fd1921 100644 --- a/tests/Acoustics.Test/AudioAnalysisTools/Indices/IndexCalculateTest.cs +++ b/tests/Acoustics.Test/AudioAnalysisTools/Indices/IndexCalculateTest.cs @@ -1,4 +1,4 @@ -// +// // All code in this file and all associated files are the copyright and property of the QUT Ecoacoustics Research Group (formerly MQUTeR, and formerly QUT Bioacoustics Research Group). // @@ -183,13 +183,6 @@ public void TestOfSpectralIndices() expectedVector = Binary.Deserialize(expectedSpectrumFile); CollectionAssert.That.AreEqual(expectedVector, spectralIndices.EVN, AllowedDelta); - // POW - expectedSpectrumFile = new FileInfo(resourcesDir + "\\POW.bin"); - - // Binary.Serialize(expectedSpectrumFile, spectralIndices.POW); - expectedVector = Binary.Deserialize(expectedSpectrumFile); - CollectionAssert.That.AreEqual(expectedVector, spectralIndices.POW, AllowedDelta); - // RHZ expectedSpectrumFile = new FileInfo(resourcesDir + "\\RHZ.bin"); diff --git a/tests/Acoustics.Test/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomCommonTests.cs b/tests/Acoustics.Test/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomCommonTests.cs index f5c378a32..d8c9f8e61 100644 --- a/tests/Acoustics.Test/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomCommonTests.cs +++ b/tests/Acoustics.Test/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomCommonTests.cs @@ -74,7 +74,7 @@ public void TestImagesHaveCorrectLength(double renderScale, int expectedWidth) // create some fake spectra int duration = (int)(recordingDuration.TotalSeconds / dataScale.TotalSeconds); var spectra = new Dictionary(); - foreach (var key in SpectralIndexValues.GetKeys()) + foreach (var key in SpectralIndexValues.Keys) { spectra.Add(key, new double[256, duration]); var bgnKey = nameof(SpectralIndexValues.BGN);