v4 McMCDiagnostics.m: corrected bug with size of tmp
git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1136 ac1d8469-bf42-47a9-8791-bf33cf982152time-shift
parent
7793bc700f
commit
7d1a90e607
|
@ -60,18 +60,20 @@ for j=1:npar
|
||||||
fprintf(' Parameter %d... ',j);
|
fprintf(' Parameter %d... ',j);
|
||||||
for b = 1:nblck
|
for b = 1:nblck
|
||||||
startline = 0;
|
startline = 0;
|
||||||
for n = 1:NumberOfMcFilesPerBlock-1
|
for n = 1:NumberOfMcFilesPerBlock
|
||||||
%load([MhDirectoryName '/' mcfiles(n,1,b).name],'x2');
|
%load([MhDirectoryName '/' mcfiles(n,1,b).name],'x2');
|
||||||
load([MhDirectoryName '/' M_.fname '_mh',int2str(n),'_blck' int2str(b) '.mat'],'x2');
|
load([MhDirectoryName '/' M_.fname '_mh',int2str(n),'_blck' int2str(b) ...
|
||||||
tmp((b-1)*NumberOfDraws+startline+1:(b-1)*NumberOfDraws+MAX_nruns*n,1) = x2(:,j);
|
'.mat'],'x2');
|
||||||
clear x2;
|
nx2 = size(x2,1);
|
||||||
startline = startline + MAX_nruns;
|
tmp((b-1)*NumberOfDraws+startline+(1:nx2),1) = x2(:,j);
|
||||||
|
% clear x2;
|
||||||
|
startline = startline + nx2;
|
||||||
end
|
end
|
||||||
%load([MhDirectoryName '/' mcfiles(NumberOfMcFilesPerBlock,1,b).name],'x2');
|
% $$$ %load([MhDirectoryName '/' mcfiles(NumberOfMcFilesPerBlock,1,b).name],'x2');
|
||||||
load([MhDirectoryName '/' M_.fname '_mh',int2str(NumberOfMcFilesPerBlock),'_blck' int2str(b) '.mat'],'x2');
|
% $$$ load([MhDirectoryName '/' M_.fname '_mh',int2str(NumberOfMcFilesPerBlock),'_blck' int2str(b) '.mat'],'x2');
|
||||||
tmp((b-1)*NumberOfDraws+startline+1:(b-1)*NumberOfDraws+MAX_nruns*(LastFileNumber-1)+LastLineNumber,1) = x2(:,j);
|
% $$$ tmp((b-1)*NumberOfDraws+startline+1:(b-1)*NumberOfDraws+MAX_nruns*(LastFileNumber-1)+LastLineNumber,1) = x2(:,j);
|
||||||
clear x2;
|
% $$$ clear x2;
|
||||||
startline = startline + LastLineNumber;
|
% $$$ startline = startline + LastLineNumber;
|
||||||
end
|
end
|
||||||
tmp(:,2) = kron(transpose(1:nblck),ones(NumberOfDraws,1));
|
tmp(:,2) = kron(transpose(1:nblck),ones(NumberOfDraws,1));
|
||||||
tmp(:,3) = kron(ones(nblck,1),time');
|
tmp(:,3) = kron(ones(nblck,1),time');
|
||||||
|
@ -260,15 +262,16 @@ tmp = zeros(NumberOfDraws*nblck,3);
|
||||||
MDIAG = zeros(NumberOfLines,6);
|
MDIAG = zeros(NumberOfLines,6);
|
||||||
for b = 1:nblck
|
for b = 1:nblck
|
||||||
startline = 0;
|
startline = 0;
|
||||||
for n = 1:NumberOfMcFilesPerBlock-1
|
for n = 1:NumberOfMcFilesPerBlock
|
||||||
%load([MhDirectoryName '/' mcfiles(n,1,b).name],'logpo2');
|
%load([MhDirectoryName '/' mcfiles(n,1,b).name],'logpo2');
|
||||||
load([MhDirectoryName '/' M_.fname '_mh',int2str(n),'_blck' int2str(b) '.mat'],'logpo2');
|
load([MhDirectoryName '/' M_.fname '_mh',int2str(n),'_blck' int2str(b) '.mat'],'logpo2');
|
||||||
tmp((b-1)*NumberOfDraws+startline+1:(b-1)*NumberOfDraws+MAX_nruns*n,1) = logpo2;
|
nlogpo2 = size(logpo2,1);
|
||||||
startline = startline+MAX_nruns;
|
tmp((b-1)*NumberOfDraws+startline+(1:nlogpo2),1) = logpo2;
|
||||||
|
startline = startline+nlogpo2;
|
||||||
end
|
end
|
||||||
%load([MhDirectoryName '/' mcfiles(NumberOfMcFilesPerBlock,1,b).name],'logpo2');
|
% $$$ %load([MhDirectoryName '/' mcfiles(NumberOfMcFilesPerBlock,1,b).name],'logpo2');
|
||||||
load([MhDirectoryName '/' M_.fname '_mh',int2str(NumberOfMcFilesPerBlock),'_blck' int2str(b) '.mat'],'logpo2');
|
% $$$ load([MhDirectoryName '/' M_.fname '_mh',int2str(NumberOfMcFilesPerBlock),'_blck' int2str(b) '.mat'],'logpo2');
|
||||||
tmp((b-1)*NumberOfDraws+startline+1:(b-1)*NumberOfDraws+ MAX_nruns*(LastFileNumber-1)+LastLineNumber,1) = logpo2;
|
% $$$ tmp((b-1)*NumberOfDraws+startline+1:(b-1)*NumberOfDraws+ MAX_nruns*(LastFileNumber-1)+LastLineNumber,1) = logpo2;
|
||||||
end
|
end
|
||||||
clear logpo2;
|
clear logpo2;
|
||||||
tmp(:,2) = kron(transpose(1:nblck),ones(NumberOfDraws,1));
|
tmp(:,2) = kron(transpose(1:nblck),ones(NumberOfDraws,1));
|
||||||
|
|
Loading…
Reference in New Issue