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

sur, surgibbs: following change in `067fc9cc5a5b01e9a04209850f08ecbf3bd0a2b1` pidxs no longer needed as output from sur.m

time-shift
Houtan Bastani 2019-02-26 17:01:33 +01:00
parent 067fc9cc5a
commit 075a6b7db5
No known key found for this signature in database
GPG Key ID: 000094FB955BE169
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
matlab/ols/sur.m
View File

@ -115,20 +115,13 @@ if ~isempty(param_names)
lhssub = lhssub + newlhssub;
end
% opidxs: indexes in M_.params associated with columns of X
opidxs = zeros(X.vobs, 1);
for i = 1:X.vobs
opidxs(i, 1) = find(strcmp(X.name{i}, M_.param_names));
end
%% Return to surgibbs if called from there
st = dbstack(1);
if strcmp(st(1).name, 'surgibbs')
varargout{1} = nobs;
varargout{2} = opidxs;
varargout{3} = X{param_names{:}}.data;
varargout{4} = Y.data;
varargout{5} = neqs;
varargout{2} = X{param_names{:}}.data;
varargout{3} = Y.data;
varargout{4} = neqs;
return
end
@ -171,6 +164,12 @@ for i = 1:length(residnames)
end
M_.Sigma_e(idxs, idxs) = vcv;
% opidxs: indexes in M_.params associated with columns of X
opidxs = zeros(X.vobs, 1);
for i = 1:X.vobs
opidxs(i, 1) = find(strcmp(X.name{i}, M_.param_names));
end
% Set params
M_.params(opidxs) = oo_.sur.(model_name).beta;

4
matlab/surgibbs.m
View File

@ -75,9 +75,9 @@ end
% Using a Combination of Direct Monte Carlo and Importance Sampling
% Techniques. Bayesian Analysis. 2010. pp 67-70.
if nargin == 8
[nobs, ~, X, Y, m] = sur(ds, param_names, eqtags);
[nobs, X, Y, m] = sur(ds, param_names, eqtags);
else
[nobs, ~, X, Y, m] = sur(ds, param_names);
[nobs, X, Y, m] = sur(ds, param_names);
end
beta = beta0;