fixing problem with bayestopt_.p5 (prior mode)

time-shift
Michel Juillard 2011-07-24 23:01:50 +02:00
parent 50c085e5a3
commit 89e66dfd98
1 changed files with 7 additions and 13 deletions

View File

@ -55,7 +55,7 @@ bayestopt_.p1 = []; % prior mean
bayestopt_.p2 = []; % prior standard deviation
bayestopt_.p3 = []; % lower bound
bayestopt_.p4 = []; % upper bound
bayestopt_.p5 = []; % prior mode
bayestopt_.p5 = zeros(nvx+nvn+ncx+ncn+np,1); % prior mode
bayestopt_.p6 = []; % first hyper-parameter (\alpha for the BETA and GAMMA distributions, s for the INVERSE GAMMAs, expectation for the GAUSSIAN distribution, lower bound for the UNIFORM distribution).
bayestopt_.p7 = []; % second hyper-parameter (\beta for the BETA and GAMMA distributions, \nu for the INVERSE GAMMAs, standard deviation for the GAUSSIAN distribution, upper bound for the UNIFORM distribution).
@ -272,23 +272,17 @@ if exist([ M_.dname '/prior/definition.mat'])
if length(bayestopt_.p1)==length(old.bayestopt_.p1)
if any(bayestopt_.p1-old.bayestopt_.p1)
prior_has_changed = 1;
end
if any(bayestopt_.p2-old.bayestopt_.p2)
elseif any(bayestopt_.p2-old.bayestopt_.p2)
prior_has_changed = 1;
end
if any(bayestopt_.p3-old.bayestopt_.p3)
elseif any(bayestopt_.p3-old.bayestopt_.p3)
prior_has_changed = 1;
end
if any(bayestopt_.p4-old.bayestopt_.p4)
elseif any(bayestopt_.p4-old.bayestopt_.p4)
prior_has_changed = 1;
end
if any(bayestopt_.p5-old.bayestopt_.p5)
elseif any(bayestopt_.p5-old.bayestopt_.p5(:))
prior_has_changed = 1;
end
if any(bayestopt_.p6-old.bayestopt_.p6)
elseif any(bayestopt_.p6-old.bayestopt_.p6)
prior_has_changed = 1;
end
if any(bayestopt_.p7-old.bayestopt_.p7)
elseif any(bayestopt_.p7-old.bayestopt_.p7)
prior_has_changed = 1;
end
else