stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1) fixed while for b index 

2) ensure there are no repeated draws in sub-draws;
3) speed-up subdraw sampling when all retained draws are used.
time-shift
Marco Ratto 2017-02-03 13:11:02 +01:00 committed by Stéphane Adjemian (Charybdis)
parent 20b0fc8bac
commit e180e2f075
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
matlab/prior_posterior_statistics.m
View File

@ -203,11 +203,35 @@ localVars.ifil=ifil;
localVars.DirectoryName = DirectoryName;
if strcmpi(type,'posterior'),
BaseName = [DirectoryName filesep M_.fname];
load_last_mh_history_file(DirectoryName, M_.fname);
FirstMhFile = record.KeepedDraws.FirstMhFile;
FirstLine = record.KeepedDraws.FirstLine;
TotalNumberOfMhFiles = sum(record.MhDraws(:,2));
LastMhFile = TotalNumberOfMhFiles;
TotalNumberOfMhDraws = sum(record.MhDraws(:,1));
NumberOfDraws = TotalNumberOfMhDraws-floor(options_.mh_drop*TotalNumberOfMhDraws);
mh_nblck = options_.mh_nblck;
if B==NumberOfDraws*mh_nblck,
% we load all retained MH runs !
logpost=GetAllPosteriorDraws(0, FirstMhFile, FirstLine, TotalNumberOfMhFiles, NumberOfDraws);
for column=1:npar
x(:,column) = GetAllPosteriorDraws(column, FirstMhFile, FirstLine, TotalNumberOfMhFiles, NumberOfDraws);
end
else
b=0;
logpost=NaN(B,1);
while b<=B
while b<B
b = b + 1;
[x(b,:), logpost(b,1)] = GetOneDraw(type);
[xtmp, ltmp] = GetOneDraw(type);
if ~ismember(ltmp,logpost(1:b-1))
x(b,:)=xtmp;
logpost(b,1) = ltmp;
else
b=b-1;
end
end
end
localVars.logpost=logpost;
end