From 038608ff80f3a1ca9604bf27fe2630c0060a1592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=B3ra=20Kocsis?= <dora@dynare.org>
Date: Fri, 6 Mar 2020 17:02:46 +0100
Subject: [PATCH] fix bug in postprocesing drop-down option inputs:
proposal_approximation, distribution_approximation
---
src/+gui_auxiliary/command_option_mapping.m | 6 ------
.../dynare_command_options_estimation.m | 8 ++++----
src/+gui_auxiliary/set_command_option.m | 14 ++++++++++++++
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/+gui_auxiliary/command_option_mapping.m b/src/+gui_auxiliary/command_option_mapping.m
index 0eb6d27..95caa05 100644
--- a/src/+gui_auxiliary/command_option_mapping.m
+++ b/src/+gui_auxiliary/command_option_mapping.m
@@ -80,12 +80,6 @@ switch name
case 'no_posterior_kernel_density'
mapping = 'estimation.moments_posterior_density.indicator';
- case 'proposal_approximation'
- mapping = 'particle.proposal_approximation';
-
- case 'distribution_approximation'
- mapping = 'particle.distribution_approximation';
-
case 'number_of_particles'
mapping = 'particle.number_of_particles';
diff --git a/src/+gui_auxiliary/dynare_command_options_estimation.m b/src/+gui_auxiliary/dynare_command_options_estimation.m
index d501ef2..d75e5dd 100644
--- a/src/+gui_auxiliary/dynare_command_options_estimation.m
+++ b/src/+gui_auxiliary/dynare_command_options_estimation.m
@@ -518,14 +518,14 @@ dynare_gui_.estimation.postprocessing{num,4} = 'Number of periods on which to co
num = num+1;
dynare_gui_.estimation.postprocessing{num,1} = 'proposal_approximation';
-dynare_gui_.estimation.postprocessing{num,2} = 'cubature';
-dynare_gui_.estimation.postprocessing{num,3} = {'cubature','montecarlo','unscented'};
+dynare_gui_.estimation.postprocessing{num,2} = 'unscented';
+dynare_gui_.estimation.postprocessing{num,3} = {'unscented','cubature','montecarlo'};
dynare_gui_.estimation.postprocessing{num,4} = 'Sets the method for approximating the proposal distribution. Possible values for OPTION are: cubature, montecarlo and unscented. Default value is cubature.';
num = num+1;
dynare_gui_.estimation.postprocessing{num,1} = 'distribution_approximation';
-dynare_gui_.estimation.postprocessing{num,2} = 'cubature';
-dynare_gui_.estimation.postprocessing{num,3} = {'cubature','montecarlo','unscented'};
+dynare_gui_.estimation.postprocessing{num,2} = 'unscented';
+dynare_gui_.estimation.postprocessing{num,3} = {'unscented','cubature','montecarlo'};
dynare_gui_.estimation.postprocessing{num,4} = 'Sets the method for approximating the particle distribution. Possible values for OPTION are: cubature, montecarlo and unscented. Default value is unscented.';
diff --git a/src/+gui_auxiliary/set_command_option.m b/src/+gui_auxiliary/set_command_option.m
index 0aec405..be1e35f 100644
--- a/src/+gui_auxiliary/set_command_option.m
+++ b/src/+gui_auxiliary/set_command_option.m
@@ -158,6 +158,20 @@ try
elseif value == 6
options_.particle.filter_algorithm = 'nlkf';
end
+
+ case 'distribution_approximation'
+ if value == 2
+ options_.particle.distribution_approximation.cubature = true;
+ elseif value == 3
+ options_.particle.distribution_approximation.montecarlo = true;
+ end
+
+ case 'proposal_approximation'
+ if value == 2
+ options_.particle.proposal_approximation.cubature = true;
+ elseif value == 3
+ options_.particle.proposal_approximation.montecarlo = true;
+ end
otherwise
if isnumeric(value)
--
GitLab