From 7cd56e96877de4ed2dd22bb579884ab292034d71 Mon Sep 17 00:00:00 2001
From: Johannes Pfeifer <jpfeifer@gmx.de>
Date: Tue, 23 May 2017 13:20:47 +0200
Subject: [PATCH] Get rid of unused and superseded options_.colormap and make
sure options_.plot_shock_decomp.colormap is set
---
matlab/global_initialization.m | 2 +-
matlab/plot_shock_decomposition.m | 1 -
preprocessor/DynareBison.yy | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m
index d31c59e54..d26b488c8 100644
--- a/matlab/global_initialization.m
+++ b/matlab/global_initialization.m
@@ -725,7 +725,7 @@ options_.discretionary_tol = 1e-7;
% Shock decomposition
options_.parameter_set = [];
options_.use_shock_groups = '';
-options_.colormap = '';
+options_.shock_decomp.colormap = '';
options_.shock_decomp.init_state = 0;
% Shock decomposition realtime
diff --git a/matlab/plot_shock_decomposition.m b/matlab/plot_shock_decomposition.m
index 78488d6c6..182a0f906 100644
--- a/matlab/plot_shock_decomposition.m
+++ b/matlab/plot_shock_decomposition.m
@@ -31,7 +31,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;
-options_.colormap = options_.plot_shock_decomp.colormap;
% indices of endogenous variables
if size(varlist,1) == 0
diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy
index 4f9e03717..c82b7025b 100644
--- a/preprocessor/DynareBison.yy
+++ b/preprocessor/DynareBison.yy
@@ -3381,7 +3381,7 @@ o_use_shock_groups : USE_SHOCK_GROUPS { driver.option_str("use_shock_groups","de
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("colormap",$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
--
GitLab