diff --git a/src/AnalysisPrograms/Sandpit.cs b/src/AnalysisPrograms/Sandpit.cs index 976924905..8950bee4f 100644 --- a/src/AnalysisPrograms/Sandpit.cs +++ b/src/AnalysisPrograms/Sandpit.cs @@ -1434,7 +1434,7 @@ public static void TestAnalyseLongRecordingUsingArtificialSignal() int sampleRate = 22050; double duration = 420; // signal duration in seconds = 7 minutes int[] harmonics = {500, 1000, 2000, 4000, 8000}; - var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine); + var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine); var outputDirectory = @"C:\SensorNetworks\SoftwareTests\TestLongDurationRecordings"; var recordingPath = Path.Combine(outputDirectory, "TemporaryRecording.wav"); WavWriter.WriteWavFileViaFfmpeg(recordingPath.ToFileInfo(), recording.WavReader); diff --git a/src/AudioAnalysisTools/DSP/DSP_Filters.cs b/src/AudioAnalysisTools/DSP/DSP_Filters.cs index 73d3a03c3..ad230bc03 100644 --- a/src/AudioAnalysisTools/DSP/DSP_Filters.cs +++ b/src/AudioAnalysisTools/DSP/DSP_Filters.cs @@ -28,7 +28,7 @@ public static void TestMethod_GenerateSignal1() var freqScale = new FrequencyScale(sampleRate / 2, windowSize, 1000); string path = @"C:\SensorNetworks\Output\Sonograms\UnitTestSonograms\SineSignal1.png"; - var recording = GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine); + var recording = GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine); var sonoConfig = new SonogramConfig { WindowSize = freqScale.WindowSize, @@ -79,7 +79,7 @@ public static void TestMethod_GenerateSignal2() int[] harmonics = { 500, 1000, 2000, 4000, 8000 }; var freqScale = new FrequencyScale(FreqScaleType.Linear125Octaves7Tones28Nyquist32000); string path = @"C:\SensorNetworks\Output\Sonograms\UnitTestSonograms\SineSignal2.png"; - var recording = GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine); + var recording = GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine); // init the default sonogram config var sonoConfig = new SonogramConfig @@ -143,7 +143,7 @@ public static AudioRecording GenerateTestRecording(int sampleRate, double durati public static double[] GenerateTestSignal(int sampleRate, double duration, int[] harmonics, WaveType waveType) { double[] signal = null; - if (waveType == WaveType.Consine) + if (waveType == WaveType.Cosine) { signal = GetSignalOfAddedCosines(sampleRate, duration, harmonics); } diff --git a/src/AudioAnalysisTools/DSP/WaveType.cs b/src/AudioAnalysisTools/DSP/WaveType.cs index 388aa13e0..53327619d 100644 --- a/src/AudioAnalysisTools/DSP/WaveType.cs +++ b/src/AudioAnalysisTools/DSP/WaveType.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). // @@ -7,6 +7,6 @@ namespace AudioAnalysisTools.DSP public enum WaveType { Sine, - Consine, + Cosine, } } diff --git a/tests/Acoustics.Test/AnalysisPrograms/AnalyzeLongRecordings/TestAnalyzeLongRecording.cs b/tests/Acoustics.Test/AnalysisPrograms/AnalyzeLongRecordings/TestAnalyzeLongRecording.cs index 6db51be76..3d8180546 100644 --- a/tests/Acoustics.Test/AnalysisPrograms/AnalyzeLongRecordings/TestAnalyzeLongRecording.cs +++ b/tests/Acoustics.Test/AnalysisPrograms/AnalyzeLongRecordings/TestAnalyzeLongRecording.cs @@ -60,7 +60,7 @@ public void TestAnalyzeSr22050Recording() int sampleRate = 22050; double duration = 420; // signal duration in seconds = 7 minutes int[] harmonics = { 500, 1000, 2000, 4000, 8000 }; - var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine); + var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine); var recordingPath = this.outputDirectory.CombineFile("TemporaryRecording1.wav"); WavWriter.WriteWavFileViaFfmpeg(recordingPath, recording.WavReader); @@ -98,7 +98,7 @@ public void TestAnalyzeSr22050Recording() var resultsDirectory = this.outputDirectory.Combine("Towsey.Acoustic"); var listOfFiles = resultsDirectory.EnumerateFiles().ToArray(); - Assert.AreEqual(38, listOfFiles.Length); + Assert.AreEqual(40, listOfFiles.Length); var csvCount = listOfFiles.Count(f => f.Name.EndsWith(".csv")); Assert.AreEqual(16, csvCount); @@ -107,12 +107,12 @@ public void TestAnalyzeSr22050Recording() Assert.AreEqual(2, jsonCount); var pngCount = listOfFiles.Count(f => f.Name.EndsWith(".png")); - Assert.AreEqual(20, pngCount); + Assert.AreEqual(22, pngCount); var twoMapsImagePath = resultsDirectory.CombineFile("TemporaryRecording1__2Maps.png"); var twoMapsImage = ImageTools.ReadImage2Bitmap(twoMapsImagePath.FullName); - // image is 7 * 652 + // image is 7 * 632 Assert.AreEqual(7, twoMapsImage.Width); Assert.AreEqual(632, twoMapsImage.Height); @@ -151,7 +151,7 @@ public void TestAnalyzeSr64000Recording() int sampleRate = 64000; double duration = 420; // signal duration in seconds = 7 minutes int[] harmonics = { 500, 1000, 2000, 4000, 8000 }; - var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine); + var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine); string recordingName = "TemporaryRecording2"; var recordingPath = this.outputDirectory.CombineFile(recordingName + ".wav"); WavWriter.WriteWavFileViaFfmpeg(recordingPath, recording.WavReader); @@ -269,7 +269,7 @@ public void TestAnalyzeSr64000Recording() // test number of images - should now be 23 listOfFiles = resultsDirectory.EnumerateFiles().ToArray(); pngCount = listOfFiles.Count(f => f.Name.EndsWith(".png")); - Assert.AreEqual(21, pngCount); + Assert.AreEqual(23, pngCount); var twoMapsImagePath = resultsDirectory.CombineFile(recordingName + "__2Maps.png"); var twoMapsImage = ImageTools.ReadImage2Bitmap(twoMapsImagePath.FullName); diff --git a/tests/Acoustics.Test/AudioAnalysisTools/DSP/FrequencyScaleTests.cs b/tests/Acoustics.Test/AudioAnalysisTools/DSP/FrequencyScaleTests.cs index ccaa86a24..81d3be44b 100644 --- a/tests/Acoustics.Test/AudioAnalysisTools/DSP/FrequencyScaleTests.cs +++ b/tests/Acoustics.Test/AudioAnalysisTools/DSP/FrequencyScaleTests.cs @@ -349,7 +349,7 @@ public void TestFreqScaleOnArtificialSignal1() var freqScale = new FrequencyScale(sampleRate / 2, windowSize, 1000); var outputImagePath = Path.Combine(this.outputDirectory.FullName, "Signal1_LinearFreqScale.png"); - var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine); + var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine); var sonoConfig = new SonogramConfig { WindowSize = freqScale.WindowSize, @@ -406,7 +406,7 @@ public void TestFreqScaleOnArtificialSignal2() int[] harmonics = { 500, 1000, 2000, 4000, 8000 }; var freqScale = new FrequencyScale(FreqScaleType.Linear125Octaves7Tones28Nyquist32000); var outputImagePath = Path.Combine(this.outputDirectory.FullName, "Signal2_OctaveFreqScale.png"); - var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine); + var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine); // init the default sonogram config var sonoConfig = new SonogramConfig diff --git a/tests/Acoustics.Test/Shared/CsvTests.cs b/tests/Acoustics.Test/Shared/CsvTests.cs index 69ee468b8..9a0740d35 100644 --- a/tests/Acoustics.Test/Shared/CsvTests.cs +++ b/tests/Acoustics.Test/Shared/CsvTests.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). // @@ -351,8 +351,8 @@ public void TestBaseTypesAreNotSerializedAsArray() var baseExpected = $@"{nameof(SummaryIndexBase.RankOrder)},{nameof(SummaryIndexBase.FileName)},{nameof(SummaryIndexBase.ResultStartSeconds)},{nameof(SummaryIndexBase.SegmentDurationSeconds)},{nameof(SummaryIndexBase.ResultMinute)} 0,,0,0,0 ".NormalizeToCrLf(); - var childExpected = $@"ZeroSignal,HighAmplitudeIndex,ClippingIndex,AvgSignalAmplitude,BackgroundNoise,Snr,AvgSnrOfActiveFrames,Activity,EventsPerSecond,HighFreqCover,MidFreqCover,LowFreqCover,AcousticComplexity,TemporalEntropy,EntropyOfAverageSpectrum,AvgEntropySpectrum,EntropyOfVarianceSpectrum,VarianceEntropySpectrum,EntropyOfPeaksSpectrum,EntropyPeaks,EntropyOfCoVSpectrum,ClusterCount,ThreeGramCount,Ndsi,SptDensity,{nameof(SummaryIndexBase.RankOrder)},{nameof(SummaryIndexBase.FileName)},{nameof(SummaryIndexBase.ResultStartSeconds)},{nameof(SummaryIndexBase.SegmentDurationSeconds)},{nameof(SummaryIndexBase.ResultMinute)} -0,0,0,-100,-100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,0,0,0 + var childExpected = $@"ZeroSignal,HighAmplitudeIndex,ClippingIndex,AvgSignalAmplitude,BackgroundNoise,Snr,AvgSnrOfActiveFrames,Activity,EventsPerSecond,HighFreqCover,MidFreqCover,LowFreqCover,AcousticComplexity,TemporalEntropy,EntropyOfAverageSpectrum,EntropyOfVarianceSpectrum,EntropyOfPeaksSpectrum,EntropyOfCoVSpectrum,ClusterCount,ThreeGramCount,Ndsi,SptDensity,{nameof(SummaryIndexBase.RankOrder)},{nameof(SummaryIndexBase.FileName)},{nameof(SummaryIndexBase.ResultStartSeconds)},{nameof(SummaryIndexBase.SegmentDurationSeconds)},{nameof(SummaryIndexBase.ResultMinute)} +0,0,0,-100,-100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,0,0,0 ".NormalizeToCrLf(); Csv.WriteToCsv(this.testFile, childArray);