Moved up the section where bayestopt_.jscale is updated

time-shift
Stéphane Adjemian (Charybdis) 2013-04-12 18:24:22 +02:00
parent ecd429d268
commit 46d451b34e
1 changed files with 4 additions and 4 deletions

View File

@ -329,6 +329,10 @@ if options_.analytic_derivation,
end end
end end
% If jscale isn't specified for an estimated parameter, use global option options_.jscale, set to 0.2, by default.
k = find(isnan(bayestopt_.jscale));
bayestopt_.jscale(k) = options_.mh_jscale;
% Test if the dataset is declared. % Test if the dataset is declared.
if isempty(options_.datafile) && isempty(options_.dataset) if isempty(options_.datafile) && isempty(options_.dataset)
if gsa_flag if gsa_flag
@ -339,10 +343,6 @@ if isempty(options_.datafile) && isempty(options_.dataset)
end end
end end
% If jscale isn't specified for an estimated parameter, use global option options_.jscale, set to 0.2, by default.
k = find(isnan(bayestopt_.jscale));
bayestopt_.jscale(k) = options_.mh_jscale;
% Take data in logs? % Take data in logs?
logged_data_flag = 0; logged_data_flag = 0;
if options_.loglinear && ~options_.logdata if options_.loglinear && ~options_.logdata