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

Fix mistakes done during previous merge commits

time-shift
Sébastien Villemot 2019-09-26 15:18:18 +02:00
parent f665117879
commit 71a68919bf
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/NK_baseline_steadystate.m
View File

@ -96,20 +96,11 @@ g2=epsilon/(epsilon-1)*g1;
%% end own model equations
for iter = 1:length(M_.params) %update parameters set in the file
<<<<<<< HEAD
eval([ 'M_.params(' num2str(iter) ') = ' M_.param_names(iter,:) ';' ])
=======
eval([ 'M_.params(' num2str(iter) ') = ' M_.param_names{iter} ';' ])
>>>>>>> master
end
NumberOfEndogenousVariables = M_.orig_endo_nbr; %auxiliary variables are set automatically
for ii = 1:NumberOfEndogenousVariables
<<<<<<< HEAD
varname = deblank(M_.endo_names(ii,:));
eval(['ys(' int2str(ii) ') = ' varname ';']);
=======
varname = M_.endo_names{ii};
eval(['ys(' int2str(ii) ') = ' varname ';']);
>>>>>>> master
end

6
matlab/lmmcp/dyn_lmmcp_func.m
View File

@ -46,12 +46,6 @@ for it = 2:(periods+1)
A(i_rows,i_cols_A) = jacobian(eq_index,i_cols_j);
end
end
i_rows = i_rows + ny;
i_cols = i_cols + ny;
if nargout == 2 && it > 2
i_cols_A = i_cols_A + ny;
end
end
i_rows = i_rows + ny;
i_cols = i_cols + ny;