Fix mode_compute=3 under Octave

time-shift
Sébastien Villemot 2013-01-07 15:38:45 +01:00
parent 8c7e3d46ed
commit 5c88338965
1 changed files with 8 additions and 1 deletions

View File

@ -221,7 +221,14 @@ if ~isequal(options_.mode_compute,0) && ~options_.mh_posterior_mode_estimation
if options_.analytic_derivation,
optim_options = optimset(optim_options,'GradObj','on');
end
[xparam1,fval,exitflag] = fminunc(objective_function,xparam1,optim_options,dataset_,options_,M_,estim_params_,bayestopt_,oo_);
if ~exist('OCTAVE_VERSION')
[xparam1,fval,exitflag] = fminunc(objective_function,xparam1,optim_options,dataset_,options_,M_,estim_params_,bayestopt_,oo_);
else
% Under Octave, use a wrapper, since fminunc() does not have a 4th arg
func = @(x) objective_function(x, dataset_,options_,M_,estim_params_,bayestopt_,oo_);
[xparam1,fval,exitflag] = fminunc(func,xparam1,optim_options);
end
case 4
H0 = 1e-4*eye(nx);
crit = 1e-7;