From 3bac10a97de11cced895ee5385058861fb49bd4f Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Fri, 16 Jun 2017 13:51:03 +0200 Subject: [PATCH] Fix bug in use_shock_groups and colormap Option was not written to correct subfield of options_-structure. Related to 7cd56e96877de4ed2dd22bb579884ab292034d71 --- matlab/plot_shock_decomposition.m | 1 - preprocessor/DynareBison.yy | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/matlab/plot_shock_decomposition.m b/matlab/plot_shock_decomposition.m index 182a0f906..377ab68d3 100644 --- a/matlab/plot_shock_decomposition.m +++ b/matlab/plot_shock_decomposition.m @@ -30,7 +30,6 @@ function [z, steady_state] = plot_shock_decomposition(M_,oo_,options_,varlist) options_.nodisplay = options_.plot_shock_decomp.nodisplay; options_.graph_format = options_.plot_shock_decomp.graph_format; -options_.use_shock_groups = options_.plot_shock_decomp.use_shock_groups; % indices of endogenous variables if size(varlist,1) == 0 diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy index c82b7025b..d9e3169ea 100644 --- a/preprocessor/DynareBison.yy +++ b/preprocessor/DynareBison.yy @@ -2553,8 +2553,8 @@ plot_shock_decomposition_options_list : plot_shock_decomposition_option COMMA pl | plot_shock_decomposition_option ; -plot_shock_decomposition_option : o_psd_use_shock_groups - | o_psd_colormap +plot_shock_decomposition_option : o_use_shock_groups + | o_colormap | o_psd_nodisplay | o_psd_graph_format | o_psd_detail_plot @@ -3375,14 +3375,10 @@ o_lmmcp : LMMCP {driver.option_num("lmmcp.status", "1"); }; o_occbin : OCCBIN {driver.option_num("occbin", "1"); }; o_function : FUNCTION EQUAL filename { driver.option_str("function", $3); }; o_sampling_draws : SAMPLING_DRAWS EQUAL INT_NUMBER { driver.option_num("sampling_draws",$3); }; -o_use_shock_groups : USE_SHOCK_GROUPS { driver.option_str("use_shock_groups","default"); } - | USE_SHOCK_GROUPS EQUAL symbol { driver.option_str("use_shock_groups", $3); } +o_use_shock_groups : USE_SHOCK_GROUPS { driver.option_str("plot_shock_decomp.use_shock_groups","default"); } + | USE_SHOCK_GROUPS EQUAL symbol { driver.option_str("plot_shock_decomp.use_shock_groups", $3); } ; -o_psd_use_shock_groups : USE_SHOCK_GROUPS { driver.option_str("plot_shock_decomp.use_shock_groups","default"); } - | USE_SHOCK_GROUPS EQUAL symbol { driver.option_str("plot_shock_decomp.use_shock_groups", $3); } - ; o_colormap : COLORMAP EQUAL symbol { driver.option_num("plot_shock_decomp.colormap",$3); }; -o_psd_colormap : COLORMAP EQUAL symbol { driver.option_num("plot_shock_decomp.colormap",$3); }; range : symbol ':' symbol {