From fbb127216422adae1ead187446cbc17a7dc9b800 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Sun, 10 Jan 2021 17:30:35 +0100 Subject: [PATCH] Fix mode_compute=12 and filter out mode_compute=11 --- matlab/method_of_moments/method_of_moments.m | 2 +- .../method_of_moments/method_of_moments_objective_function.m | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/matlab/method_of_moments/method_of_moments.m b/matlab/method_of_moments/method_of_moments.m index 9d6736116..b931bb057 100644 --- a/matlab/method_of_moments/method_of_moments.m +++ b/matlab/method_of_moments/method_of_moments.m @@ -788,7 +788,7 @@ for i = 1:length(optimizer_vec) case 10 fprintf('\n %s=10): simpsa',str); case 11 - fprintf('\n %s=11): online_auxiliary_filter',str); + error('\nmethod_of_moments: online_auxiliary_filter (mode_compute=11) is only supported with likelihood-based estimation techniques'); case 12 fprintf('\n %s=12): particleswarm',str); case 101 diff --git a/matlab/method_of_moments/method_of_moments_objective_function.m b/matlab/method_of_moments/method_of_moments_objective_function.m index 745f8570e..41c3dcc79 100644 --- a/matlab/method_of_moments/method_of_moments_objective_function.m +++ b/matlab/method_of_moments/method_of_moments_objective_function.m @@ -64,6 +64,9 @@ junk2 = []; % 1. Get the structural parameters & define penalties %-------------------------------------------------------------------------- +% Ensure that xparam1 is a column vector; particleswarm.m requires this. +xparam1 = xparam1(:); + M_ = set_all_parameters(xparam1, estim_params_, M_); [fval,info,exit_flag]=check_bounds_and_definiteness_estimation(xparam1, M_, estim_params_, Bounds);