From 389bdc23f247f797d0710d2af14772089ab1fae9 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer <jpfeifer@gmx.de> Date: Thu, 18 Jun 2020 13:14:00 +0200 Subject: [PATCH] Fix eps-TeX-loaders --- matlab/nonlinear-filters/src/DSMH_sampler.m | 6 +++--- matlab/nonlinear-filters/src/Herbst_Schorfheide_sampler.m | 6 +++--- matlab/nonlinear-filters/src/online_auxiliary_filter.m | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/matlab/nonlinear-filters/src/DSMH_sampler.m b/matlab/nonlinear-filters/src/DSMH_sampler.m index 3e37327171..99307013f4 100644 --- a/matlab/nonlinear-filters/src/DSMH_sampler.m +++ b/matlab/nonlinear-filters/src/DSMH_sampler.m @@ -147,12 +147,12 @@ plt = 1 ; drawnow end dyn_saveas(hh,[ M_.fname '_param_density' int2str(plt) ],options_.nodisplay,options_.graph_format); - if TeX + if TeX && any(strcmp('eps',cellstr(options_.graph_format))) % TeX eps loader file fprintf(fidTeX,'\\begin{figure}[H]\n'); fprintf(fidTeX,'\\centering \n'); - fprintf(fidTeX,'\\includegraphics[scale=0.5]{%s_ParametersDensities%s}\n',M_.fname,int2str(plt)); - fprintf(fidTeX,'\\caption{ParametersDensities.}'); + fprintf(fidTeX,'\\includegraphics[width=%2.2f\\textwidth]{%_param_density%s}\n',min(k/floor(sqrt(npar)),1),M_.fname,int2str(plt)); + fprintf(fidTeX,'\\caption{Parameter densities based on the Dynamic Striated Metropolis-Hastings algorithm.}'); fprintf(fidTeX,'\\label{Fig:ParametersDensities:%s}\n',int2str(plt)); fprintf(fidTeX,'\\end{figure}\n'); fprintf(fidTeX,' \n'); diff --git a/matlab/nonlinear-filters/src/Herbst_Schorfheide_sampler.m b/matlab/nonlinear-filters/src/Herbst_Schorfheide_sampler.m index cc51606837..03323a0d92 100644 --- a/matlab/nonlinear-filters/src/Herbst_Schorfheide_sampler.m +++ b/matlab/nonlinear-filters/src/Herbst_Schorfheide_sampler.m @@ -175,12 +175,12 @@ plt = 1 ; drawnow end dyn_saveas(hh,[ M_.fname '_param_density' int2str(plt) ],options_.nodisplay,options_.graph_format); - if TeX + if TeX && any(strcmp('eps',cellstr(options_.graph_format))) % TeX eps loader file fprintf(fidTeX,'\\begin{figure}[H]\n'); fprintf(fidTeX,'\\centering \n'); - fprintf(fidTeX,'\\includegraphics[scale=0.5]{%s_ParametersDensities%s}\n',M_.fname,int2str(plt)); - fprintf(fidTeX,'\\caption{ParametersDensities.}'); + fprintf(fidTeX,'\\includegraphics[width=%2.2f\\textwidth]{%_param_density%s}\n',min(k/floor(sqrt(npar)),1),M_.fname,int2str(plt)); + fprintf(fidTeX,'\\caption{Parameter densities based on the Herbst/Schorfheide sampler.}'); fprintf(fidTeX,'\\label{Fig:ParametersDensities:%s}\n',int2str(plt)); fprintf(fidTeX,'\\end{figure}\n'); fprintf(fidTeX,' \n'); diff --git a/matlab/nonlinear-filters/src/online_auxiliary_filter.m b/matlab/nonlinear-filters/src/online_auxiliary_filter.m index c7df9d8051..0da8e48fa8 100644 --- a/matlab/nonlinear-filters/src/online_auxiliary_filter.m +++ b/matlab/nonlinear-filters/src/online_auxiliary_filter.m @@ -361,13 +361,13 @@ for plt = 1:nbplt drawnow end dyn_saveas(hh,[ Model.fname '_param_density' int2str(plt) ],DynareOptions.nodisplay,DynareOptions.graph_format); - if TeX + if TeX && any(strcmp('eps',cellstr(DynareOptions.graph_format))) % TeX eps loader file fprintf(fidTeX, '\\begin{figure}[H]\n'); fprintf(fidTeX,'\\centering \n'); - fprintf(fidTeX,'\\includegraphics[scale=0.5]{%s_ParametersDensities%s}\n',Model.fname,int2str(plt)); - fprintf(fidTeX,'\\caption{ParametersDensities.}'); - fprintf(fidTeX,'\\label{Fig:ParametersDensities:%s}\n',int2str(plt)); + fprintf(fidTeX,'\\includegraphics[width=%2.2f\\textwidth]{%_param_density%s}\n',min(k/nc,1),M_.fname,int2str(plt)); + fprintf(fidTeX,'\\caption{Parameter densities based on the Liu/West particle filter.}'); + fprintf(fidTeX,'\\label{Fig:ParameterDensities:%s}\n',int2str(plt)); fprintf(fidTeX,'\\end{figure}\n'); fprintf(fidTeX,' \n'); end -- GitLab