Replaced & by && (compatibility with octave issue).

git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1928 ac1d8469-bf42-47a9-8791-bf33cf982152
time-shift
adjemian 2008-07-04 12:41:01 +00:00
parent 4553ceca01
commit 6827fc7c28
1 changed files with 7 additions and 9 deletions

View File

@ -159,7 +159,6 @@ for b=1:B
yf(:,IdObs) = yf(:,IdObs)+(gend+[1-maxlag:horizon]')*trend_coeff';
if options_.loglinear == 1
yf = yf+repmat(log(SteadyState'),horizon+maxlag,1);
% yf = exp(yf);
else
yf = yf+repmat(SteadyState',horizon+maxlag,1);
end
@ -172,7 +171,6 @@ for b=1:B
trend_coeff',[1,1,1]);
if options_.loglinear == 1
yf1 = yf1 + repmat(log(SteadyState'),[horizon+maxlag,1,1]);
% yf1 = exp(yf1);
else
yf1 = yf1 + repmat(SteadyState',[horizon+maxlag,1,1]);
end
@ -195,21 +193,21 @@ for b=1:B
irun(1) = 1;
end
if nvx & (irun(2) > MAX_ninno | b == B)
if nvx && (irun(2) > MAX_ninno | b == B)
stock = stock_innov(:,:,1:irun(2)-1);
ifil(2) = ifil(2) + 1;
save([DirectoryName '/' M_.fname '_inno' int2str(ifil(2))],'stock');
irun(2) = 1;
end
if nvn & (irun(3) > MAX_nerro | b == B)
if nvn && (irun(3) > MAX_nerro | b == B)
stock = stock_error(:,:,1:irun(3)-1);
ifil(3) = ifil(3) + 1;
save([DirectoryName '/' M_.fname '_error' int2str(ifil(3))],'stock');
irun(3) = 1;
end
if naK & (irun(4) > MAX_naK | b == B)
if naK && (irun(4) > MAX_naK | b == B)
stock = stock_filter(:,:,:,1:irun(4)-1);
ifil(4) = ifil(4) + 1;
save([DirectoryName '/' M_.fname '_filter' int2str(ifil(4))],'stock');
@ -223,21 +221,21 @@ for b=1:B
irun(5) = 1;
end
if horizon & (irun(6) > MAX_nforc1 | b == B)
if horizon && (irun(6) > MAX_nforc1 | b == B)
stock = stock_forcst_mean(:,:,1:irun(6)-1);
ifil(6) = ifil(6) + 1;
save([DirectoryName '/' M_.fname '_forc_mean' int2str(ifil(6))],'stock');
irun(6) = 1;
end
if horizon & (irun(7) > MAX_nforc2 | b == B)
if horizon && (irun(7) > MAX_nforc2 | b == B)
stock = stock_forcst_total(:,:,1:irun(7)-1);
ifil(7) = ifil(7) + 1;
save([DirectoryName '/' M_.fname '_forc_total' int2str(ifil(7))],'stock');
irun(7) = 1;
end
if moments_varendo & (irun(8) > MAX_momentsno | b == B)
if moments_varendo && (irun(8) > MAX_momentsno | b == B)
stock = stock_moments(1:irun(8)-1);
ifil(8) = ifil(8) + 1;
save([DirectoryName '/' M_.fname '_moments' int2str(ifil(8))],'stock');
@ -265,4 +263,4 @@ if options_.forecast
pm3(endo_nbr,horizon+maxlag,ifil(6),B,'Forecasted variables (total)',...
M_.endo_names(SelecVariables),M_.endo_names,'tit_tex',M_.endo_names,...
'names2','smooth',[M_.fname '/metropolis'],'_forc_total')
end
end