Skip to content

GitLab

Commit c6c9b4e3 authored by Johannes Pfeifer 's avatar Johannes Pfeifer
Browse files
Options

kalman_filter.m: fix bug when using analytic_derivation

parent 78a4bca3
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
matlab/kalman/likelihood/kalman_filter.m
View file @ c6c9b4e3
...@@ -53,7 +53,7 @@ function [LIK, LIKK, a, P] = kalman_filter(Y,start,last,a,P,kalman_tol,riccati_t ...@@ -53,7 +53,7 @@ function [LIK, LIKK, a, P] = kalman_filter(Y,start,last,a,P,kalman_tol,riccati_t
%! @table @ @var %! @table @ @var
%! @item LIK %! @item LIK
%! Double scalar, value of (minus) the likelihood. %! Double scalar, value of (minus) the likelihood.
%! @item likk %! @item LIKK
%! Column vector of doubles, values of the density of each observation. %! Column vector of doubles, values of the density of each observation.
%! @item a %! @item a
%! Vector (@var{mm}*1) of doubles, mean of the state vector at the end of the (sub)sample. %! Vector (@var{mm}*1) of doubles, mean of the state vector at the end of the (sub)sample.
...@@ -254,9 +254,9 @@ end ...@@ -254,9 +254,9 @@ end
if t <= last if t <= last
if analytic_derivation if analytic_derivation
if analytic_derivation==2 if analytic_derivation==2
[tmp, tmp2] = kalman_filter_ss(Y, t, last, a, T, K, iF, dF, Z, pp, Zflag, analytic_derivation, Da, DT, DYss, D2a, D2T, D2Yss); [tmp, tmp2] = kalman_filter_ss(Y, t, last, a, T, K, iF, log_dF, Z, pp, Zflag, analytic_derivation, Da, DT, DYss, D2a, D2T, D2Yss);
else else
[tmp, tmp2] = kalman_filter_ss(Y, t, last, a, T, K, iF, dF, Z, pp, Zflag, analytic_derivation, Da, DT, DYss, asy_hess); [tmp, tmp2] = kalman_filter_ss(Y, t, last, a, T, K, iF, log_dF, Z, pp, Zflag, analytic_derivation, Da, DT, DYss, asy_hess);
end end
likk(s+1:end) = tmp2{1}; likk(s+1:end) = tmp2{1};
dlikk(s+1:end,:) = tmp2{2}; dlikk(s+1:end,:) = tmp2{2};
......
matlab/kalman/likelihood/kalman_filter_fast.m
View file @ c6c9b4e3
...@@ -209,10 +209,10 @@ end ...@@ -209,10 +209,10 @@ end
if t <= last if t <= last
if analytic_derivation if analytic_derivation
if analytic_derivation==2 if analytic_derivation==2
[tmp, tmp2] = kalman_filter_ss(Y,t,last,a,T,K,iF,dF,Z,pp,Zflag, ... [tmp, tmp2] = kalman_filter_ss(Y,t,last,a,T,K,iF,log(dF),Z,pp,Zflag, ...
analytic_derivation,Da,DT,DYss,D2a,D2T,D2Yss); analytic_derivation,Da,DT,DYss,D2a,D2T,D2Yss);
else else
[tmp, tmp2] = kalman_filter_ss(Y,t,last,a,T,K,iF,dF,Z,pp,Zflag, ... [tmp, tmp2] = kalman_filter_ss(Y,t,last,a,T,K,iF,log(dF),Z,pp,Zflag, ...
analytic_derivation,Da,DT,DYss,asy_hess); analytic_derivation,Da,DT,DYss,asy_hess);
end end
likk(s+1:end)=tmp2{1}; likk(s+1:end)=tmp2{1};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment