Attending Issue #146 Oscillations test

Create new Spectral index to detect oscillations
Fix existing tests for oscillaitons spectrogram and create new test for oscillations spectral index.
Still more work to be done with this issue.
Partly fixes issue #146

Author: towsey

src/Acoustics.Shared/Csv/Csv.cs

@@ -1,4 +1,4 @@
-// --------------------------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Csv.cs" company="QutEcoacoustics">
 // 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).
 // </copyright>
@@ -361,7 +361,7 @@ public static void WriteMatrixToCsv<T>(FileInfo destination, IEnumerable<T[]> ma
             }
         }
 
-        public static IEnumerable<T[]> ReadMatrixFromCsv<T>(FileInfo source)
+        public static IEnumerable<T[]> ReadMatrixFromCsvAsEnumerable<T>(FileInfo source)
         {
             Contract.Requires(source != null);
 

src/AnalysisPrograms/Recognizers/LitoriaBicolor.cs

@@ -280,7 +280,7 @@ public static Tuple<BaseSonogram, double[,], double[], List<AcousticEvent>, Imag
                     double oscilFreq;
                     double period;
                     double intensity;
-                    Oscillations2014.GetOscillation(differenceArray, framesPerSecond, cosines, out oscilFreq, out period, out intensity);
+                    Oscillations2014.GetOscillationUsingDct(differenceArray, framesPerSecond, cosines, out oscilFreq, out period, out intensity);
 
                     bool periodWithinBounds = period > lbConfig.MinPeriod && period < lbConfig.MaxPeriod;
 

src/AnalysisPrograms/Recognizers/LitoriaRothii.cs

@@ -160,7 +160,7 @@ public override RecognizerResults Recognize(AudioRecording recording, Config con
                 double oscilFreq;
                 double period;
                 double intensity;
-                Oscillations2014.GetOscillation(subArray, framesPerSecond, cosines, out oscilFreq, out period, out intensity);
+                Oscillations2014.GetOscillationUsingDct(subArray, framesPerSecond, cosines, out oscilFreq, out period, out intensity);
                 bool periodWithinBounds = period > minPeriod && period < maxPeriod;
 
                 if (!periodWithinBounds)

src/AnalysisPrograms/Recognizers/LitoriaWatjulumensis.cs

@@ -289,7 +289,7 @@ private static Tuple<BaseSonogram, double[,], double[], List<AcousticEvent>, Ima
                     double oscilFreq;
                     double period;
                     double intensity;
-                    Oscillations2014.GetOscillation(differenceArray, framesPerSecond, cosines, out oscilFreq, out period, out intensity);
+                    Oscillations2014.GetOscillationUsingDct(differenceArray, framesPerSecond, cosines, out oscilFreq, out period, out intensity);
 
                     bool periodWithinBounds = period > minPeriod && period < maxPeriod;
 

src/AnalysisPrograms/Sandpit.cs

@@ -73,7 +73,7 @@ public override Task<int> Execute(CommandLineApplication app)
                 //CodeToPlaceScoreTracksUnderLdfcSpectrograms();
                 //CodeToPlaceScoreTracksUnderSingleImage();
 
-                ConcatenateIndexFilesAndSpectrograms();
+                //ConcatenateIndexFilesAndSpectrograms();
                 //ConcatenateMarineImages();
                 //ConcatenateImages();
                 //ConcatenateTwelveImages();
@@ -103,6 +103,9 @@ public override Task<int> Execute(CommandLineApplication app)
                 //TestTernaryPlots();
                 //TestDirectorySearchAndFileSearch();
                 //TestNoiseReduction();
+                Oscillations2014.TESTMETHOD_DrawOscillationSpectrogram();
+                //Oscillations2014.TESTMETHOD_GetSpectralIndex_Osc();
+                //Test_DrawFourSpectrograms();
 
                 Console.WriteLine("# Finished Sandpit Task!    Press any key to exit.");
                 return this.Ok();
@@ -1256,9 +1259,6 @@ public static void TestsOfFrequencyScales()
             // FrequencyScale.TESTMETHOD_OctaveFrequencyScale1();
             // FrequencyScale.TESTMETHOD_OctaveFrequencyScale2();
 
-            //Audio2Sonogram.TESTMETHOD_DrawFourSpectrograms();
-            //Oscillations2014.TESTMETHOD_DrawOscillationSpectrogram();
-
             // The following test methods test various configs of concatenation
             // ConcatenateIndexFiles.TESTMETHOD_ConcatenateIndexFilesTest1();
             // ConcatenateIndexFiles.TESTMETHOD_ConcatenateIndexFilesTest2();
@@ -1275,10 +1275,15 @@ public static void TestsOfFrequencyScales()
             FrequencyScale.TESTMETHOD_DrawFrequencyLinesOnImage();
         }
 
+        public static void Test_DrawFourSpectrograms()
+        {
+            Audio2Sonogram.TESTMETHOD_DrawFourSpectrograms();
+        }
+
         /// <summary>
-        /// Unit test of AnalyseLongRecording() using artificial signal
-        /// </summary>
-        public static void TestAnalyseLongRecordingUsingArtificialSignal()
+                /// Unit test of AnalyseLongRecording() using artificial signal
+                /// </summary>
+                public static void TestAnalyseLongRecordingUsingArtificialSignal()
         {
             int sampleRate = 22050;
             double duration = 420; // signal duration in seconds = 7 minutes