From a675e32f7455da734da4ef5134789812fde38334 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
(cherry picked from commit 178eaceb9cdeae4d868e28300adce2da54e6eb83)
---
src/DSMH_sampler.m | 6 +++---
src/Herbst_Schorfheide_sampler.m | 6 +++---
src/online_auxiliary_filter.m | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/DSMH_sampler.m b/src/DSMH_sampler.m
index d44a43f..b2834d9 100644
--- a/src/DSMH_sampler.m
+++ b/src/DSMH_sampler.m
@@ -152,15 +152,15 @@ 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');
for jj = 1:min(nstar,length(x)-(plt-1)*nstar)
fprintf(fidTeX,'\\psfrag{%s}[1][][0.5][0]{%s}\n',deblank(NAMES(jj,:)),deblank(TeXNAMES(jj,:)));
end
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/src/Herbst_Schorfheide_sampler.m b/src/Herbst_Schorfheide_sampler.m
index 3c64829..80f5b2b 100644
--- a/src/Herbst_Schorfheide_sampler.m
+++ b/src/Herbst_Schorfheide_sampler.m
@@ -180,15 +180,15 @@ 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');
for jj = 1:min(nstar,length(x)-(plt-1)*nstar)
fprintf(fidTeX,'\\psfrag{%s}[1][][0.5][0]{%s}\n',deblank(NAMES(jj,:)),deblank(TeXNAMES(jj,:)));
end
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/src/online_auxiliary_filter.m b/src/online_auxiliary_filter.m
index 6acadc6..aa4b989 100644
--- a/src/online_auxiliary_filter.m
+++ b/src/online_auxiliary_filter.m
@@ -374,16 +374,16 @@ 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');
for jj = 1:length(x)
fprintf(fidTeX, '\\psfrag{%s}[1][][0.5][0]{%s}\n', deblank(NAMES(jj,:)), deblank(TeXNAMES(jj,:)));
end
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