From c298fe59a7d2dd7999153e8b85f8f6880c5576bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=B3ra=20Kocsis?= <dora@dynare.org> Date: Mon, 9 Mar 2020 16:13:43 +0100 Subject: [PATCH] fix drop-down option inputs in stoch_simul: sylvester, dr --- .../dynare_command_options_estimation.m | 2 +- src/+gui_auxiliary/set_command_option.m | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/+gui_auxiliary/dynare_command_options_estimation.m b/src/+gui_auxiliary/dynare_command_options_estimation.m index 203308e..6720126 100644 --- a/src/+gui_auxiliary/dynare_command_options_estimation.m +++ b/src/+gui_auxiliary/dynare_command_options_estimation.m @@ -225,7 +225,7 @@ dynare_gui_.estimation.solver{num,4} = 'Use the Anderson-Moore Algorithm (AIM) t num = num+1; dynare_gui_.estimation.solver{num,1} = 'sylvester'; dynare_gui_.estimation.solver{num,2} = 'default'; -dynare_gui_.estimation.solver{num,3} = {'','default', 'fixed_point'}; % special +dynare_gui_.estimation.solver{num,3} = {'default', 'fixed_point'}; % special dynare_gui_.estimation.solver{num,4} = 'Determines the algorithm used to solve the Sylvester equation for block decomposed model. Possible values for OPTION are: default and fixed_point. Default value is default.'; num = num+1; diff --git a/src/+gui_auxiliary/set_command_option.m b/src/+gui_auxiliary/set_command_option.m index b57cbbd..ab24e61 100644 --- a/src/+gui_auxiliary/set_command_option.m +++ b/src/+gui_auxiliary/set_command_option.m @@ -57,18 +57,19 @@ try end case 'sylvester' - if value == 2 %default - options_.sylvester_fp = 0; - elseif value == 3 %fixed_point + options_.sylvester_fp = 0; + + if value == 2 %fixed_point options_.sylvester_fp = 1; end + case 'dr' options_.dr_cycle_reduction = 0; options_.dr_logarithmic_reduction = 0; - if strcmp(value, 'cycle_reduction') + if value == 2 options_.dr_cycle_reduction = 1; - elseif strcmp(value, 'logarithmic_reduction') + elseif value == 3 options_.dr_logarithmic_reduction = 1; end -- GitLab