From fca782f8e4eeaaf7a49d948476279cba54e1f3c5 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Fri, 1 Dec 2023 20:00:43 +0100 Subject: [PATCH] Correct LaTeX output by disentangling purpose of input arguments --- matlab/gsa/filt_mc_.m | 25 +++++++++++----- matlab/gsa/map_calibration.m | 17 +++++++++++ matlab/gsa/mcf_analysis.m | 25 ++++++++++++---- matlab/gsa/redform_map.m | 9 ++++++ matlab/gsa/scatter_mcf.m | 8 ++--- matlab/gsa/stab_map_.m | 20 +++++++++++++ matlab/gsa/stab_map_2.m | 57 ++++++++++++++++++++---------------- matlab/plot_identification.m | 4 +++ 8 files changed, 123 insertions(+), 42 deletions(-) diff --git a/matlab/gsa/filt_mc_.m b/matlab/gsa/filt_mc_.m index 7941e4121..6624517e5 100644 --- a/matlab/gsa/filt_mc_.m +++ b/matlab/gsa/filt_mc_.m @@ -310,6 +310,11 @@ if ~options_.opt_gsa.ppost && options_.opt_gsa.lik_only options_mcf.title = atitle; options_mcf.beha_title = 'better posterior kernel'; options_mcf.nobeha_title = 'worse posterior kernel'; + if options_.TeX + options_mcf.beha_title_latex = 'better posterior kernel'; + options_mcf.nobeha_title_latex = 'worse posterior kernel'; + end + mcf_analysis(x, ipost(1:nfilt), ipost(nfilt+1:end), options_mcf, M_, options_, bayestopt_, estim_params_); if options_.opt_gsa.pprior anam = 'rmse_prior_lik'; @@ -323,6 +328,11 @@ if ~options_.opt_gsa.ppost && options_.opt_gsa.lik_only options_mcf.title = atitle; options_mcf.beha_title = 'better likelihood'; options_mcf.nobeha_title = 'worse likelihood'; + if options_.TeX + options_mcf.beha_title_latex = 'better likelihood'; + options_mcf.nobeha_title_latex = 'worse likelihood'; + end + mcf_analysis(x, ilik(1:nfilt), ilik(nfilt+1:end), options_mcf, M_, options_, bayestopt_, estim_params_); else @@ -733,12 +743,11 @@ else for iy = 1:length(vvarvecm) options_mcf.amcf_name = [asname '_' vvarvecm{iy} '_map' ]; options_mcf.amcf_title = [atitle ' ' vvarvecm{iy}]; + options_mcf.beha_title = ['better fit of ' vvarvecm{iy}]; + options_mcf.nobeha_title = ['worse fit of ' vvarvecm{iy}]; if options_.TeX - options_mcf.beha_title = ['better fit of ' vvarvecm_tex{iy}]; - options_mcf.nobeha_title = ['worse fit of ' vvarvecm_tex{iy}]; - else - options_mcf.beha_title = ['better fit of ' vvarvecm{iy}]; - options_mcf.nobeha_title = ['worse fit of ' vvarvecm{iy}]; + options_mcf.beha_title_latex = ['better fit of ' vvarvecm_tex{iy}]; + options_mcf.nobeha_title_latex = ['worse fit of ' vvarvecm_tex{iy}]; end options_mcf.title = ['the fit of ' vvarvecm{iy}]; mcf_analysis(x, ixx(1:nfilt0(iy),iy), ixx(nfilt0(iy)+1:end,iy), options_mcf, M_, options_, bayestopt_, estim_params_); @@ -784,18 +793,18 @@ else if options_.opt_gsa.ppost dyn_saveas(hh_fig,[ OutDir filesep fname_ '_rmse_post_' vvarvecm{iy} '_' int2str(ix)],options_.nodisplay,options_.graph_format); if options_.TeX - create_TeX_loader(options_,[ OutDir filesep fname_ '_rmse_post_' vvarvecm{iy} '_' int2str(ix)],ix,[temp_name,' observed variable $',vvarvecm_tex{iy} '$'],['rmse_post_' vvarvecm{iy}],1) + create_TeX_loader(options_,[ OutDir filesep fname_ '_rmse_post_' vvarvecm{iy} '_' int2str(ix)],ix,[temp_name,' observed variable ',vvarvecm_tex{iy} ],['rmse_post_' vvarvecm{iy}],1) end else if options_.opt_gsa.pprior dyn_saveas(hh_fig,[OutDir filesep fname_ '_rmse_prior_' vvarvecm{iy} '_' int2str(ix) ],options_.nodisplay,options_.graph_format); if options_.TeX - create_TeX_loader(options_,[OutDir filesep fname_ '_rmse_prior_' vvarvecm{iy} '_' int2str(ix) ],ix,[temp_name,' observed variable $',vvarvecm_tex{iy} '$'],['rmse_prior_' vvarvecm{iy}],1) + create_TeX_loader(options_,[OutDir filesep fname_ '_rmse_prior_' vvarvecm{iy} '_' int2str(ix) ],ix,[temp_name,' observed variable ',vvarvecm_tex{iy}],['rmse_prior_' vvarvecm{iy}],1) end else dyn_saveas(hh_fig,[OutDir filesep fname_ '_rmse_mc_' vvarvecm{iy} '_' int2str(ix)],options_.nodisplay,options_.graph_format); if options_.TeX - create_TeX_loader(options_,[OutDir filesep fname_ '_rmse_mc_' vvarvecm{iy} '_' int2str(ix)],ix,[temp_name,' observed variable $',vvarvecm_tex{iy} '$'],['rmse_mc_' vvarvecm{iy}],1) + create_TeX_loader(options_,[OutDir filesep fname_ '_rmse_mc_' vvarvecm{iy} '_' int2str(ix)],ix,[temp_name,' observed variable ',vvarvecm_tex{iy}],['rmse_mc_' vvarvecm{iy}],1) end end end diff --git a/matlab/gsa/map_calibration.m b/matlab/gsa/map_calibration.m index 64c46e329..576cd34da 100644 --- a/matlab/gsa/map_calibration.m +++ b/matlab/gsa/map_calibration.m @@ -251,6 +251,10 @@ if ~isempty(indx_irf) options_mcf.amcf_title = atitle; options_mcf.beha_title = 'IRF restriction'; options_mcf.nobeha_title = 'NO IRF restriction'; + if options_.TeX + options_mcf.beha_title_latex = 'IRF restriction'; + options_mcf.nobeha_title_latex = 'NO IRF restriction'; + end options_mcf.title = atitle0; if ~isempty(indx1) && ~isempty(indx2) mcf_analysis(xmat(:,nshock+1:end), indx1, indx2, options_mcf, M_, options_, bayestopt_, estim_params_); @@ -303,6 +307,11 @@ if ~isempty(indx_irf) options_mcf.amcf_title = atitle; options_mcf.beha_title = 'IRF restriction'; options_mcf.nobeha_title = 'NO IRF restriction'; + if options_.TeX + options_mcf.beha_title_latex = 'IRF restriction'; + options_mcf.nobeha_title_latex = 'NO IRF restriction'; + end + options_mcf.title = atitle0; if ~isempty(indx1) && ~isempty(indx2) mcf_analysis(xmat(:,nshock+1:end), indx1, indx2, options_mcf, M_, options_, bayestopt_, estim_params_); @@ -446,6 +455,10 @@ if ~isempty(indx_moment) options_mcf.amcf_title = atitle; options_mcf.beha_title = 'moment restriction'; options_mcf.nobeha_title = 'NO moment restriction'; + if options_.TeX + options_mcf.beha_title_latex = 'moment restriction'; + options_mcf.nobeha_title_latex = 'NO moment restriction'; + end options_mcf.title = atitle0; if ~isempty(indx1) && ~isempty(indx2) mcf_analysis(xmat, indx1, indx2, options_mcf, M_, options_, bayestopt_, estim_params_); @@ -499,6 +512,10 @@ if ~isempty(indx_moment) options_mcf.amcf_title = atitle; options_mcf.beha_title = 'moment restriction'; options_mcf.nobeha_title = 'NO moment restriction'; + if options_.TeX + options_mcf.beha_title_latex = 'moment restriction'; + options_mcf.nobeha_title_latex = 'NO moment restriction'; + end options_mcf.title = atitle0; if ~isempty(indx1) && ~isempty(indx2) mcf_analysis(xmat, indx1, indx2, options_mcf, M_, options_, bayestopt_, estim_params_); diff --git a/matlab/gsa/mcf_analysis.m b/matlab/gsa/mcf_analysis.m index 916013721..795a664ec 100644 --- a/matlab/gsa/mcf_analysis.m +++ b/matlab/gsa/mcf_analysis.m @@ -54,6 +54,10 @@ amcf_name = options_mcf.amcf_name; amcf_title = options_mcf.amcf_title; beha_title = options_mcf.beha_title; nobeha_title = options_mcf.nobeha_title; +if options_.TeX + beha_title_latex = options_mcf.beha_title_latex; + nobeha_title_latex = options_mcf.nobeha_title_latex; +end title = options_mcf.title; fname_ = options_mcf.fname_; xparam1=[]; @@ -82,8 +86,13 @@ if ~isempty(indmcf) end if length(ibeha)>10 && length(inobeha)>10 - indcorr1 = stab_map_2(lpmat(ibeha,:),alpha2, pvalue_corr, M_, options_, bayestopt_, estim_params_, beha_title); - indcorr2 = stab_map_2(lpmat(inobeha,:),alpha2, pvalue_corr, M_, options_, bayestopt_, estim_params_, nobeha_title); + if options_.TeX + indcorr1 = stab_map_2(lpmat(ibeha,:),alpha2, pvalue_corr, M_, options_, bayestopt_, estim_params_, beha_title, beha_title_latex); + indcorr2 = stab_map_2(lpmat(inobeha,:),alpha2, pvalue_corr, M_, options_, bayestopt_, estim_params_, nobeha_title, nobeha_title_latex); + else + indcorr1 = stab_map_2(lpmat(ibeha,:),alpha2, pvalue_corr, M_, options_, bayestopt_, estim_params_, beha_title); + indcorr2 = stab_map_2(lpmat(inobeha,:),alpha2, pvalue_corr, M_, options_, bayestopt_, estim_params_, nobeha_title); + end indcorr = union(indcorr1(:), indcorr2(:)); indcorr = indcorr(~ismember(indcorr(:),indmcf)); indmcf = [indmcf(:); indcorr(:)]; @@ -94,7 +103,13 @@ if ~isempty(indmcf) && ~options_.nograph if ~ isempty(xparam1) xx=xparam1(indmcf); end - scatter_mcf(lpmat(ibeha,indmcf),lpmat(inobeha,indmcf), param_names_tex(indmcf), ... - '.', [fname_,'_',amcf_name], OutputDirectoryName, amcf_title,xx, options_, ... - beha_title, nobeha_title) + if options_.TeX + scatter_mcf(lpmat(ibeha,indmcf),lpmat(inobeha,indmcf), param_names_tex(indmcf), ... + '.', [fname_,'_',amcf_name], OutputDirectoryName, amcf_title,xx, options_, ... + beha_title, nobeha_title, beha_title_latex, nobeha_title_latex) + else + scatter_mcf(lpmat(ibeha,indmcf),lpmat(inobeha,indmcf), param_names_tex(indmcf), ... + '.', [fname_,'_',amcf_name], OutputDirectoryName, amcf_title,xx, options_, ... + beha_title, nobeha_title) + end end diff --git a/matlab/gsa/redform_map.m b/matlab/gsa/redform_map.m index a1b7604f9..a368c975e 100644 --- a/matlab/gsa/redform_map.m +++ b/matlab/gsa/redform_map.m @@ -201,6 +201,10 @@ for j = 1:length(anamendo) options_mcf.amcf_title = atitle; options_mcf.beha_title = 'inside threshold'; options_mcf.nobeha_title = 'outside threshold'; + if options_.TeX + options_mcf.beha_title_latex = 'inside threshold'; + options_mcf.nobeha_title_latex = 'outside threshold'; + end options_mcf.title = atitle0; options_mcf.OutputDirectoryName = xdir; if ~isempty(iy) && ~isempty(iyc) @@ -351,6 +355,11 @@ for j = 1:length(anamendo) options_mcf.amcf_title = atitle; options_mcf.beha_title = 'inside threshold'; options_mcf.nobeha_title = 'outside threshold'; + if options_.TeX + options_mcf.beha_title_latex = 'inside threshold'; + options_mcf.nobeha_title_latex = 'outside threshold'; + end + options_mcf.title = atitle0; options_mcf.OutputDirectoryName = xdir; if ~isempty(iy) && ~isempty(iyc) diff --git a/matlab/gsa/scatter_mcf.m b/matlab/gsa/scatter_mcf.m index 8c6c1908f..f10995c79 100644 --- a/matlab/gsa/scatter_mcf.m +++ b/matlab/gsa/scatter_mcf.m @@ -1,5 +1,5 @@ -function scatter_mcf(X,Y,vnames,plotsymbol, fnam, dirname, figtitle, xparam1, options_, beha_name, non_beha_name) -% scatter_mcf(X,Y,vnames,plotsymbol, fnam, dirname, figtitle, xparam1, options_, beha_name, non_beha_name) +function scatter_mcf(X,Y,vnames,plotsymbol, fnam, dirname, figtitle, xparam1, options_, beha_name, non_beha_name, beha_name_latex, non_beha_name_latex) +% scatter_mcf(X,Y,vnames,plotsymbol, fnam, dirname, figtitle, xparam1, options_, beha_name, non_beha_name, beha_name_latex, non_beha_name_latex) % % Written by Marco Ratto % Joint Research Centre, The European Commission, @@ -168,8 +168,8 @@ for i = 1:p end if ~isoctave if options_.TeX - annotation('textbox', [0.1,0,0.35,0.05],'String', beha_name,'Color','Blue','horizontalalignment','center','interpreter','latex'); - annotation('textbox', [0.55,0,0.35,0.05],'String', non_beha_name,'Color','Red','horizontalalignment','center','interpreter','latex'); + annotation('textbox', [0.1,0,0.35,0.05],'String', beha_name_latex,'Color','Blue','horizontalalignment','center','interpreter','latex'); + annotation('textbox', [0.55,0,0.35,0.05],'String', non_beha_name_latex,'Color','Red','horizontalalignment','center','interpreter','latex'); else annotation('textbox', [0.1,0,0.35,0.05],'String', beha_name,'Color','Blue','horizontalalignment','center','interpreter','none'); annotation('textbox', [0.55,0,0.35,0.05],'String', non_beha_name,'Color','Red','horizontalalignment','center','interpreter','none'); diff --git a/matlab/gsa/stab_map_.m b/matlab/gsa/stab_map_.m index 74135dc74..ba2d646b8 100644 --- a/matlab/gsa/stab_map_.m +++ b/matlab/gsa/stab_map_.m @@ -491,6 +491,10 @@ if ~isempty(iunstable) || ~isempty(iwrong) options_mcf.amcf_title = atitle; options_mcf.beha_title = 'unique Stable Saddle-Path'; options_mcf.nobeha_title = 'NO unique Stable Saddle-Path'; + if options_.TeX + options_mcf.beha_title_latex = 'unique Stable Saddle-Path'; + options_mcf.nobeha_title_latex = 'NO unique Stable Saddle-Path'; + end options_mcf.title = 'unique solution'; mcf_analysis(lpmat, istable, itmp, options_mcf, M_, options_, bayestopt_, estim_params_); @@ -500,6 +504,10 @@ if ~isempty(iunstable) || ~isempty(iwrong) options_mcf.amcf_title = aindtitle; options_mcf.beha_title = 'NO indeterminacy'; options_mcf.nobeha_title = 'indeterminacy'; + if options_.TeX + options_mcf.beha_title_latex = 'NO indeterminacy'; + options_mcf.nobeha_title_latex = 'indeterminacy'; + end options_mcf.title = 'indeterminacy'; mcf_analysis(lpmat, itmp, iindeterm, options_mcf, M_, options_, bayestopt_, estim_params_); end @@ -510,6 +518,10 @@ if ~isempty(iunstable) || ~isempty(iwrong) options_mcf.amcf_title = aunsttitle; options_mcf.beha_title = 'NO explosive solution'; options_mcf.nobeha_title = 'explosive solution'; + if options_.TeX + options_mcf.beha_title_latex = 'NO explosive solution'; + options_mcf.nobeha_title_latex = 'explosive solution'; + end options_mcf.title = 'instability'; mcf_analysis(lpmat, itmp, ixun, options_mcf, M_, options_, bayestopt_, estim_params_); end @@ -522,6 +534,10 @@ if ~isempty(iunstable) || ~isempty(iwrong) options_mcf.amcf_title = awrongtitle; options_mcf.beha_title = 'NO inability to find a solution'; options_mcf.nobeha_title = 'inability to find a solution'; + if options_.TeX + options_mcf.beha_title_latex = 'NO inability to find a solution'; + options_mcf.nobeha_title_latex = 'inability to find a solution'; + end options_mcf.title = 'inability to find a solution'; mcf_analysis(lpmat, itmp, iwrong, options_mcf, M_, options_, bayestopt_, estim_params_); end @@ -551,6 +567,10 @@ if ~isempty(iunstable) || ~isempty(iwrong) options_mcf.amcf_title = acalibtitle; options_mcf.beha_title = 'prior IRF/moment calibration'; options_mcf.nobeha_title = 'NO prior IRF/moment calibration'; + if options_.TeX + options_mcf.beha_title_latex = 'prior IRF/moment calibration'; + options_mcf.nobeha_title_latex = 'NO prior IRF/moment calibration'; + end options_mcf.title = 'prior restrictions'; mcf_analysis([lpmat0 lpmat], irestriction, inorestriction, options_mcf, M_, options_, bayestopt_, estim_params_); iok = irestriction(1); diff --git a/matlab/gsa/stab_map_2.m b/matlab/gsa/stab_map_2.m index 608d54595..c6c06da19 100644 --- a/matlab/gsa/stab_map_2.m +++ b/matlab/gsa/stab_map_2.m @@ -1,5 +1,5 @@ -function indcorr = stab_map_2(x,alpha2, pvalue_crit, M_,options_,bayestopt_,estim_params_, fnam, dirname,xparam1,figtitle) -% indcorr = stab_map_2(x,alpha2, pvalue_crit, M_,options_,bayestopt_,estim_params_, fnam, dirname,xparam1,figtitle) +function indcorr = stab_map_2(x,alpha2, pvalue_crit, M_,options_,bayestopt_,estim_params_, case_name_plain, case_name_latex, dirname,xparam1,figtitle,fig_caption_latex) +% indcorr = stab_map_2(x,alpha2, pvalue_crit, M_,options_,bayestopt_,estim_params_, fnam, fnam_latex, dirname,xparam1,figtitle,fig_caption_latex) % Inputs: % - x % - alpha2 @@ -39,18 +39,25 @@ function indcorr = stab_map_2(x,alpha2, pvalue_crit, M_,options_,bayestopt_,esti npar=size(x,2); ishock= npar>estim_params_.np; nograph = options_.nograph; + if nargin<8 - fnam=''; + case_name_plain=''; end if nargin<9 + case_name_latex=case_name_plain; +end +if nargin<10 dirname=''; nograph=1; end -if nargin<10 +if nargin<11 xparam1=[]; end -if nargin<11 - figtitle=fnam; +if nargin<12 + figtitle=case_name_plain; +end +if nargin<13 + fig_caption_latex=case_name_latex; end fname_ = M_.fname; @@ -61,9 +68,9 @@ nshock = nshock + estim_params_.ncn; [c0, pvalue] = corrcoef(x); c00=tril(c0,-1); -fig_nam_=[fname_,'_',fnam,'_corr_']; -fig_nam_tex_table=strrep([fnam,'_corr'],' ','_'); -fig_nam_=strrep(fig_nam_,' ','_'); +fig_nam_save=[fname_,'_',case_name_plain,'_corr_']; +fig_nam_save=strrep(fig_nam_save,' ','_'); +fig_nam_tex_table_save=strrep([case_name_plain,'_corr'],' ','_'); ifig=0; j2=0; @@ -75,8 +82,8 @@ if ishock==0 else npar=estim_params_.np+nshock; end -title_string=['Correlation analysis for ',fnam]; -title_string_tex=['Correlation analysis for ',strrep(fnam,'_','\\_')]; +title_string=['Correlation analysis for ',case_name_plain]; +title_string_tex=['Correlation analysis for ',case_name_latex]; indcorr = []; entry_iter=1; @@ -94,7 +101,7 @@ for j=1:npar tmp_name=(['[',param_name_temp1,',',param_name_temp2,']']); tmp_name_tex=(['[',param_name_tex_temp1,',',param_name_tex_temp2,']']); name{entry_iter,1}=tmp_name; - name_tex{entry_iter,1}=tmp_name_tex; + name_tex{entry_iter,1}=strrep(tmp_name_tex,'$',''); %prevent $ inside of expression for table else [param_name_temp1]= get_the_name(j,options_.TeX,M_,estim_params_,options_.varobs); [param_name_temp2]= get_the_name(i2(jx),options_.TeX,M_,estim_params_,options_.varobs); @@ -108,7 +115,7 @@ for j=1:npar tmp_name=(['[',param_name_temp1,',',param_name_temp2,']']); tmp_name_tex=(['[',param_name_tex_temp1,',',param_name_tex_temp2,']']); name{entry_iter,1}=tmp_name; - name_tex{entry_iter,1}=tmp_name_tex; + name_tex{entry_iter,1}=strrep(tmp_name_tex,'$',''); %prevent $ inside of expression for table else [param_name_temp1]= get_the_name(j+nshock,options_.TeX,M_,estim_params_,options_.varobs); [param_name_temp2]= get_the_name(i2(jx)+nshock,options_.TeX,M_,estim_params_,options_.varobs); @@ -138,16 +145,16 @@ for j=1:npar end title(['cc = ',num2str(c0(i2(jx),j))]) if (mod(j2,12)==0) && j2>0 - dyn_saveas(hh_fig,[dirname,filesep,fig_nam_,int2str(ifig)],options_.nodisplay,options_.graph_format); + dyn_saveas(hh_fig,[dirname,filesep,fig_nam_save,int2str(ifig)],options_.nodisplay,options_.graph_format); if options_.TeX && any(strcmp('eps',cellstr(options_.graph_format))) - fidTeX = fopen([dirname,filesep,fig_nam_,int2str(ifig),'.tex'],'w'); + fidTeX = fopen([dirname,filesep,fig_nam_save,int2str(ifig),'.tex'],'w'); fprintf(fidTeX,'%% TeX eps-loader file generated by stab_map_2.m (Dynare).\n'); fprintf(fidTeX,['%% ' datestr(now,0) '\n\n']); fprintf(fidTeX,'\\begin{figure}[H]\n'); fprintf(fidTeX,'\\centering \n'); - fprintf(fidTeX,'\\includegraphics[width=0.8\\textwidth]{%s}\n',strrep([dirname,'/',fig_nam_,int2str(ifig)],'\','/')); - fprintf(fidTeX,'\\caption{%s.}',[figtitle,' sample bivariate projection ', num2str(ifig)]); - fprintf(fidTeX,'\\label{Fig:%s:%u}\n',fig_nam_,ifig); + fprintf(fidTeX,'\\includegraphics[width=0.8\\textwidth]{%s}\n',strrep([dirname,'/',fig_nam_save,int2str(ifig)],'\','/')); + fprintf(fidTeX,'\\caption{%s.}',[fig_caption_latex,' sample bivariate projection ', num2str(ifig)]); + fprintf(fidTeX,'\\label{Fig:%s:%u}\n',fig_nam_save,ifig); fprintf(fidTeX,'\\end{figure}\n\n'); fprintf(fidTeX,'%% End Of TeX file. \n'); fclose(fidTeX); @@ -159,16 +166,16 @@ for j=1:npar end end if ~nograph && (j==(npar)) && j2>0 && (mod(j2,12)~=0) - dyn_saveas(hh_fig,[dirname,filesep,fig_nam_,int2str(ifig)],options_.nodisplay,options_.graph_format); + dyn_saveas(hh_fig,[dirname,filesep,fig_nam_save,int2str(ifig)],options_.nodisplay,options_.graph_format); if options_.TeX && any(strcmp('eps',cellstr(options_.graph_format))) - fidTeX = fopen([dirname,filesep,fig_nam_,int2str(ifig),'.tex'],'w'); + fidTeX = fopen([dirname,filesep,fig_nam_save,int2str(ifig),'.tex'],'w'); fprintf(fidTeX,'%% TeX eps-loader file generated by stab_map_2.m (Dynare).\n'); fprintf(fidTeX,['%% ' datestr(now,0) '\n\n']); fprintf(fidTeX,'\\begin{figure}[H]\n'); fprintf(fidTeX,'\\centering \n'); - fprintf(fidTeX,'\\includegraphics[width=%2.2f\\textwidth]{%s}\n',options_.figures.textwidth*min((j2-(ifig-1)*12)/3,1),strrep([dirname,'/',fig_nam_,int2str(ifig)],'\','/')); - fprintf(fidTeX,'\\caption{%s.}',[figtitle,' sample bivariate projection ', num2str(ifig)]); - fprintf(fidTeX,'\\label{Fig:%s:%u}\n',fig_nam_,ifig); + fprintf(fidTeX,'\\includegraphics[width=%2.2f\\textwidth]{%s}\n',options_.figures.textwidth*min((j2-(ifig-1)*12)/3,1),strrep([dirname,'/',fig_nam_save,int2str(ifig)],'\','/')); + fprintf(fidTeX,'\\caption{%s.}',[fig_caption_latex,' sample bivariate projection ', num2str(ifig)]); + fprintf(fidTeX,'\\label{Fig:%s:%u}\n',fig_nam_save,ifig); fprintf(fidTeX,'\\end{figure}\n\n'); fprintf(fidTeX,'%% End Of TeX file. \n'); fclose(fidTeX); @@ -178,7 +185,7 @@ end if j2==0 skipline(); - disp(['No correlation term with pvalue <', num2str(pvalue_crit),' and |corr. coef.| >',num2str(alpha2),' found for ',fnam]) + disp(['No correlation term with pvalue <', num2str(pvalue_crit),' and |corr. coef.| >',num2str(alpha2),' found for ',case_name_plain]) else headers={'Parameters'; 'corrcoef'}; if ~options_.noprint @@ -186,6 +193,6 @@ else end dyntable(options_,title_string,headers, name, data_mat, 0, 7, 3); if options_.TeX - dyn_latex_table(M_, options_, title_string_tex, fig_nam_tex_table, headers, name_tex, data_mat, 0, 7, 3); + dyn_latex_table(M_, options_, title_string_tex, fig_nam_tex_table_save, headers, name_tex, data_mat, 0, 7, 3); end end \ No newline at end of file diff --git a/matlab/plot_identification.m b/matlab/plot_identification.m index 4afbf7ff2..035c9a325 100644 --- a/matlab/plot_identification.m +++ b/matlab/plot_identification.m @@ -441,6 +441,10 @@ else options_mcf.OutputDirectoryName = IdentifDirectoryName; options_mcf.beha_title = 'LOW condition nbr'; options_mcf.nobeha_title = 'HIGH condition nbr'; + if options_.TeX + options_mcf.beha_title_latex = 'LOW condition nbr'; + options_mcf.nobeha_title_latex = 'HIGH condition nbr'; + end options_mcf.amcf_name = 'MC_HighestCondNumberLRE'; options_mcf.amcf_title = 'MC Highest Condition Number LRE Model'; options_mcf.title = 'MC Highest Condition Number LRE Model';