modified PSD test

QutEcoacoustics · Jul 24, 2018 · 9ed6cae · 9ed6cae
1 parent 69a83c1
commit 9ed6cae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/AnalysisPrograms/MahnooshSandpit.cs b/src/AnalysisPrograms/MahnooshSandpit.cs
@@ -265,7 +265,7 @@ public void Execute(Arguments arguments)
             //var recording2Path = Path.Combine(trainSetPath, "SM304264_0+1_20160421_054539_29-30min.wav"); // an example from the train set
             //var recording2Path = Path.Combine(testSetPath, "SM304264_0+1_20160423_054539_29-30min.wav"); // an example from the test set
             // check whether there is any file in the folder/subfolders
-            if (Directory.GetFiles(testSetPath, "*", SearchOption.AllDirectories).Length == 0) // trainSetPath
+            if (Directory.GetFiles(trainSetPath, "*", SearchOption.AllDirectories).Length == 0) // testSetPath
             {
                 throw new ArgumentException("The folder of recordings is empty...");
             }
@@ -279,7 +279,7 @@ public void Execute(Arguments arguments)
             Dictionary<string, List<double[,]>> allFilesStdFeatureVectors = new Dictionary<string, List<double[,]>>();
             Dictionary<string, List<double[,]>> allFilesSkewnessFeatureVectors = new Dictionary<string, List<double[,]>>();
 
-            foreach (string filePath in Directory.GetFiles(testSetPath, "*.wav")) // trainSetPath
+            foreach (string filePath in Directory.GetFiles(trainSetPath, "*.wav")) // testSetPath
             {
                 FileInfo fileInfo = filePath.ToFileInfo();
 
@@ -757,7 +757,7 @@ public class FeatureLearningConfig : Config
 
             public const bool DefaultDoNoiseReduction = true;
 
-            public const bool DefaultDoWhitening = true;
+            public const bool DefaultDoWhitening = false;
 
             /// <summary>
             /// Initializes a new instance of the <see cref="FeatureLearningConfig"/> class.

diff --git a/tests/Acoustics.Test/AudioAnalysisTools/DSP/UnsupervisedFeatureLearningTest.cs b/tests/Acoustics.Test/AudioAnalysisTools/DSP/UnsupervisedFeatureLearningTest.cs
@@ -524,13 +524,13 @@ public void PowerSpectrumDensityTest()
                     var energySpectrogram = new EnergySpectrogram(sonoConfig, amplitudeSpectrogram.Data);
 
                     // square the FFT coefficients to get an energy spectrogram
-                    //double[,] energySpectrogram = PowerSpectrumDensity.GetEnergyValues(sonogram.Data);
+                    //double[,] energySpectrogram = PowerSpectrumDensity.GetEnergyValues(amplitudeSpectrogram.Data);
 
                     // RMS NORMALIZATION
-                    double[,] normalizedValues = SNR.RmsNormalization(energySpectrogram.Data);
+                    //double[,] normalizedValues = SNR.RmsNormalization(energySpectrogram);
 
                     // Median Noise Reduction
-                    double[,] noiseReducedValues = PcaWhitening.NoiseReduction(normalizedValues);
+                    double[,] noiseReducedValues = PcaWhitening.NoiseReduction(energySpectrogram.Data);
 
                     psd.Add(PowerSpectrumDensity.GetPowerSpectrum(noiseReducedValues));
                 }