From 780c1f5216f777a3aeb6608040bc164c96e112ac Mon Sep 17 00:00:00 2001 From: Marco Ratto Date: Wed, 22 Mar 2017 22:37:59 +0100 Subject: [PATCH] provide userdata with info on actual varlist used --- matlab/graph_decomp.m | 2 +- matlab/graph_decomp_detail.m | 2 +- matlab/plot_shock_decomposition.m | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/matlab/graph_decomp.m b/matlab/graph_decomp.m index 7740a07a9..b4d0ba9a3 100644 --- a/matlab/graph_decomp.m +++ b/matlab/graph_decomp.m @@ -198,7 +198,7 @@ for j=1:nvar c = uicontextmenu; hl.UIContextMenu=c; browse_menu = uimenu(c,'Label','Browse group'); - expand_menu = uimenu(c,'Label','Expand group','Callback',['expand_group(''' mydata.use_shock_groups ''',''' deblank(endo_names(i_var(j),:)) ''',' int2str(i) ')']); + expand_menu = uimenu(c,'Label','Expand group','Callback',['expand_group(''' mydata.use_shock_groups ''',''' deblank(mydata.shock_decomp.orig_varlist(j,:)) ''',' int2str(i) ')']); set(expand_menu,'UserData',mydata,'Tag',['group' int2str(i)]); for jmember = mydata.shock_group.shocks uimenu('parent',browse_menu,'Label',char(jmember)) diff --git a/matlab/graph_decomp_detail.m b/matlab/graph_decomp_detail.m index 931cb64a2..95272dfc5 100644 --- a/matlab/graph_decomp_detail.m +++ b/matlab/graph_decomp_detail.m @@ -187,7 +187,7 @@ for j=1:nvar c = uicontextmenu; hax.UIContextMenu=c; browse_menu = uimenu(c,'Label','Browse group'); - expand_menu = uimenu(c,'Label','Expand group','Callback',['expand_group(''' mydata.use_shock_groups ''',''' deblank(endo_names(i_var(j),:)) ''',' int2str(ic) ')']); + expand_menu = uimenu(c,'Label','Expand group','Callback',['expand_group(''' mydata.use_shock_groups ''',''' deblank(mydata.shock_decomp.orig_varlist(j,:)) ''',' int2str(ic) ')']); set(expand_menu,'UserData',mydata,'Tag',['group' int2str(ic)]); for jmember = mydata.shock_group.shocks uimenu('parent',browse_menu,'Label',char(jmember)) diff --git a/matlab/plot_shock_decomposition.m b/matlab/plot_shock_decomposition.m index bc9534e21..5d6c9bf10 100644 --- a/matlab/plot_shock_decomposition.m +++ b/matlab/plot_shock_decomposition.m @@ -66,6 +66,10 @@ forecast_ = options_.shock_decomp.forecast; steadystate = options_.shock_decomp.steadystate; write_xls = options_.shock_decomp.write_xls; +if vintage_, + forecast_ = min(forecast_,options_.nobs-vintage_); +end + initial_date = options_.initial_date; if isfield(options_.shock_decomp,'q2a'), % private trap for aoa calls @@ -330,6 +334,8 @@ z = z(:,:,a:b); % end crop data options_.shock_decomp.fig_names=fig_names; +options_.shock_decomp.orig_varlist = varlist; + if detail_plot, graph_decomp_detail(z,shock_names,M_.endo_names,i_var,my_initial_date,M_,options_) else