Fix mistakes done during previous merge commits
parent
f665117879
commit
71a68919bf
|
@ -96,20 +96,11 @@ g2=epsilon/(epsilon-1)*g1;
|
||||||
%% end own model equations
|
%% end own model equations
|
||||||
|
|
||||||
for iter = 1:length(M_.params) %update parameters set in the file
|
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} ';' ])
|
eval([ 'M_.params(' num2str(iter) ') = ' M_.param_names{iter} ';' ])
|
||||||
>>>>>>> master
|
|
||||||
end
|
end
|
||||||
|
|
||||||
NumberOfEndogenousVariables = M_.orig_endo_nbr; %auxiliary variables are set automatically
|
NumberOfEndogenousVariables = M_.orig_endo_nbr; %auxiliary variables are set automatically
|
||||||
for ii = 1:NumberOfEndogenousVariables
|
for ii = 1:NumberOfEndogenousVariables
|
||||||
<<<<<<< HEAD
|
|
||||||
varname = deblank(M_.endo_names(ii,:));
|
|
||||||
eval(['ys(' int2str(ii) ') = ' varname ';']);
|
|
||||||
=======
|
|
||||||
varname = M_.endo_names{ii};
|
varname = M_.endo_names{ii};
|
||||||
eval(['ys(' int2str(ii) ') = ' varname ';']);
|
eval(['ys(' int2str(ii) ') = ' varname ';']);
|
||||||
>>>>>>> master
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -46,12 +46,6 @@ for it = 2:(periods+1)
|
||||||
A(i_rows,i_cols_A) = jacobian(eq_index,i_cols_j);
|
A(i_rows,i_cols_A) = jacobian(eq_index,i_cols_j);
|
||||||
end
|
end
|
||||||
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_rows = i_rows + ny;
|
||||||
i_cols = i_cols + ny;
|
i_cols = i_cols + ny;
|
||||||
|
|
Loading…
Reference in New Issue