From a6ad26788e1cdd84a88de3108f45a75eeb82c6fe Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Wed, 27 Dec 2023 20:43:28 +0100 Subject: [PATCH] BVAR: remove dedicated graph functions one was empty, the other was moved to an inline function --- matlab/+bvar/forecast.m | 30 ++++++++++++++++++++- matlab/dynare_graph.m | 54 ------------------------------------- matlab/dynare_graph_close.m | 29 -------------------- 3 files changed, 29 insertions(+), 84 deletions(-) delete mode 100644 matlab/dynare_graph.m delete mode 100644 matlab/dynare_graph_close.m diff --git a/matlab/+bvar/forecast.m b/matlab/+bvar/forecast.m index 991f68c45..206d5b5c9 100644 --- a/matlab/+bvar/forecast.m +++ b/matlab/+bvar/forecast.m @@ -119,7 +119,7 @@ OutputDirectoryName = CheckPath('graphs',M_.dname); dyn_graph=bvar.graph_init(sprintf('BVAR forecasts (nlags = %d)', nlags), ny, {'b-' 'g-' 'g-' 'r-' 'r-'}); for i = 1:ny - dyn_graph=dynare_graph(dyn_graph,[ sims_no_shock_median(:, i) ... + dyn_graph=plot_graph(dyn_graph,[ sims_no_shock_median(:, i) ... sims_no_shock_up_conf(:, i) sims_no_shock_down_conf(:, i) ... sims_with_shocks_up_conf(:, i) sims_with_shocks_down_conf(:, i) ], ... options_.varobs{i}); @@ -183,3 +183,31 @@ for i = 1:length(options_.varobs) oo_.bvar.forecast.rmse.(name) = rmse(i); end end + + +function dyn_graph=plot_graph(dyn_graph,y,tit,x) +% function plot_graph(dyn_graph, y,tit,x) + +if nargin < 4 + x = (1:size(y,1))'; +end +nplot = dyn_graph.plot_nbr + 1; +if nplot > dyn_graph.max_nplot + figure('Name',dyn_graph.figure_name); + nplot = 1; +end +dyn_graph.plot_nbr = nplot; +subplot(dyn_graph.nr,dyn_graph.nc,nplot); + +line_types = dyn_graph.line_types; +line_type = line_types{1}; +for i=1:size(y,2) + if length(line_types) > 1 + line_type = line_types{i}; + end + + plot(x,y(:,i),line_type); + hold on +end +title(tit); +hold off diff --git a/matlab/dynare_graph.m b/matlab/dynare_graph.m deleted file mode 100644 index dc8caf637..000000000 --- a/matlab/dynare_graph.m +++ /dev/null @@ -1,54 +0,0 @@ -function dyn_graph=dynare_graph(dyn_graph,y,tit,x) -% function dynare_graph(y,tit,x) -% graphs -% -% INPUT -% figure_name: name of the figures -% colors: line colors -% -% OUTPUT -% dyn_graph: structure with figure information -% -% SPECIAL REQUIREMENT -% none - -% Copyright © 2006-2017 Dynare Team -% -% This file is part of Dynare. -% -% Dynare is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. -% -% Dynare is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with Dynare. If not, see . - -if nargin < 4 - x = (1:size(y,1))'; -end -nplot = dyn_graph.plot_nbr + 1; -if nplot > dyn_graph.max_nplot - figure('Name',dyn_graph.figure_name); - nplot = 1; -end -dyn_graph.plot_nbr = nplot; -subplot(dyn_graph.nr,dyn_graph.nc,nplot); - -line_types = dyn_graph.line_types; -line_type = line_types{1}; -for i=1:size(y,2) - if length(line_types) > 1 - line_type = line_types{i}; - end - - plot(x,y(:,i),line_type); - hold on -end -title(tit); -hold off \ No newline at end of file diff --git a/matlab/dynare_graph_close.m b/matlab/dynare_graph_close.m deleted file mode 100644 index 41c86fc0c..000000000 --- a/matlab/dynare_graph_close.m +++ /dev/null @@ -1,29 +0,0 @@ -function dynare_graph_close() -% function dynare_graph_close() -% close a figure -% -% INPUT -% none -% -% OUTPUT -% none -% -% SPECIAL REQUIREMENT -% none - -% Copyright © 2006-2017 Dynare Team -% -% This file is part of Dynare. -% -% Dynare is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. -% -% Dynare is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with Dynare. If not, see .