From 0a83479d15e303aba287e8d9ae2d0b4a0542a971 Mon Sep 17 00:00:00 2001 From: towsey Date: Fri, 14 Aug 2020 13:43:52 +1000 Subject: [PATCH] Fix cluster tests Issue #291 --- .../EventStatistics/EventStatisticsCalculateTests.cs | 6 +++--- .../AudioAnalysisTools/Indices/ClusterIndexTest.cs | 4 ++-- tests/Fixtures/BinaryClustering/clusterSpectrum.bin | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Acoustics.Test/AudioAnalysisTools/EventStatistics/EventStatisticsCalculateTests.cs b/tests/Acoustics.Test/AudioAnalysisTools/EventStatistics/EventStatisticsCalculateTests.cs index 2bfe4d817..931f68e27 100644 --- a/tests/Acoustics.Test/AudioAnalysisTools/EventStatistics/EventStatisticsCalculateTests.cs +++ b/tests/Acoustics.Test/AudioAnalysisTools/EventStatistics/EventStatisticsCalculateTests.cs @@ -59,9 +59,9 @@ public void TestCalculateEventStatistics() LoggedConsole.WriteLine($"Stats: DominantFrequency= {stats.DominantFrequency}"); Assert.AreEqual(0.0, stats.TemporalEnergyDistribution, 1E-4); - Assert.AreEqual(0.6062, stats.SpectralEnergyDistribution, 1E-4); - Assert.AreEqual(6687, stats.SpectralCentroid); - Assert.AreEqual(8003, stats.DominantFrequency); + Assert.AreEqual(0.61647, stats.SpectralEnergyDistribution, 1E-4); + Assert.AreEqual(6011, stats.SpectralCentroid); + Assert.AreEqual(3998, stats.DominantFrequency); Assert.AreEqual(1500, stats.LowFrequencyHertz); Assert.AreEqual(8500, stats.HighFrequencyHertz); diff --git a/tests/Acoustics.Test/AudioAnalysisTools/Indices/ClusterIndexTest.cs b/tests/Acoustics.Test/AudioAnalysisTools/Indices/ClusterIndexTest.cs index 58e409c04..2f879f465 100644 --- a/tests/Acoustics.Test/AudioAnalysisTools/Indices/ClusterIndexTest.cs +++ b/tests/Acoustics.Test/AudioAnalysisTools/Indices/ClusterIndexTest.cs @@ -73,10 +73,10 @@ public void TestBinaryClusteringOfSpectra() var clusterSpectrum = SpectralClustering.RestoreFullLengthSpectrum(clusterInfo.ClusterSpectrum, freqBinCount, lowerBinBound); // test the cluster count - also called spectral diversity in some papers - Assert.AreEqual(clusterInfo.ClusterCount, 17); + Assert.AreEqual(clusterInfo.ClusterCount, 19); // test the trigram count - another way of thinking about spectral change - Assert.AreEqual(clusterInfo.TriGramUniqueCount, 342); + Assert.AreEqual(clusterInfo.TriGramUniqueCount, 436); // test what used to be the CLS spectral index. Sum of the rows of the weight vectors. var expectedSpectrumFile = PathHelper.ResolveAsset("BinaryClustering", "clusterSpectrum.bin"); diff --git a/tests/Fixtures/BinaryClustering/clusterSpectrum.bin b/tests/Fixtures/BinaryClustering/clusterSpectrum.bin index d0c861a5d..f59c8a9ee 100644 --- a/tests/Fixtures/BinaryClustering/clusterSpectrum.bin +++ b/tests/Fixtures/BinaryClustering/clusterSpectrum.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b80d03274cf7d5c8ab9d96874232b6483adc65b5179d91e4be9a5685bab13ae +oid sha256:108faa696c3ade02ad9e3ab5b11ea431ebf313e8c16542c613629aab676162fe size 2076