From 022913579a5fdae34cf243726a05eb6348606207 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Wed, 14 Nov 2018 18:37:05 +0100 Subject: [PATCH 1/2] map_calibration.m: Fix bug that prevented display of restrictions --- matlab/gsa/map_calibration.m | 1 - 1 file changed, 1 deletion(-) diff --git a/matlab/gsa/map_calibration.m b/matlab/gsa/map_calibration.m index 7f319610e..8ee08ceba 100644 --- a/matlab/gsa/map_calibration.m +++ b/matlab/gsa/map_calibration.m @@ -42,7 +42,6 @@ end pvalue_ks = DynareOptions.opt_gsa.pvalue_ks; indx_irf = []; indx_moment = []; -DynareOptions.nodisplay = 1; init = ~DynareOptions.opt_gsa.load_stab; options_mcf.pvalue_ks = DynareOptions.opt_gsa.pvalue_ks; From 30361ccb49a65febf8ee608563ca9f1764ffc85d Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Wed, 14 Nov 2018 18:37:54 +0100 Subject: [PATCH 2/2] GSA scatter plots: Correctly pass LaTeX-names to figure --- matlab/gsa/mcf_analysis.m | 4 +++- matlab/gsa/scatter_mcf.m | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/matlab/gsa/mcf_analysis.m b/matlab/gsa/mcf_analysis.m index cec1054cd..023985923 100644 --- a/matlab/gsa/mcf_analysis.m +++ b/matlab/gsa/mcf_analysis.m @@ -34,6 +34,8 @@ if DynareOptions.TeX else param_names_tex = options_mcf.param_names_tex; end +else + param_names_tex = strrep(options_mcf.param_names,'_','\_'); end amcf_name = options_mcf.amcf_name; amcf_title = options_mcf.amcf_title; @@ -78,7 +80,7 @@ if ~isempty(indmcf) && ~DynareOptions.nograph skipline() xx=[]; if ~ isempty(xparam1), xx=xparam1(indmcf); end - scatter_mcf(lpmat(ibeha,indmcf),lpmat(inobeha,indmcf), param_names(indmcf), ... + scatter_mcf(lpmat(ibeha,indmcf),lpmat(inobeha,indmcf), param_names_tex(indmcf), ... '.', [fname_,'_',amcf_name], OutputDirectoryName, amcf_title,xx, DynareOptions, ... beha_title, nobeha_title) end diff --git a/matlab/gsa/scatter_mcf.m b/matlab/gsa/scatter_mcf.m index 211b2e74b..facea3cfa 100644 --- a/matlab/gsa/scatter_mcf.m +++ b/matlab/gsa/scatter_mcf.m @@ -143,7 +143,7 @@ for i = 1:p end if i==1 if nflag == 1 - ylabel(vnames(j,:),'Rotation',45,'interpreter','none', ... + ylabel(vnames(j,:),'Rotation',45, ... 'HorizontalAlignment','right','VerticalAlignment','middle'); else ylabel([num2str(j),' '],'Rotation',90) @@ -151,7 +151,7 @@ for i = 1:p end if j==1 if nflag == 1 - title(vnames(i,:),'interpreter','none','Rotation',45, ... + title(vnames(i,:),'Rotation',45, ... 'HorizontalAlignment','left','VerticalAlignment','bottom') else title(num2str(i))