From c0624738c987b2c818ddad65835f99e2d44aad6f Mon Sep 17 00:00:00 2001 From: JohannesPfeifer <jpfeifer@gmx.de> Date: Thu, 26 Apr 2012 08:48:31 +0200 Subject: [PATCH] Fixed bug introduced in bda0b1b228f4e1f3ddd92ed3c24de8d1663ce406 Created separate field options_.SpectralDensity.trigger to trigger Spectral Density --- matlab/UnivariateSpectralDensity.m | 7 +++---- matlab/global_initialization.m | 5 ++++- matlab/stoch_simul.m | 2 +- matlab/stoch_simul_sparse.m | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/matlab/UnivariateSpectralDensity.m b/matlab/UnivariateSpectralDensity.m index 46fdf895da..2757da15b0 100644 --- a/matlab/UnivariateSpectralDensity.m +++ b/matlab/UnivariateSpectralDensity.m @@ -33,10 +33,9 @@ if options_.order > 1 disp('Set order = 1.') return end - -pltinfo = 1;%options_.SpectralDensity.Th.plot; -cutoff = 150;%options_.SpectralDensity.Th.cutoff; -sdl = 0.01;%options_.SepctralDensity.Th.sdl; +pltinfo = options_.SpectralDensity.plot; +cutoff = options_.SpectralDensity.cutoff; +sdl = options_.SepctralDensity.sdl; omega = (0:sdl:pi)'; GridSize = length(omega); exo_names_orig_ord = M_.exo_names_orig_ord; diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m index 24e0bdcaec..01203e97b6 100644 --- a/matlab/global_initialization.m +++ b/matlab/global_initialization.m @@ -125,7 +125,10 @@ options_.nomoments = 0; options_.nocorr = 0; options_.periods = 0; options_.noprint = 0; -options_.SpectralDensity = 0; +options_.SpectralDensity.trigger = 0; +options_.SpectralDensity.plot = 1; +options_.SpectralDensity.cutoff = 150; +options_.SpectralDensity.sdl = 0.01; % Extended path options % diff --git a/matlab/stoch_simul.m b/matlab/stoch_simul.m index 62edee0618..2295c6d0f1 100644 --- a/matlab/stoch_simul.m +++ b/matlab/stoch_simul.m @@ -323,7 +323,7 @@ if options_.irf end end -if options_.SpectralDensity == 1 +if options_.SpectralDensity.trigger == 1 [omega,f] = UnivariateSpectralDensity(oo_.dr,var_list); end diff --git a/matlab/stoch_simul_sparse.m b/matlab/stoch_simul_sparse.m index fe5eab4bdb..1eef7ba2b3 100644 --- a/matlab/stoch_simul_sparse.m +++ b/matlab/stoch_simul_sparse.m @@ -286,7 +286,7 @@ if options_.irf end end -if options_.SpectralDensity == 1 +if options_.SpectralDensity.trigger == 1 [omega,f] = UnivariateSpectralDensity(oo_.dr,var_list); end -- GitLab