cleaning the code

QutEcoacoustics · Feb 4, 2019 · 0c84f1b · 0c84f1b
1 parent b5f8125
commit 0c84f1b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 23 deletions.
diff --git a/src/AnalysisPrograms/SpectralPeakTracking/SpectralPeakTrackingConfig.cs b/src/AnalysisPrograms/SpectralPeakTracking/SpectralPeakTrackingConfig.cs
@@ -13,7 +13,6 @@ public class SpectralPeakTrackingConfig : Config
         public const int DefaultFrameWidth = 1024;
         public const double DefaultFrameOverlap = 0.2;
 
-
         /// <summary>
         /// Initializes a new instance of the <see cref="SpectralPeakTrackingConfig"/> class.
         /// CONSTRUCTOR

diff --git a/src/AnalysisPrograms/SpectralPeakTracking/SpectralPeakTrackingEntry.cs b/src/AnalysisPrograms/SpectralPeakTracking/SpectralPeakTrackingEntry.cs
@@ -1,20 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// <copyright file="SpectralPeakTrackingEntry.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>
 
 namespace AnalysisPrograms.SpectralPeakTracking
 {
+    using System;
     using System.IO;
+    using System.Threading.Tasks;
     using Acoustics.Shared.ConfigFile;
     using AudioAnalysisTools;
     using AudioAnalysisTools.DSP;
     using AudioAnalysisTools.StandardSpectrograms;
     using AudioAnalysisTools.WavTools;
-    using Production.Arguments;
-    using Production.Validation;
     using McMaster.Extensions.CommandLineUtils;
+    using Production.Arguments;
 
     public static class SpectralPeakTrackingEntry
     {

diff --git a/src/AudioAnalysisTools/SpectralPeakTracking2018.cs b/src/AudioAnalysisTools/SpectralPeakTracking2018.cs
@@ -6,10 +6,6 @@ namespace AudioAnalysisTools
 {
     using System;
     using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
-    using Acoustics.Shared.ConfigFile;
     using StandardSpectrograms;
     using TowseyLibrary;
 
@@ -32,7 +28,7 @@ public static void SpectralPeakTracking(double[,] dbSpectrogram, SpectralPeakTra
             int[][] localPeaks = FindLocalSpectralPeaks(dbSpectrogram, peakBinsIndex, settings.WidthMidFreqBand, settings.TopBuffer, settings.BottomBuffer, settings.DbThreshold);
 
             // Do Spectral Peak Tracking
-
+            // SpectralTrack.GetSpectralPeakTracks()
         }
 
         /// <summary>
@@ -146,8 +142,6 @@ public static double CalculateAverageEnergy(double[] spectrum, int minInd, int m
 
             return outputMatrix;
         }
-
-
     }
 
     public class SpectralPeakTrackingSettings

diff --git a/tests/Acoustics.Test/AudioAnalysisTools/SpectralPeakTracking2018Tests.cs b/tests/Acoustics.Test/AudioAnalysisTools/SpectralPeakTracking2018Tests.cs
@@ -4,11 +4,6 @@
 
 namespace Acoustics.Test.AudioAnalysisTools
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
     using Acoustics.Shared;
     using Acoustics.Shared.Csv;
     using global::AudioAnalysisTools;
@@ -26,7 +21,7 @@ public void GetPeakBinsIndexTest()
             int minFreqBin = 7;
             int maxFreqBin = 15;
 
-            int[] expectedPeakBinsIndex = new int[]
+            int[] expectedPeakBinsIndex =
             {
                 7, 11, 12, 14, 14, 14, 14, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 9, 10, 10, 12, 14,
                 14, 14, 14, 14, 6, 6, 6, 6, 6, 6, 6, 6, 8, 8, 12, 12, 14, 14, 14, 14, 14, 14, 14, 6, 6, 6, 6, 6
@@ -38,7 +33,6 @@ public void GetPeakBinsIndexTest()
             {
                 Assert.AreEqual(expectedPeakBinsIndex[i], actualPeakBinsIndex[i]);
             }
-
         }
 
         [TestMethod]
@@ -47,7 +41,7 @@ public void FindLocalSpectralPeaksTest()
             var inputMatrix = PathHelper.ResolveAsset("SpectralPeakTracking", "matrix2.csv");
             var matrix = Csv.ReadMatrixFromCsv<double>(inputMatrix, TwoDimensionalArray.None);
 
-            int[][] expectedLocalPeaksIndex = new int[][] { new int[] { 0, 7 }, new int[] { 1, 11 } };
+            int[][] expectedLocalPeaksIndex = { new[] { 0, 7 }, new[] { 1, 11 } };
 
             int[] peakBinsIndex = new int[] { 7, 11, 6, 6, 6, 6, 6, 6, 6, 6 };