Delete unnecesary files

Issue #252 Delete five classes that were originally used to define different templates but hwich are now described in the yml and jason templates files. Other changes are small changes required to run software on different computer.
QutEcoacoustics · Nov 12, 2019 · e1465f5 · e1465f5
1 parent 51b29d8
commit e1465f5
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 391 deletions.
diff --git a/src/AnalysisConfigFiles/Towsey.ContentDescription.yml b/src/AnalysisConfigFiles/Towsey.ContentDescription.yml
@@ -25,8 +25,8 @@ AnalysisName: ContentDescription
 # SAVE INTERMEDIARY FILES
 # Available options (case-sensitive): [false/Never | true/Always | WhenEventsDetected]
 SaveIntermediateWavFiles: Never
-# If `true` saves a data into a seperate file every `SegmentDuration` seconds. Accepts a boolean value: [false|true]
-# If `true` saves a data into a seperate file every `SegmentDuration` seconds. Accepts a boolean value: [false|true]
+# If `true` saves a data into a separate file every `SegmentDuration` seconds. Accepts a boolean value: [false|true]
+# If `true` saves a data into a separate file every `SegmentDuration` seconds. Accepts a boolean value: [false|true]
 SaveIntermediateCsvFiles: false
 
 # SAVE INTERMEDIARY ONE-MINUTE (standard scale) SPECTROGRAMS
@@ -50,7 +50,7 @@ RequireDateInFilename: false
 TemplatesList: 'Towsey.TemplateDefinitions.json'
 
 # #############################################################################################################
-# The below parameters are used to configure drawing of the false-colour spectrograms
+# The below parameters are used to configure drawing of the false-color spectrograms
 LdSpectrogramConfig:
     ColorMap1: "ACI-ENT-EVN"
     ColorMap2: "BGN-PMN-OSC"

diff --git a/src/AnalysisPrograms/Sandpit.cs b/src/AnalysisPrograms/Sandpit.cs
@@ -19,7 +19,6 @@ namespace AnalysisPrograms
     using AnalyseLongRecordings;
     using AudioAnalysisTools;
     using AudioAnalysisTools.ContentDescriptionTools;
-    using AudioAnalysisTools.ContentDescriptionTools.ContentTypes;
     using AudioAnalysisTools.DSP;
     using AudioAnalysisTools.Indices;
     using AudioAnalysisTools.LongDurationSpectrograms;
@@ -369,7 +368,7 @@ public static void Audio2CsvOverOneFile()
 
             // Test on Content Description
             //string recordingPath = @"C:\Ecoacoustics\WavFiles\FlyingFox\20190115_Bellingen_Feeding.wav";
-            string recordingPath = @"C:\Ecoacoustics\WavFiles\LizZnidersic\TasmanIsland2015_Unit2_Mez\SM304256_0+1_20151114_131652+1000.wav";
+            string recordingPath = @"D:\Ecoacoustics\WavFiles\LizZnidersic\TasmanIsland2015_Unit2_Mez\SM304256_0+1_20151114_131652+1000.wav";
             //string outputPath = @"C:\Ecoacoustics\Output\Test\Test24HourRecording\TasmanIslandMez\14";
             string outputPath = @"C:\Ecoacoustics\ContentDescription\Test6IndicesMez13";
             //string outputPath = @"C:\Ecoacoustics\ContentDescription\FlyingFox";

diff --git a/src/AudioAnalysisTools/AudioAnalysisTools.csproj b/src/AudioAnalysisTools/AudioAnalysisTools.csproj
@@ -243,14 +243,9 @@
     <Compile Include="ChannelIntegrity.cs" />
     <Compile Include="ContentDescriptionTools\ContentAlgorithms.cs" />
     <Compile Include="ContentDescriptionTools\ContentSignatures.cs" />
-    <Compile Include="ContentDescriptionTools\ContentTypes\RainLight1.cs" />
-    <Compile Include="ContentDescriptionTools\ContentTypes\BirdMorningChorus1.cs" />
-    <Compile Include="ContentDescriptionTools\ContentTypes\SilverEyeMezTasmanIs.cs" />
-    <Compile Include="ContentDescriptionTools\ContentTypes\WindLight1.cs" />
     <Compile Include="ContentDescriptionTools\ContentVisualization.cs" />
     <Compile Include="ContentDescriptionTools\DataProcessing.cs" />
     <Compile Include="ContentDescriptionTools\DescriptionResult.cs" />
-    <Compile Include="ContentDescriptionTools\ContentTypes\WindStrong1.cs" />
     <Compile Include="ContentDescriptionTools\TemplateManifest.cs" />
     <Compile Include="ContentDescriptionTools\TemplateCollection.cs" />
     <Compile Include="CrossCorrelation.cs" />

diff --git a/src/AudioAnalysisTools/ContentDescriptionTools/ContentSignatures.cs b/src/AudioAnalysisTools/ContentDescriptionTools/ContentSignatures.cs
@@ -1,4 +1,4 @@
-// <copyright file="ContentDescription.cs" company="QutEcoacoustics">
+// <copyright file="ContentSignatures.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>
 

diff --git a/src/AudioAnalysisTools/ContentDescriptionTools/ContentTypes/BirdMorningChorus1.cs b/src/AudioAnalysisTools/ContentDescriptionTools/ContentTypes/BirdMorningChorus1.cs
diff --git a/src/AudioAnalysisTools/ContentDescriptionTools/ContentTypes/RainLight1.cs b/src/AudioAnalysisTools/ContentDescriptionTools/ContentTypes/RainLight1.cs
diff --git a/src/AudioAnalysisTools/ContentDescriptionTools/ContentTypes/SilverEyeMezTasmanIs.cs b/src/AudioAnalysisTools/ContentDescriptionTools/ContentTypes/SilverEyeMezTasmanIs.cs
diff --git a/src/AudioAnalysisTools/ContentDescriptionTools/ContentTypes/WindLight1.cs b/src/AudioAnalysisTools/ContentDescriptionTools/ContentTypes/WindLight1.cs