diff --git a/matlab/tfgm/scripts/solve_1area_cuicui.m b/matlab/tfgm/scripts/solve_1area_cuicui.m
index 759218d18a9709eb7338c2f9dd1a0d60bff6c5f0..c426253508ea810fde0378baac0550f529f0eabc 100644
--- a/matlab/tfgm/scripts/solve_1area_cuicui.m
+++ b/matlab/tfgm/scripts/solve_1area_cuicui.m
@@ -1,7 +1,11 @@
clc; clear; close all;
%
-% This script allows to reproduce the results of the paper time -frequency
-% fading based on Gabor multiplier in the case bird + car
+% This script allows to reproduce the figures 4 and 5 of the paper [1]
+% on a single dataset including engine sound and birdsong.
+%
+%
+% [1] Time-frequency fading algorithms based on Gabor multipliers,
+% A. Marina Kreme Valentin Emiya, Caroline Chaux, and Bruno Torresani
%%
dbstack;
%%
diff --git a/matlab/tfgm/scripts/solve_Pareas_cuicui.m b/matlab/tfgm/scripts/solve_Pareas_cuicui.m
index 6cdcaf7b176cf89cd575564b7ab3c12a6d7867f7..82b41c46f146384e9e30cedd9e3e00107f4c88f9 100644
--- a/matlab/tfgm/scripts/solve_Pareas_cuicui.m
+++ b/matlab/tfgm/scripts/solve_Pareas_cuicui.m
@@ -1,5 +1,11 @@
clc; clear; close all;
-
+%%
+% This script executes algorithm 2 (TFF-P: filtering out P TF sub-regions)
+% proposed in paper [1] on a single dataset including engine sound and birdsong.
+%
+%
+% [1] Time-frequency fading algorithms based on Gabor multipliers,
+% A. Marina Kreme Valentin Emiya, Caroline Chaux, and Bruno Torresani
%%
dbstack;
%%
@@ -213,7 +219,8 @@ x_rec = @(lambda_coef)compute_estimate(lambda_coef, x_mix, s_vec_list,...,
-fprintf("Running time to tune lambda (oracle): %f \n",t_oracle);
+fprintf("Running time to tune lambda (oracle): %f \n")
+disp(t_oracle);
%% Estimate energy and lambda
@@ -256,7 +263,7 @@ is_wideband = @(lambda_coef) itakura_saito_dist_spectrum(x_wideband, x_rec(lambd
is_wideband_1area = @(lambda_coef,k_area)is_spectrum_engine_1aera(x_wideband, k_area,lambda_coef, n_areas,x_rec);
-%% SDR for each aera
+%% SDR for each area
l_range = 10.^linspace(-10,10,100);
@@ -355,7 +362,7 @@ set(gca, 'FontSize', 20, 'fontName','Times');
saveas(gcf,fullfile(fig_dir, 'tuning_lambda_SDR_IS.pdf'));
-%% Reconstructec signals
+%% Reconstructed signals
tf_mat_mix = compute_dgt(signals.mix, dgt );
x_oracle = x_rec(lambda_oracle);
diff --git a/matlab/tfgm/scripts/solve_all_tff1.m b/matlab/tfgm/scripts/solve_all_tff1.m
index e684bfbe2042ea7dd45d4d6c286cbbacc56ea268..841da385679d1042b107719c81c9abc43e5251ca 100644
--- a/matlab/tfgm/scripts/solve_all_tff1.m
+++ b/matlab/tfgm/scripts/solve_all_tff1.m
@@ -1,5 +1,12 @@
clc; clear; close all;
+%%
+% This script executes algorithm 1 (TFF-1: filtering out one TF region)
+% proposed in paper [1] on multiple datasets.
+%
+% [1] Time-frequency fading algorithms based on Gabor multipliers,
+% A. Marina Kreme Valentin Emiya, Caroline Chaux, and Bruno Torresani
+
%%
wb_list ={'car','plane','train'};
loc_list = {'beeps','bird','clicks','finger_snaps','modulations'};
diff --git a/matlab/tfgm/scripts/solve_all_tffP.m b/matlab/tfgm/scripts/solve_all_tffP.m
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8924e5c13cd60f3c767a896d8b06d7471833a4c9 100644
--- a/matlab/tfgm/scripts/solve_all_tffP.m
+++ b/matlab/tfgm/scripts/solve_all_tffP.m
@@ -0,0 +1,426 @@
+clc; clear; close all;
+%%
+% This script executes algorithm 2 (TFF-P: filtering out P TF sub-regions)
+% proposed in paper [1] on multiple datasets.
+
+% [1] Time-frequency fading algorithms based on Gabor multipliers,
+% A. Marina Kreme Valentin Emiya, Caroline Chaux, and Bruno Torresani
+%%
+wb_list ={'car','plane','train'};
+loc_list = {'beeps','bird','clicks','finger_snaps','modulations'};
+win_list = {'gauss 256', 'hann 512'};
+
+
+tol_subregions = 1e-5;
+gamma=0.7;
+%%
+
+f = fopen('exp_1area_cuicui.csv', 'w');
+fprintf(f, '%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s \n','loc_src', 'wb_src',...,
+ 'win_type','win_len','t_oracle','t_true_energy','t_est','t_arrf',...,
+ 't_evdn','t_ut_x','sdr_mix','sdr_interp', 'sdr_zero','sdr_est',...,
+ 'sdr_oracle','is_interp', 'is_mix', 'is_true', 'is_zero', 'is_est');
+
+
+%%
+for win =1:length(win_list)
+
+ [win_type, win_dur, win_len, hop_ratio, nbins_ratio] = get_win_params(win_list{win});
+
+ fprintf("window: %s - length: %.f\n", win_type, win_len);
+ for wb = 1:1%length(wb_list)
+ wideband_src = wb_list{wb};
+ fprintf("**************************************\n\n")
+ fprintf("This is the %.f ieme run. wideband source is:%s \n",wb ,wb_list{wb});
+ fprintf("**************************************\n\n")
+ for loc=1:1%length(loc_list)
+
+ pwd;
+ fig_dir =['fig_Paeras_',wb_list{wb},'_',loc_list{loc},'_', win_type,'_',num2str(win_len)];
+ if ~exist(fig_dir,'dir')
+ mkdir(fig_dir);
+ end
+ addpath(fig_dir)
+
+
+ %%
+ fprintf("loalized source number %.f : %s \n",loc,loc_list{loc}) ;
+ fprintf("**************************************\n\n")
+ loc_source=loc_list{loc};
+
+ %%
+ [alpha, seuil, radius] = set_smooth_mask_params(wideband_src, loc_source, win_type);
+
+
+ [signals, dgt_params, signal_params, mask, mask_area, dgt,...,
+ idgt] = get_mix(loc_source, wideband_src, gamma, win_dur, hop_ratio,...,
+ nbins_ratio, win_type, alpha, seuil, radius, fig_dir);
+
+
+ fprintf('win_len:%.f\n', length(dgt_params.win));
+ fprintf('hop:%.f\n', dgt_params.hop);
+ fprintf('n_bins:%.f\n', dgt_params.nbins);
+
+ %% create subregions
+
+ mask_bool = mask;
+ [mask_labeled, n_areas,t_subregions] = get_nareas(mask_bool,dgt, idgt, dgt_params,...,
+ signal_params, fig_dir, tol_subregions);
+
+ %% EVD via Halko
+
+ [gabmul_list, mask_list] = get_P_gabmul(mask_labeled, dgt, idgt);
+
+ x_mix = signals.mix;
+ tolerance_arrf = 1e-3;
+ proba_arrf = 1 - 1e-4;
+
+
+ [t_arrf,t_evdn, t_ut_x, rank_q, s_vec_list, u_mat_list,...,
+ ut_x_list,r] = compute_decomposition(x_mix, mask_list, gabmul_list,...,
+ tolerance_arrf, proba_arrf);
+
+ %% mask
+
+ [mask_area, mask_area_ratio] = get_mask_area(mask);
+ figure('name','mask');
+ plot_spectrogram(mask, dgt_params,signal_params, dgt);
+ title(['mask : mask-area = ',num2str(mask_area)]);
+ set(gca, 'FontSize', 20, 'fontName','Times');
+ saveas(gcf,fullfile(fig_dir,'mask.pdf'));
+
+
+ %% Plot eigenvalues
+ figure;
+
+ for k_area=1:n_areas
+ txt = ['sub-region =' num2str(k_area)];
+ plot(s_vec_list{k_area},'LineWidth',3, 'DisplayName',txt);
+ hold on;
+ end
+ xlabel('$k$','Interpreter','latex');
+ ylabel('$\sigma[k]$','Interpreter','latex');
+ set(gca,'YScale','log');
+ grid;
+ legend show;
+ set(gca, 'FontSize', 25, 'fontName','Times');
+ xlabel('$k$','Interpreter','latex');
+ set(gca, 'FontSize', 25, 'fontName','Times');
+ saveas(gcf,fullfile(fig_dir, 'gabmul_eigenvalues.pdf'));
+
+
+
+ %% Find optimal lambda (best SDR)
+
+ x_wideband = signals.wideband;
+ x_rec = @(lambda_coef)compute_estimate(lambda_coef, x_mix, s_vec_list,...,
+ u_mat_list, ut_x_list);
+
+ [lambda_oracle, t_oracle] = compute_lambda_oracle_sdr(n_areas,x_wideband, x_rec);
+
+
+
+ fprintf("Running time to tune lambda (oracle): %f \n",t_oracle);
+
+ %% Estimate energy and lambda
+
+
+ [lambda_est, t_lambda_est] = compute_lambda(x_mix, mask_labeled, dgt_params,...,
+ signal_params, dgt,s_vec_list, u_mat_list, ut_x_list,...,
+ gabmul_list,fig_dir);
+
+ fprintf("Running time to tune lambda (est): \n")
+ disp(t_lambda_est);
+
+
+ %% Estimate lambda from true energy
+
+ e_wideband_true_energy = zeros(n_areas,1);
+ x_wideband_tf_mat = dgt(gabmul_list{1}(signals.wideband));
+
+ for k_area =1:n_areas
+ mask_k = (mask_labeled==k_area);
+ x_wideband_tf_masked = mask_k .* x_wideband_tf_mat;
+
+ e_wideband_true_energy(k_area) =norm(x_wideband_tf_masked, 'fro').^2;
+ end
+ e_wideband = e_wideband_true_energy;
+
+ [lambda_true_energy, t_true_energy] = compute_lambda(x_mix, mask, dgt_params,...,
+ signal_params, dgt, s_vec_list, u_mat_list, ut_x_list,...,
+ gabmul_list,fig_dir, e_wideband);
+
+
+ fprintf("Running time to tune lambda (True):\n")
+ disp(t_true_energy);
+
+ %% Results
+
+ x_wideband = signals.wideband;
+ sdr_wideband = @(lambda_coef)sdr(x_wideband, x_rec(lambda_coef));
+
+ sdr_wideband_1area = @(lambda_coef, k_area)sdr_engine_1area(lambda_coef, k_area, x_rec, x_wideband, n_areas);
+
+ is_wideband = @(lambda_coef) itakura_saito_dist_spectrum(x_wideband, x_rec(lambda_coef));
+
+ is_wideband_1area = @(lambda_coef,k_area)is_spectrum_engine_1aera(x_wideband, k_area,lambda_coef, n_areas,x_rec);
+
+
+ %% sdr wideband
+
+ l_range = 10.^linspace(-10,10,100);
+
+ sdr_engine1area_l = zeros(length(l_range),1);
+
+
+ figure;
+ for k_area =1: n_areas
+ for k=1:length(l_range)
+ sdr_engine1area_l(k) = sdr_wideband_1area(l_range(k), k_area);
+ end
+ txt = ['SDR sub-reg =' num2str(k_area)];
+ plot(l_range, sdr_engine1area_l,'DisplayName',txt)
+ end
+
+ hold on;
+ for k_area =1:n_areas
+ txt1 = ['TFF-O ',num2str(k_area)];
+ plot(lambda_oracle(k_area), sdr_wideband_1area(lambda_oracle(k_area), k_area),...,
+ '*','LineWidth',3,'DisplayName',txt1);
+ txt2 = ['TFF-P',num2str(k_area)];
+ plot(lambda_est(k_area),sdr_wideband_1area(lambda_est(k_area), k_area),...,
+ 'o','LineWidth',3,'DisplayName',txt2);
+ txt3 = ['TFF-E',num2str(k_area)];
+ plot(lambda_true_energy(k_area),sdr_wideband_1area(lambda_true_energy(k_area), k_area),...,
+ 'o','LineWidth',3,'DisplayName',txt3);
+ txt4 = ['Zero fill',num2str(k_area)];
+ plot(1, sdr_wideband_1area(1, k_area), 'o','LineWidth',3,'DisplayName',txt4);
+
+ end
+ legend show;
+
+
+ xlabel('$\lambda$','Interpreter','latex')
+ ylabel('SDR(dB)')
+ set(gca,'XScale','log');
+ grid on;
+ set(gca, 'FontSize', 20, 'fontName','Times');
+
+ saveas(gcf,fullfile(fig_dir, 'tuning_lambda.pdf'));
+
+
+
+ %% Itakura saito
+ is_engine1area_l = zeros(length(l_range),1);
+
+ figure;
+ for k_area =1: n_areas
+ for k=1:length(l_range)
+ is_engine1area_l(k) = is_wideband_1area(l_range(k), k_area);
+ end
+ txt = ['SDR sub-reg =' num2str(k_area)];
+ plot(l_range, is_engine1area_l,'LineWidth',3,'DisplayName',txt)
+ end
+ hold on;
+ for k_area=1:n_areas
+
+ plot(lambda_oracle(k_area), is_wideband_1area(lambda_oracle(k_area),k_area), 'o','LineWidth',3)
+ plot(lambda_est(k_area), is_wideband_1area(lambda_est(k_area),k_area), 'o')
+ plot(lambda_true_energy(k_area), is_wideband_1area(lambda_true_energy(k_area),k_area),'o','LineWidth',3)
+ plot(1, is_wideband_1area(1,k_area), 'o','LineWidth',3)
+
+
+ end
+
+
+ xlabel('$\lambda$','Interpreter','latex')
+ ylabel('IS (dB)')
+ set(gca,'XScale','log');
+ grid()
+ legend('IS','TFF-O','TFF-P','TFF-E','Zero fill')
+ axis tight;
+ saveas(gcf,fullfile(fig_dir, 'tuning_lambda_IS.pdf'));
+
+ %% Itakura saito for each aera
+ figure;
+ yyaxis left;
+ plot(l_range, sdr_engine1area_l, '-','LineWidth',3); hold on;
+
+ grid on;
+ xlabel('$\lambda$','Interpreter','latex')
+ ylabel('SDR (dB)')
+ set(gca,'XScale','log');
+
+
+ yyaxis right;
+
+ plot(l_range,is_engine1area_l,'-','LineWidth',3); hold on;
+
+
+ axis tight;
+ legend('SDR TFF-P','IS TFF-P','Location','northwest');
+ xlabel('$\lambda$','Interpreter','latex')
+ ylabel('IS divergence')
+ set(gca, 'FontSize', 20, 'fontName','Times');
+
+
+ saveas(gcf,fullfile(fig_dir, 'tuning_lambda_SDR_IS.pdf'));
+ %%
+ figure;
+ yyaxis left;
+ plot(l_range, sdr_engine1area_l, '-','LineWidth',3); hold on;
+
+ grid on;
+ xlabel('$\lambda$','Interpreter','latex')
+ ylabel('SDR (dB)')
+ set(gca,'XScale','log');
+
+
+ yyaxis right;
+
+ plot(l_range,is_engine1area_l,'-','LineWidth',3); hold on;
+
+
+ axis tight;
+ legend('SDR TFF-P','IS TFF-P','Location','northwest');
+ xlabel('$\lambda$','Interpreter','latex')
+ ylabel('IS divergence')
+ set(gca, 'FontSize', 20, 'fontName','Times');
+
+
+ saveas(gcf,fullfile(fig_dir, 'tuning_lambda_SDR_IS.pdf'));
+
+
+
+ %% Reconstructed signals
+ tf_mat_mix = compute_dgt(signals.mix, dgt );
+
+ x_oracle = x_rec(lambda_oracle);
+ wav_write('x_oracle.wav', x_oracle, signal_params.fs);
+
+ x_est = x_rec(lambda_est);
+ wav_write('x_est.wav', x_est, signal_params.fs);
+
+ x_true_energy = x_rec(lambda_true_energy);
+ wav_write('x_true_energy.wav', x_true_energy, signal_params.fs);
+
+
+ x_zero = solver_tfgm_zero(tf_mat_mix, mask, idgt);
+ wav_write('x_zero_fill.wav', x_zero, signal_params.fs);
+
+ x_interp= solver_tfgm_interp(tf_mat_mix, mask, idgt);
+ wav_write('x_interp.wav', x_zero, signal_params.fs);
+
+
+ %% Sdr
+
+
+
+
+ sdr_oracle = sdr(x_wideband, x_oracle);
+ sdr_est = sdr(x_wideband, x_est);
+ sdr_true_energy = sdr(x_wideband, x_true_energy);
+ sdr_zero = sdr(x_wideband, x_zero);
+ sdr_interp = sdr(x_wideband, x_interp);
+ sdr_mix = sdr(x_wideband, x_mix);
+
+
+ %% Itakura saito
+ is_oracle = itakura_saito_dist_spectrum(x_wideband,x_oracle);
+ is_est = itakura_saito_dist_spectrum(x_wideband,x_est);
+ is_true_energy = itakura_saito_dist_spectrum(x_wideband,x_true_energy);
+ is_zero = itakura_saito_dist_spectrum(x_wideband,x_zero) ;
+ is_mix= itakura_saito_dist_spectrum(x_wideband,x_mix) ;
+ is_interp= itakura_saito_dist_spectrum(x_wideband,x_interp);
+
+ %%
+
+
+ fprintf('Oracle lambda: %f\n', lambda_oracle);
+ fprintf('SDR for oracle lambda: %f dB\n',sdr_oracle);
+
+
+ fprintf('Estimated lambda: %f \n', lambda_est);
+ fprintf('SDR for estimated lambda: %f dB\n', sdr_est);
+
+
+ fprintf('True-energy lambda: %f \n', lambda_true_energy);
+ fprintf('SDR for true-energy lambda: %f dB\n', sdr_true_energy);
+
+ fprintf('Zero filling SDR: %f dB\n', sdr_zero);
+ fprintf('Mix SDR: %f dB \n',sdr_mix);
+ fprintf('Interp + random phases filling SDR: %e dB\n',sdr_interp);
+
+
+ %%
+
+ figure;
+ plot_spectrogram(x_mix, dgt_params, signal_params, dgt);
+ title(['Mix SDR=' , num2str(sdr_mix,4),'dB ','IS= ',num2str(is_mix)]);
+ set(gca, 'FontSize', 20, 'fontName','Times');
+ axis tight;
+ saveas(gcf,fullfile(fig_dir, 'mix.pdf'));
+
+ figure;
+ plot_spectrogram(signals.wideband, dgt_params, signal_params, dgt);
+ title(['True source -', wideband_src])
+ set(gca, 'FontSize', 20, 'fontName','Times');
+ saveas(gcf,fullfile(fig_dir, 'spectrogram_true_wb_source.pdf'));
+
+
+ figure;
+ plot_spectrogram(x_zero, dgt_params, signal_params, dgt)
+ title(['Zero fill SDR= ', num2str(sdr_zero,4),'dB ', 'IS=', num2str(is_zero)])
+ set(gca, 'FontSize', 20, 'fontName','Times');
+ saveas(gcf,fullfile(fig_dir, 'spectrogram_zero_fill.pdf'));
+
+
+
+
+ figure;
+ plot_spectrogram(x_oracle, dgt_params, signal_params, dgt)
+ title(['TFF-O SDR= ', num2str(sdr_oracle,4), 'dB ','IS=', num2str(is_oracle)])
+ set(gca, 'FontSize', 20, 'fontName','Times');
+ axis tight;
+ saveas(gcf,fullfile(fig_dir,'spectrogram_TFF-O.pdf'));
+
+
+
+ %%
+
+ figure;
+ plot_spectrogram(x_est, dgt_params, signal_params, dgt)
+ title(['TFF-P - SDR= ',num2str(sdr_est,4),'dB ','IS=',num2str(is_est)])
+ set(gca, 'FontSize', 20, 'fontName','Times');
+ axis tight;
+ saveas(gcf,fullfile(fig_dir, 'spectrogram_TFF-P.pdf'));
+
+
+ %%
+ figure;
+ plot_spectrogram(x_true_energy, dgt_params, signal_params,dgt)
+ title(['TFF-E SDR= ', num2str(sdr_true_energy,4),'dB ','IS=',num2str(is_true_energy) ])
+ set(gca, 'FontSize', 20, 'fontName','Times');
+ saveas(gcf,fullfile(fig_dir, 'spectrogram_TFF-E.pdf'));
+ %%
+
+
+ figure;
+ plot_spectrogram(x_interp, dgt_params, signal_params,dgt)
+ title(['Interp SDR= ', num2str(sdr_interp,4),'dB ','IS=',num2str(is_interp)])
+ set(gca, 'FontSize', 20, 'fontName','Times');
+ saveas(gcf,fullfile(fig_dir,'spectrogram_interp.pdf'));
+ %% save in csv
+ fprintf(f,'%s %s %s %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f \n',...,
+ wb_list{wb},loc_list{loc},win_list{win},win_len,t_oracle,t_true_energy,...,
+ t_est,t_arrf,t_evdn,t_ut_x,sdr_mix, sdr_interp,...,
+ sdr_zero,sdr_est,sdr_oracle, is_interp, is_mix, is_est, is_zero, is_oracle);
+
+
+
+ end
+
+ end
+end
+
+