Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue332 create new spectrogram types #353

Merged
merged 39 commits into from
Aug 21, 2020

Conversation

towsey
Copy link
Contributor

@towsey towsey commented Aug 13, 2020

Title of PR

Fixed octave frequency scale and display of additional spectrograms

Changes

All code to do with the octave frequency scale

Issues

The changes on this branch required changing the default FFT window to Hanning. This is also the issue in another pull request #349. Suggest that Pull request #349 should be merged with master before this pull request.

Visual Changes

Generate spectrograms now makes more types of spectrogram with octave freq scale.

Final Checklist

towsey added 24 commits July 30, 2020 14:05
Issue #332 Set up basic structure for including mel-scale and octave-scale spectrograms in the type of generated standard scale spectrograms..
Issue #332 There was a limited number of colours to use as tags for different spectrogram types. By adding two new spectrograms, there was an insufficient number of colours. Changed the colour palette.
Issue #332 Get Mel frequency scale spectrograms working.
Start work on Octave scale spectrograms.
Issue #332 Get Octave spectrograms going.
Issue #332 Change names of hte main frequency scale types and remove old methods that used to do tests.
Issue #332 Shift methods to do with Mel scale to the SpectrogramMelScale class.
Issue #332 Add tests and rework existing tests for frequency scales
Issue #332 Also have one change required in IndexCalculateTests.
This may cause the test to fail.
Issue #332 This will create conflict in another brnach. Easy to fix. Accept Hanning as default window.
Issue #332 Add another constructor which accepts FreqScale as argument
Issue #332 Also need to add a new test for calculating grid locations and fix other tests.
Issue #332 Previously calculated an octave scale that was once used for a high SR marine recording. Now implement an octave scale that is used for spectral data reduction. This will be used subsequently for content description.
@codecov
Copy link

codecov bot commented Aug 13, 2020

Codecov Report

Merging #353 into master will increase coverage by 8.52%.
The diff coverage is 79.16%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #353      +/-   ##
==========================================
+ Coverage   29.30%   37.83%   +8.52%     
==========================================
  Files         475      478       +3     
  Lines       68793    70917    +2124     
  Branches        0     8002    +8002     
==========================================
+ Hits        20161    26831    +6670     
+ Misses      48632    44003    -4629     
- Partials        0       83      +83     
Impacted Files Coverage Δ
src/AnalysisPrograms/PlanesTrainsAndAutomobiles.cs 6.29% <0.00%> (+6.29%) ⬆️
src/AudioAnalysisTools/DSP/DSP_Filters.cs 30.63% <ø> (+15.51%) ⬆️
src/AudioAnalysisTools/DSP/NoiseProfile.cs 57.41% <ø> (+5.16%) ⬆️
src/AudioAnalysisTools/DSP/SNR.cs 48.77% <ø> (+5.97%) ⬆️
...AudioAnalysisTools/Indices/IndexCalculateConfig.cs 85.71% <ø> (-2.05%) ⬇️
src/AudioAnalysisTools/Indices/IndexMatrices.cs 65.72% <0.00%> (+5.32%) ⬆️
src/AudioAnalysisTools/SpectralPeakTracks.cs 75.39% <0.00%> (+3.14%) ⬆️
...sisTools/StandardSpectrograms/EnergySpectrogram.cs 0.00% <ø> (ø)
...sTools/StandardSpectrograms/SpectrogramCepstral.cs 33.94% <ø> (+9.68%) ⬆️
src/Acoustics.Shared/Extensions/ArrayExtensions.cs 29.12% <4.76%> (+4.73%) ⬆️
... and 341 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7905d4f...4fd5f38. Read the comment docs.

towsey and others added 10 commits August 19, 2020 08:47
Issue 332 Add in new image for ribbon spectrograms. This is for debug purposes when want to see what is happening during data reduction.
Issue #332 Add in new methods for rescaling frequency but keeping linear.
Issue #332 Finalise test for conversion of amplitude to octave frequency scale
Issue #332 Shift filterBank methods to Spectrum tools because they are now generalised for all frequency scale transformations.
Issue #332 Now that have ability to visualise a data reduced spectrogram, I changed it to give better distribution of filterbanks.
The color tag was omitted from the title bar of a few of the new spectrograms.

Also made it easier to print out C# multi-dimensional array literals. Useful for updating large test values.
@atruskie atruskie merged commit 952ddb8 into master Aug 21, 2020
@atruskie atruskie deleted the Issue332_Create_new_spectrogram_types branch August 21, 2020 06:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants