From b8b39aab60d2bd25798d808f4c1aa5bfc9df495f Mon Sep 17 00:00:00 2001 From: towsey Date: Wed, 12 Jun 2019 20:27:35 +1000 Subject: [PATCH] Check zooming spgm code is working OK First run on home computer in Tasmania. Problem reading date in file name hence changed date requirement to false. --- .../Towsey.Acoustic.Zooming.yml | 2 +- src/AnalysisPrograms/Sandpit.cs | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/AnalysisConfigFiles/Towsey.Acoustic.Zooming.yml b/src/AnalysisConfigFiles/Towsey.Acoustic.Zooming.yml index 7f2429a99..5e787d663 100644 --- a/src/AnalysisConfigFiles/Towsey.Acoustic.Zooming.yml +++ b/src/AnalysisConfigFiles/Towsey.Acoustic.Zooming.yml @@ -68,7 +68,7 @@ TileOutput: false # prefix_20140101T235959+Z.mp3 # prefix_20140101-235959+1000.mp3 # prefix_20140101-235959+Z.mp3 -RequireDateInFilename: true +RequireDateInFilename: false IndexPropertiesConfig: './IndexPropertiesConfig.Zooming.yml' EventThreshold: 0.2 diff --git a/src/AnalysisPrograms/Sandpit.cs b/src/AnalysisPrograms/Sandpit.cs index 5143f99ca..2701ec9eb 100644 --- a/src/AnalysisPrograms/Sandpit.cs +++ b/src/AnalysisPrograms/Sandpit.cs @@ -86,7 +86,7 @@ public override Task Execute(CommandLineApplication app) //DrawLongDurationSpectrogram(); //DrawClusterSequence(); //DrawStandardSpectrograms(); - //DrawZoomingSpectrogramPyramid(); + DrawZoomingSpectrogramPyramid(); //ExtractSpectralFeatures(); //HerveGlotinMethods(); @@ -116,7 +116,7 @@ public override Task Execute(CommandLineApplication app) //Oscillations2014.TESTMETHOD_DrawOscillationSpectrogram(); //Oscillations2014.TESTMETHOD_GetSpectralIndex_Osc(); //Test_DrawFourSpectrograms(); - TestLinearFunction(); + //TestLinearFunction(); Console.WriteLine("# Finished Sandpit Task! Press any key to exit."); return this.Ok(); @@ -334,9 +334,11 @@ public static void Audio2CsvOverOneFile() //string outputPath = @"G:\SensorNetworks\Output\BradLaw\Pillaga24"; //string configPath = @"C:\Work\GitHub\audio-analysis\AudioAnalysis\AnalysisConfigFiles\Towsey.Acoustic.yml"; - string recordingPath = @"C:\Ecoacoustics\WavFiles\LizZnidersic\TasmanIsland2015_Unit2_Mez\SM304256_0+1_20151114_231652.wav"; - string outputPath = @"C:\Ecoacoustics\Output\Test\Test24HourRecording\TasmanIslandMez\24"; - string configPath = @"C:\Work\GitHub\audio-analysis\src\AnalysisConfigFiles\Towsey.Acoustic.yml"; + string recordingPath = @"C:\Ecoacoustics\WavFiles\LizZnidersic\TasmanIsland2015_Unit2_Mez\SM304256_0+1_20151114_211652.wav"; + //string outputPath = @"C:\Ecoacoustics\Output\Test\Test24HourRecording\TasmanIslandMez\22"; + string outputPath = @"C:\Ecoacoustics\Output\Test\TestMezOneHourHiRes\22"; + //string configPath = @"C:\Work\GitHub\audio-analysis\src\AnalysisConfigFiles\Towsey.Acoustic.yml"; + string configPath = @"C:\Work\GitHub\audio-analysis\src\AnalysisConfigFiles\Towsey.Acoustic.Zooming.yml"; // Ivan Campos recordings //string recordingPath = @"G:\SensorNetworks\WavFiles\Ivancampos\INCIPO01_20161031_024006_898.wav"; @@ -685,11 +687,12 @@ public static void DrawZoomingSpectrogramPyramid() //string ipFileName = "TEST_TUITCE_20091215_220004"; //exclude the analysis type from file name i.e. "Towsey.Acoustic.Indices" //string ipdir = @"C:\Ecoacoustics\Output\FalseColourSpectrograms\SpectrogramFocalZoom\Towsey.Acoustic.200ms.EclipseFarmstayOLD"; //MAP "\\Sef-bigdata-10\d$\tasmania_mez\output_zooming_indices2019\Towsey.Acoustic" to Q drive - string ipdir = @"Q:\TasmaniaMez"; + //string ipdir = @"Q:\TasmaniaMez"; + string ipdir = @"C:\Ecoacoustics\Output\Test\TestMezOneHourHiRes\22\Towsey.Acoustic"; string opdir = @"C:\Ecoacoustics\Output\FalseColourSpectrograms\SpectrogramFocalZoom\TasmaniaMezTest"; // The default zooming LDFC spectrogram config file - //var spectrogramConfigFile = @"C:\Work\GitHub\audio-analysis\AudioAnalysis\AnalysisConfigFiles\SpectrogramZoomingConfig.yml"; + //var spectrogramConfigFile = @"C:\Work\GitHub\audio-analysis\src\AnalysisConfigFiles\SpectrogramZoomingConfig.yml"; var zoomingConfigFile = @"C:\Ecoacoustics\Output\FalseColourSpectrograms\SpectrogramFocalZoom\SpectrogramZoomingConfig.yml"; var args = new DrawZoomingSpectrograms.Arguments @@ -698,7 +701,7 @@ public static void DrawZoomingSpectrogramPyramid() Output = opdir, SpectrogramZoomingConfig = zoomingConfigFile, ZoomAction = DrawZoomingSpectrograms.Arguments.ZoomActionType.Focused, - FocusMinute = 60, + FocusMinute = 30, }; DrawZoomingSpectrograms.Execute(args); }