From 4b8d3d68f82ff6e17d8df71ae58e87c8b737671b Mon Sep 17 00:00:00 2001 From: Gil Felix Greco <67735211+ggrecow@users.noreply.github.com> Date: Sun, 14 May 2023 16:38:17 +0200 Subject: [PATCH] pre-release check - excluded sound_files>publications folder - checked all validation codes - checked all example codes - correct small typos on PsychoacousticAnnoyance (ALL) header - checked pub_Greco2023_Internoise - checked pub_Osses2023c_Forum_Acusticum_SQAT (only runs if provided in the dataset is runned. In this case, a new folder sound_files>publication is genrated and the sound files are duplicated into the folder. This is not optimal and shall be improved for future release --- .../ex_PsychoacousticAnnoyance_Di2016.m | 2 +- .../ex_PsychoacousticAnnoyance_More2010.m | 2 +- .../ex_PsychoacousticAnnoyance_Zwicker1999.m | 2 +- examples/sound_level_meter/ex_sound_level_meter.m | 2 +- .../pub_Osses2023c_Forum_Acusticum_SQAT.m | 4 ++++ .../pub_Osses2023c_Forum_Acusticum_SQAT-README.txt | 13 ------------- .../4_FM_level/run_validation_roughness_FM_level.m | 2 +- .../run_verification_modulated_white_noise.m | 2 +- 8 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 sound_files/publications/pub_Osses2023c_Forum_Acusticum_SQAT-README.txt diff --git a/examples/PsychoacousticAnnoyance_Di2016/ex_PsychoacousticAnnoyance_Di2016.m b/examples/PsychoacousticAnnoyance_Di2016/ex_PsychoacousticAnnoyance_Di2016.m index 2d9b001..12aef2b 100644 --- a/examples/PsychoacousticAnnoyance_Di2016/ex_PsychoacousticAnnoyance_Di2016.m +++ b/examples/PsychoacousticAnnoyance_Di2016/ex_PsychoacousticAnnoyance_Di2016.m @@ -1,6 +1,6 @@ % Script PsychoacousticAnnoyance_Di2016 % -% Example: compute Di's modified psychoacoustic annoyance of signal 14 from the ISO 532-1:2017 +% Example: compute Di's modified psychoacoustic annoyance of RefSignal_Loudness_ISO532_1 % % FUNCTION: % OUT = PsychoacousticAnnoyance_Di2016(insig,fs,LoudnessField,time_skip,showPA,show) diff --git a/examples/PsychoacousticAnnoyance_More2010/ex_PsychoacousticAnnoyance_More2010.m b/examples/PsychoacousticAnnoyance_More2010/ex_PsychoacousticAnnoyance_More2010.m index c6335c2..88245d9 100644 --- a/examples/PsychoacousticAnnoyance_More2010/ex_PsychoacousticAnnoyance_More2010.m +++ b/examples/PsychoacousticAnnoyance_More2010/ex_PsychoacousticAnnoyance_More2010.m @@ -1,6 +1,6 @@ % Script ex_PsychoacousticAnnoyance_More2010 % -% Example: compute More's modified psychoacoustic annoyance of signal 14 from the ISO 532-1:2017 +% Example: compute More's modified psychoacoustic annoyance of RefSignal_Loudness_ISO532_1 % % FUNCTION: % OUT = PsychoacousticAnnoyance_More2010(insig,fs,LoudnessField,time_skip,showPA,show) diff --git a/examples/PsychoacousticAnnoyance_Zwicker1999/ex_PsychoacousticAnnoyance_Zwicker1999.m b/examples/PsychoacousticAnnoyance_Zwicker1999/ex_PsychoacousticAnnoyance_Zwicker1999.m index db193d3..6de8c67 100644 --- a/examples/PsychoacousticAnnoyance_Zwicker1999/ex_PsychoacousticAnnoyance_Zwicker1999.m +++ b/examples/PsychoacousticAnnoyance_Zwicker1999/ex_PsychoacousticAnnoyance_Zwicker1999.m @@ -1,6 +1,6 @@ % Script ex_PsychoacousticAnnoyance_Zwicker1999 % -% Example: computes Zwicker & Fastl's psychoacoustic annoyance of signal 14 from the ISO 532-1:2017 +% Example: computes Zwicker & Fastl's psychoacoustic annoyance of RefSignal_Loudness_ISO532_1 % % FUNCTION: % OUT = PsychoacousticAnnoyance_Zwicker1999(insig,fs,LoudnessField,time_skip,showPA,show) diff --git a/examples/sound_level_meter/ex_sound_level_meter.m b/examples/sound_level_meter/ex_sound_level_meter.m index dc7144c..753647f 100644 --- a/examples/sound_level_meter/ex_sound_level_meter.m +++ b/examples/sound_level_meter/ex_sound_level_meter.m @@ -10,7 +10,7 @@ % % Author: Alejandro Osses %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -clc; clear all;close all; +clc; clear all ;close all; dir_sounds = [basepath_SQAT 'sound_files' filesep 'reference_signals' filesep]; wavfilename='RefSignal_Sharpness_DIN45692.wav'; diff --git a/publications/pub_Osses2023c_Forum_Acusticum_SQAT/pub_Osses2023c_Forum_Acusticum_SQAT.m b/publications/pub_Osses2023c_Forum_Acusticum_SQAT/pub_Osses2023c_Forum_Acusticum_SQAT.m index d530b11..ea004ea 100644 --- a/publications/pub_Osses2023c_Forum_Acusticum_SQAT/pub_Osses2023c_Forum_Acusticum_SQAT.m +++ b/publications/pub_Osses2023c_Forum_Acusticum_SQAT/pub_Osses2023c_Forum_Acusticum_SQAT.m @@ -29,9 +29,11 @@ list_tables_and_figures = {'do_table2';'do_table3';'do_fig1a'; 'do_fig1b'; 'do_fig1c'; ... 'do_fig2'; 'do_fig3';'do_fig3b'; 'do_fig_raw'}; + for i = 1:length(list_tables_and_figures) fprintf('Enter %.0f to %s\n',i,list_tables_and_figures{i}); end + bInput = input('Which table/figure you want to obtain (enter the corresponding number)?: '); % % Setting to 1 the selected choice: % exp2eval = sprintf('%s=1;',list_tables_and_figures{bInput}); @@ -74,6 +76,7 @@ dir_datasets = {'1-Aircraft-fly-by' ,114 , files_1; ... '2-Train-pass-by' ,140.55 , files_2; ... '3-Hummer-resonances',100 , files_3}; + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Other common parameters: List_psy_metrics = {'Loudness_ISO532_1', ... @@ -83,6 +86,7 @@ 'Tonality_Aures1985'}; list_metrics = {'LAeq','LAFmax','LZeq','T','SEL','Delta_Leq','LAFmax_min_LAeq'}; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + if do_table2 dBFS_4_reproduction = 120; % not too loud not too soft diff --git a/sound_files/publications/pub_Osses2023c_Forum_Acusticum_SQAT-README.txt b/sound_files/publications/pub_Osses2023c_Forum_Acusticum_SQAT-README.txt deleted file mode 100644 index f66cbec..0000000 --- a/sound_files/publications/pub_Osses2023c_Forum_Acusticum_SQAT-README.txt +++ /dev/null @@ -1,13 +0,0 @@ -Copy here the selected sounds from Roberto's Google drive, such that the files are organised in the following folders: - ../sound_files/publications/pub_Osses2023a_Forum_Acusticum_SQAT/1-Aircraft-fly-by/ - ../sound_files/publications/pub_Osses2023a_Forum_Acusticum_SQAT/2-Train-pass-by/ - ../sound_files/publications/pub_Osses2023a_Forum_Acusticum_SQAT/3-Hummer-resonances/ - -Datasets 1, 2, and 3 were provided by Roberto, Gil, and Alejandro, respectively. - -The original sounds were moved to my (Alejandro's) external hard disk (Folder: SQM_paper_2023_extra_raw_no-commit) - Sounds by Roberto: Sounds_from_Roberto-forum_acusticum-20230406T141247Z-001.zip - Sounds by Gil : SQAT_open_source_23_03_2023.7z - -ENS HDD: file:///media/alejandro/My Passport/SQM_paper_2023_extra_raw_no-commit/ -My personal HDD: file:///media/alejandro/TOSHIBA EXT/pr2023-SQAT-ForumAcusticum/SQM_paper_2023_extra_raw_no-commit/ diff --git a/validation/Roughness_Daniel1997/4_FM_level/run_validation_roughness_FM_level.m b/validation/Roughness_Daniel1997/4_FM_level/run_validation_roughness_FM_level.m index c9dd8a3..1d88e4d 100644 --- a/validation/Roughness_Daniel1997/4_FM_level/run_validation_roughness_FM_level.m +++ b/validation/Roughness_Daniel1997/4_FM_level/run_validation_roughness_FM_level.m @@ -16,7 +16,7 @@ % % Author: Gil Felix Greco, Braunschweig 02.03.2020 (updated 13.05.2023) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -clc;clear all; close all; +clc; clear all; close all; save_figs=0; %% save figs flag diff --git a/validation/Roughness_Daniel1997/5_white_noise/run_verification_modulated_white_noise.m b/validation/Roughness_Daniel1997/5_white_noise/run_verification_modulated_white_noise.m index b4397e8..44c5fe3 100644 --- a/validation/Roughness_Daniel1997/5_white_noise/run_verification_modulated_white_noise.m +++ b/validation/Roughness_Daniel1997/5_white_noise/run_verification_modulated_white_noise.m @@ -11,7 +11,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% clc; clear all; close all; -save_figs=1; % no=0; yes=1 +save_figs=0; % no=0; yes=1 dir_out = [fileparts(mfilename('fullpath')) filesep];