diff --git a/matlab/gsa/mcf_analysis.m b/matlab/gsa/mcf_analysis.m index ae577181c..b01ba58e0 100644 --- a/matlab/gsa/mcf_analysis.m +++ b/matlab/gsa/mcf_analysis.m @@ -63,7 +63,7 @@ if ~isempty(indmcf) labels_TeX=param_names_tex(indmcf,:); M_temp.dname=OutputDirectoryName ; M_temp.fname=fname_; - dyn_latex_table(M_temp,options_temp,['Smirnov statistics in driving ', strrep(title,'_','\_')],amcf_name,headers,labels_TeX,data_mat,size(labels,2)+2,16,6); + dyn_latex_table(M_temp,options_temp,['Smirnov statistics in driving ', strrep(title,'_','\\_')],amcf_name,headers,labels_TeX,data_mat,size(labels,2)+2,16,6); end end diff --git a/matlab/gsa/scatter_mcf.m b/matlab/gsa/scatter_mcf.m index ae5901920..30d841c8d 100644 --- a/matlab/gsa/scatter_mcf.m +++ b/matlab/gsa/scatter_mcf.m @@ -79,6 +79,8 @@ if nargin==10, non_beha_name = ['NON-' beha_name]; end +figtitle_tex=strrep(figtitle,'_','\_'); + fig_nam_=[fnam]; if ~nograph, hh=dyn_figure(DynareOptions,'name',figtitle); @@ -166,12 +168,12 @@ if ~nograph, dyn_saveas(hh,[dirname,filesep,fig_nam_],DynareOptions); if DynareOptions.TeX && any(strcmp('eps',cellstr(DynareOptions.graph_format))) fidTeX = fopen([dirname,'/',fig_nam_ '.tex'],'w'); - fprintf(fidTeX,'%% TeX eps-loader file generated by stab_map_2.m (Dynare).\n'); + fprintf(fidTeX,'%% TeX eps-loader file generated by scatter_mcf.m (Dynare).\n'); fprintf(fidTeX,['%% ' datestr(now,0) '\n\n']); fprintf(fidTeX,'\\begin{figure}[H]\n'); fprintf(fidTeX,'\\centering \n'); - fprintf(fidTeX,'\\includegraphics[scale=0.5]{%s}\n',[dirname,'/',fig_nam_]); - fprintf(fidTeX,'\\caption{%s.}',figtitle); + fprintf(fidTeX,'\\includegraphics[scale=0.5]{%s}\n',strrep([dirname,'/',fig_nam_],'\','/')); + fprintf(fidTeX,'\\caption{%s.}',figtitle_tex); fprintf(fidTeX,'\\label{Fig:%s}\n',fig_nam_); fprintf(fidTeX,'\\end{figure}\n\n'); fprintf(fidTeX,'%% End Of TeX file. \n'); diff --git a/matlab/gsa/stab_map_1.m b/matlab/gsa/stab_map_1.m index 3218b8d3c..94d32a145 100644 --- a/matlab/gsa/stab_map_1.m +++ b/matlab/gsa/stab_map_1.m @@ -104,11 +104,11 @@ if iplot && ~options_.nograph dyn_saveas(hh,[dirname,filesep,fname_,'_',aname,'_SA_',int2str(i)],options_); if options_.TeX && any(strcmp('eps',cellstr(options_.graph_format))) fidTeX = fopen([dirname,filesep,fname_,'_',aname,'_SA_',int2str(i) '.tex'],'w'); - fprintf(fidTeX,'%% TeX eps-loader file generated by stab_map_2.m (Dynare).\n'); + fprintf(fidTeX,'%% TeX eps-loader file generated by stab_map_1.m (Dynare).\n'); fprintf(fidTeX,['%% ' datestr(now,0) '\n\n']); fprintf(fidTeX,'\\begin{figure}[H]\n'); fprintf(fidTeX,'\\centering \n'); - fprintf(fidTeX,'\\includegraphics[scale=0.5]{%s}\n',[dirname,filesep,fname_,'_',aname,'_SA_',int2str(i)]); + fprintf(fidTeX,'\\includegraphics[scale=0.5]{%s}\n',strrep([dirname,filesep,fname_,'_',aname,'_SA_',int2str(i)],'\','/')); fprintf(fidTeX,'\\caption{%s.}',atitle); fprintf(fidTeX,'\\label{Fig:%s:%u}\n',atitle,i); fprintf(fidTeX,'\\end{figure}\n\n'); @@ -119,11 +119,11 @@ if iplot && ~options_.nograph dyn_saveas(hh,[dirname,filesep,fname_,'_',aname,'_SA'],options_); if options_.TeX && any(strcmp('eps',cellstr(options_.graph_format))) fidTeX = fopen([dirname,filesep,fname_,'_',aname,'_SA.tex'],'w'); - fprintf(fidTeX,'%% TeX eps-loader file generated by stab_map_2.m (Dynare).\n'); + fprintf(fidTeX,'%% TeX eps-loader file generated by stab_map_1.m (Dynare).\n'); fprintf(fidTeX,['%% ' datestr(now,0) '\n\n']); fprintf(fidTeX,'\\begin{figure}[H]\n'); fprintf(fidTeX,'\\centering \n'); - fprintf(fidTeX,'\\includegraphics[scale=0.5]{%s}\n',[dirname,filesep,fname_,'_',aname,'_SA']); + fprintf(fidTeX,'\\includegraphics[scale=0.5]{%s}\n',strrep([dirname,filesep,fname_,'_',aname,'_SA'],'\','/')); fprintf(fidTeX,'\\caption{%s.}',atitle); fprintf(fidTeX,'\\label{Fig:%s}\n',atitle); fprintf(fidTeX,'\\end{figure}\n\n'); diff --git a/matlab/gsa/stab_map_2.m b/matlab/gsa/stab_map_2.m index 285350f40..83556617b 100644 --- a/matlab/gsa/stab_map_2.m +++ b/matlab/gsa/stab_map_2.m @@ -58,6 +58,7 @@ 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_,' ','_'); ifig=0; @@ -72,7 +73,7 @@ else end skipline(); title_string=['Correlation analysis for ',fnam]; -title_string_tex=['Correlation analysis for ',strrep(fnam,'_','\_')]; +title_string_tex=['Correlation analysis for ',strrep(fnam,'_','\\_')]; indcorr = []; entry_iter=1; @@ -152,7 +153,7 @@ for j=1:npar, fprintf(fidTeX,['%% ' datestr(now,0) '\n\n']); fprintf(fidTeX,'\\begin{figure}[H]\n'); fprintf(fidTeX,'\\centering \n'); - fprintf(fidTeX,'\\includegraphics[scale=0.5]{%s}\n',[dirname,filesep,fig_nam_,int2str(ifig)]); + fprintf(fidTeX,'\\includegraphics[scale=0.5]{%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,'\\end{figure}\n\n'); @@ -173,7 +174,7 @@ for j=1:npar, fprintf(fidTeX,['%% ' datestr(now,0) '\n\n']); fprintf(fidTeX,'\\begin{figure}[H]\n'); fprintf(fidTeX,'\\centering \n'); - fprintf(fidTeX,'\\includegraphics[scale=0.5]{%s}\n',[dirname,filesep,fig_nam_,int2str(ifig)]); + fprintf(fidTeX,'\\includegraphics[scale=0.5]{%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,'\\end{figure}\n\n'); @@ -189,7 +190,7 @@ else headers=strvcat('Parameters','corrcoef'); dyntable(options_,title_string,headers,char(name),data_mat, 0, 7, 3); if options_.TeX - dyn_latex_table(M_,options_,title_string_tex,fig_nam_,headers,char(name_tex),data_mat,0,7,3); + dyn_latex_table(M_,options_,title_string_tex,fig_nam_tex_table,headers,char(name_tex),data_mat,0,7,3); end end %close all