From 2c54d4432a6ab0a77b6a2ce69531df0f52133dbd Mon Sep 17 00:00:00 2001 From: Marco Ratto Date: Sun, 15 Jan 2017 18:40:06 +0100 Subject: [PATCH] - Bug fix with screen_shocks option - fix to figure title --- matlab/graph_decomp.m | 7 +++---- matlab/graph_decomp_detail.m | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/matlab/graph_decomp.m b/matlab/graph_decomp.m index 5004cafad..c037a1107 100644 --- a/matlab/graph_decomp.m +++ b/matlab/graph_decomp.m @@ -48,10 +48,9 @@ if ~isempty(opts_decomp.fig_mode) fig_mode = [fig_mode '_']; end fig_names = opts_decomp.fig_names; -if DynareOptions.use_shock_groups, +screen_shocks = opts_decomp.screen_shocks; +if DynareOptions.use_shock_groups | comp_nbr<=18, screen_shocks=0; -elseif comp_nbr>18 - screen_shocks = opts_decomp.screen_shocks; end if screen_shocks fig_names = [fig_names '_screen']; @@ -105,7 +104,7 @@ for j=1:nvar if ymax-ymin < 1e-6 continue end - fhandle = dyn_figure(DynareOptions,'Name',['Shock decomposition: ',endo_names(i_var(j),:)], 'PaperPositionMode', 'auto','PaperOrientation','landscape','renderermode','auto'); + fhandle = dyn_figure(DynareOptions,'Name',['Shock decomposition: ' deblank(endo_names(i_var(j),:)) fig_mode fig_names], 'PaperPositionMode', 'auto','PaperOrientation','landscape','renderermode','auto'); set(fhandle,'position' ,[50 50 1500 750]) ax=axes('Position',[0.1 0.1 0.6 0.8],'box','on'); % plot(ax,x(2:end),z1(end,:),'k-','LineWidth',2) diff --git a/matlab/graph_decomp_detail.m b/matlab/graph_decomp_detail.m index 03c8cc316..153e5052d 100644 --- a/matlab/graph_decomp_detail.m +++ b/matlab/graph_decomp_detail.m @@ -50,10 +50,9 @@ if ~isempty(opts_decomp.fig_mode) fig_mode1 = ['_' fig_mode]; fig_mode = [fig_mode '_']; end -if DynareOptions.use_shock_groups, +screen_shocks = opts_decomp.screen_shocks; +if DynareOptions.use_shock_groups | comp_nbr<=18, screen_shocks=0; -elseif comp_nbr>18 - screen_shocks = opts_decomp.screen_shocks; end fig_names = opts_decomp.fig_names; % fig_names = ['_' fig_names]; @@ -137,7 +136,7 @@ for j=1:nvar continue end for jf = 1:nfigs - fhandle = dyn_figure(DynareOptions,'Name',['Shock decomposition (detail): ' endo_names(i_var(j),:) fig_mode fig_names1],'position',[200 100 650 850], 'PaperPositionMode', 'auto','PaperOrientation','portrait','renderermode','auto'); + fhandle = dyn_figure(DynareOptions,'Name',['Shock decomposition (detail): ' deblank(endo_names(i_var(j),:)) fig_mode fig_names1],'position',[200 100 650 850], 'PaperPositionMode', 'auto','PaperOrientation','portrait','renderermode','auto'); a0=zeros(1,4); a0(3)=inf; a0(4)=-inf;