Commit 1f884db8 authored by Stéphane Adjemian's avatar Stéphane Adjemian
Browse files

If TolX is set to any negative number, let cmaes choose the value of TolX.

parent 6a250f89
...@@ -537,7 +537,12 @@ if ~isequal(options_.mode_compute,0) && ~options_.mh_posterior_mode_estimation ...@@ -537,7 +537,12 @@ if ~isequal(options_.mode_compute,0) && ~options_.mh_posterior_mode_estimation
case '''TolFun''' case '''TolFun'''
simpsaOptions.TOLFUN = str2double(options_list{2*(o-1)+2}); simpsaOptions.TOLFUN = str2double(options_list{2*(o-1)+2});
case '''TolX''' case '''TolX'''
simpsaOptions.TOLX = str2double(options_list{2*(o-1)+2}); tolx = str2double(options_list{2*(o-1)+2});
if tolx<0
simpsaOptions = rmfield(simpsaOptions,'TOLX'); % Let cmaes choose the default.
simpsaOptions.TOLX = tolx;
case '''EndTemparature''' case '''EndTemparature'''
simpsaOptions.TEMP_END = str2double(options_list{2*(o-1)+2}); simpsaOptions.TEMP_END = str2double(options_list{2*(o-1)+2});
case '''MaxFunEvals''' case '''MaxFunEvals'''
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment