Skip to content
Snippets Groups Projects
Commit 0107e083 authored by Dóra Kocsis's avatar Dóra Kocsis
Browse files

fix bug in sensitivity analysis: wrong initialization of options_gsa

parent 2cd7c52b
Branches
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ function dynare_command_options_sensitivity() ...@@ -14,7 +14,7 @@ function dynare_command_options_sensitivity()
% SPECIAL REQUIREMENTS % SPECIAL REQUIREMENTS
% none % none
% Copyright (C) 2019 Dynare Team % Copyright (C) 2019-2020 Dynare Team
% %
% This file is part of Dynare. % This file is part of Dynare.
% %
...@@ -92,7 +92,7 @@ dynare_gui_.sensitivity.sampling{num,4} = 'When pprior=0 and ppost=0, allows for ...@@ -92,7 +92,7 @@ dynare_gui_.sensitivity.sampling{num,4} = 'When pprior=0 and ppost=0, allows for
%% Group 2: stability mapping %% Group 2: stability mapping
num = 1; num = 1;
dynare_gui_.sensitivity.stability_mapping{num,1} = 'stab'; dynare_gui_.sensitivity.stability_mapping{num,1} = 'stab';
dynare_gui_.sensitivity.stability_mapping{num,2} = 0; dynare_gui_.sensitivity.stability_mapping{num,2} = 1;
dynare_gui_.sensitivity.stability_mapping{num,3} = 'check_option'; dynare_gui_.sensitivity.stability_mapping{num,3} = 'check_option';
dynare_gui_.sensitivity.stability_mapping{num,4} = 'If equal to 1, perform stability mapping. If equal to 0, do not perform stability mapping.'; dynare_gui_.sensitivity.stability_mapping{num,4} = 'If equal to 1, perform stability mapping. If equal to 0, do not perform stability mapping.';
......
...@@ -11,7 +11,7 @@ function gui_sensitivity_analysis(tabId) ...@@ -11,7 +11,7 @@ function gui_sensitivity_analysis(tabId)
% SPECIAL REQUIREMENTS % SPECIAL REQUIREMENTS
% none % none
% Copyright (C) 2019 Dynare Team % Copyright (C) 2019-2020 Dynare Team
% %
% This file is part of Dynare. % This file is part of Dynare.
% %
...@@ -68,20 +68,38 @@ handles.pushbuttonSensitivity = uicontrol( ... ...@@ -68,20 +68,38 @@ handles.pushbuttonSensitivity = uicontrol( ...
old_oo_ = oo_; old_oo_ = oo_;
old_options_ = options_; old_options_ = options_;
try try
options_ = struct();
if ~isempty(model_settings.sensitivity) if ~isempty(model_settings.sensitivity)
names = fieldnames(model_settings.sensitivity); names = fieldnames(model_settings.sensitivity);
options_gsa = model_settings.sensitivity;
options_ = old_options_;
for ii = 1:size(names, 1) for ii = 1:size(names, 1)
if isempty(model_settings.sensitivity.(names{ii})) switch names{ii}
gui_auxiliary.set_command_option(names{ii}, 1, 'check_option'); case 'namendo'
else if contains(options_gsa.(names{ii}), ',')
gui_auxiliary.set_command_option(names{ii}, model_settings.sensitivity.(names{ii})); namendo_ = strsplit(options_gsa.(names{ii}), ',');
options_gsa.namendo = namendo_;
else
options_gsa.namendo = {options_gsa.(names{ii})};
end
case 'namlagendo'
if contains(options_gsa.(names{ii}), ',')
namlagendo_ = strsplit(options_gsa.(names{ii}), ',');
options_gsa.namlagendo = namlagendo_;
else
options_gsa.namlagendo = {options_gsa.(names{ii})};
end
case 'namexo'
if contains(options_gsa.(names{ii}), ',')
namexo_ = strsplit(options_gsa.(names{ii}), ',');
options_gsa.namexo = namexo_;
else
options_gsa.namexo = {options_gsa.(names{ii})};
end
case 'threshold_redform'
options_gsa.threshold_redform = str2num(options_gsa.(names{ii}));
end end
end end
end end
options_gsa = options_;
options_ = old_options_;
gui_tools.project_log_entry('Running stochastic sensitivity','...'); gui_tools.project_log_entry('Running stochastic sensitivity','...');
[jObj, guiObj] = gui_tools.create_animated_screen('Running stochastic sensitivity, please wait...', tabId); [jObj, guiObj] = gui_tools.create_animated_screen('Running stochastic sensitivity, please wait...', tabId);
handles.pushbuttonResults.Enable = 'off'; handles.pushbuttonResults.Enable = 'off';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment