From 3863a743196897dcf4347704308d01555bbdfad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Wed, 4 Jul 2018 12:33:51 +0200
Subject: [PATCH] Fix bug introduced in 13ce91861 in graph decomposition under
MATLAB
---
matlab/graph_decomp.m | 4 ++--
matlab/graph_decomp_detail.m | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/matlab/graph_decomp.m b/matlab/graph_decomp.m
index 082015316..7b150a5da 100644
--- a/matlab/graph_decomp.m
+++ b/matlab/graph_decomp.m
@@ -52,7 +52,7 @@ fig_name_long = opts_decomp.fig_name;
use_shock_groups = DynareOptions.plot_shock_decomp.use_shock_groups;
screen_shocks = opts_decomp.screen_shocks;
-if use_shock_groups | comp_nbr<=18
+if ~isempty(use_shock_groups) || comp_nbr<=18
screen_shocks=0;
end
if use_shock_groups
@@ -189,7 +189,7 @@ for j=1:nvar
hold on
ht = text(0.3,y1+0.3*height,labels(i,:),'Interpreter','none');
hold on
- if interactive && (~isoctave && use_shock_groups)
+ if interactive && (~isoctave && ~isempty(use_shock_groups))
mydata.fig_name = DynareOptions.plot_shock_decomp.fig_name(2:end);
mydata.use_shock_groups = DynareOptions.plot_shock_decomp.use_shock_groups;
mydata.shock_group = shock_groups.(shock_ind{i});
diff --git a/matlab/graph_decomp_detail.m b/matlab/graph_decomp_detail.m
index 527b5f946..2605dbac3 100644
--- a/matlab/graph_decomp_detail.m
+++ b/matlab/graph_decomp_detail.m
@@ -52,7 +52,7 @@ if ~isempty(opts_decomp.type)
fig_mode = [fig_mode '_'];
end
screen_shocks = opts_decomp.screen_shocks;
-if DynareOptions.plot_shock_decomp.use_shock_groups | comp_nbr<=18
+if ~isempty(DynareOptions.plot_shock_decomp.use_shock_groups) || comp_nbr<=18
screen_shocks=0;
end
fig_name_long = opts_decomp.fig_name;
@@ -191,7 +191,7 @@ for j=1:nvar
a0(4)=max(a(4),a0(4));
set(gca,'ylim',a0(3:4))
hold on, h1=plot(x(2:end),z1(end,:),'k-','LineWidth',2);
- if interactive && (~isoctave && use_shock_groups)
+ if interactive && (~isoctave && ~isempty(use_shock_groups))
mydata.fig_name = DynareOptions.plot_shock_decomp.fig_name(2:end);
mydata.use_shock_groups = DynareOptions.plot_shock_decomp.use_shock_groups;
mydata.shock_group = shock_groups.(shock_ind{ic});
--
GitLab