Merge branch 'master' of ssh://kirikou.dynare.org/srv/d_kirikou/git/dynare
commit
05b16bae5f
|
@ -71,7 +71,11 @@ case ${MATLAB_ARCH} in
|
||||||
fi
|
fi
|
||||||
MATLAB_DEFS="$MATLAB_DEFS -DNDEBUG"
|
MATLAB_DEFS="$MATLAB_DEFS -DNDEBUG"
|
||||||
MATLAB_CFLAGS="-fno-common -no-cpp-precomp -arch $ARCHS -isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -fexceptions -O2"
|
MATLAB_CFLAGS="-fno-common -no-cpp-precomp -arch $ARCHS -isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -fexceptions -O2"
|
||||||
MATLAB_LDFLAGS="-L$MATLAB/bin/${MATLAB_ARCH} -Wl,-twolevel_namespace -undefined error -arch $ARCHS -Wl,-syslibroot,$SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -bundle -Wl,-exported_symbols_list,\$(top_srcdir)/mexFunction-MacOSX.map"
|
# Work around for slicot configuration: need to remove exported_symbols_list
|
||||||
|
# flag because there's no mexfunction in the configure script
|
||||||
|
MATLAB_LDFLAGS_NOMAP="-L$MATLAB/bin/${MATLAB_ARCH} -Wl,-twolevel_namespace -undefined error -arch $ARCHS -Wl,-syslibroot,$SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -bundle"
|
||||||
|
MATLAB_MAPFLAG="-Wl,-exported_symbols_list,\$(top_srcdir)/mexFunction-MacOSX.map"
|
||||||
|
MATLAB_LDFLAGS="$MATLAB_LDFLAGS_NOMAP $MATLAB_MAPFLAG"
|
||||||
MATLAB_LIBS="-lmx -lmex -lmat -lstdc++ -lmwlapack"
|
MATLAB_LIBS="-lmx -lmex -lmat -lstdc++ -lmwlapack"
|
||||||
MATLAB_CXXFLAGS="-fno-common -no-cpp-precomp -fexceptions -arch $ARCHS -isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -O2"
|
MATLAB_CXXFLAGS="-fno-common -no-cpp-precomp -fexceptions -arch $ARCHS -isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -O2"
|
||||||
MATLAB_FFLAGS="-fexceptions -fbackslash -arch $ARCHS"
|
MATLAB_FFLAGS="-fexceptions -fbackslash -arch $ARCHS"
|
||||||
|
|
|
@ -427,6 +427,13 @@ switch DynareOptions.lik_init
|
||||||
T,R,Q,H1,Z,mmm,pp,rr);
|
T,R,Q,H1,Z,mmm,pp,rr);
|
||||||
diffuse_periods = length(dlik);
|
diffuse_periods = length(dlik);
|
||||||
end
|
end
|
||||||
|
if isnan(dLIK),
|
||||||
|
fval=dLIK;
|
||||||
|
info = 45;
|
||||||
|
exit_flag = 0;
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
case 4% Start from the solution of the Riccati equation.
|
case 4% Start from the solution of the Riccati equation.
|
||||||
if kalman_algo ~= 2
|
if kalman_algo ~= 2
|
||||||
kalman_algo = 1;
|
kalman_algo = 1;
|
||||||
|
@ -516,6 +523,7 @@ if analytic_derivation,
|
||||||
D2P=sparse(size(D2Om,1),size(D2Om,2)); %zeros([size(T),length(xparam1),length(xparam1)]);
|
D2P=sparse(size(D2Om,1),size(D2Om,2)); %zeros([size(T),length(xparam1),length(xparam1)]);
|
||||||
jcount=0;
|
jcount=0;
|
||||||
end
|
end
|
||||||
|
if DynareOptions.lik_init==1,
|
||||||
for i=1:EstimatedParameters.nvx
|
for i=1:EstimatedParameters.nvx
|
||||||
k =EstimatedParameters.var_exo(i,1);
|
k =EstimatedParameters.var_exo(i,1);
|
||||||
DQ(k,k,i) = 2*sqrt(Q(k,k));
|
DQ(k,k,i) = 2*sqrt(Q(k,k));
|
||||||
|
@ -534,6 +542,7 @@ if analytic_derivation,
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
offset = EstimatedParameters.nvx;
|
offset = EstimatedParameters.nvx;
|
||||||
for i=1:EstimatedParameters.nvn
|
for i=1:EstimatedParameters.nvn
|
||||||
k = EstimatedParameters.var_endo(i,1);
|
k = EstimatedParameters.var_endo(i,1);
|
||||||
|
@ -543,6 +552,7 @@ if analytic_derivation,
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
offset = offset + EstimatedParameters.nvn;
|
offset = offset + EstimatedParameters.nvn;
|
||||||
|
if DynareOptions.lik_init==1,
|
||||||
for j=1:EstimatedParameters.np
|
for j=1:EstimatedParameters.np
|
||||||
dum = lyapunov_symm(T,DT(:,:,j+offset)*Pstar*T'+T*Pstar*DT(:,:,j+offset)'+DOm(:,:,j+offset),DynareOptions.qz_criterium,DynareOptions.lyapunov_complex_threshold);
|
dum = lyapunov_symm(T,DT(:,:,j+offset)*Pstar*T'+T*Pstar*DT(:,:,j+offset)'+DOm(:,:,j+offset),DynareOptions.qz_criterium,DynareOptions.lyapunov_complex_threshold);
|
||||||
% kk = find(abs(dum) < 1e-12);
|
% kk = find(abs(dum) < 1e-12);
|
||||||
|
@ -565,6 +575,7 @@ if analytic_derivation,
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
if analytic_derivation==1,
|
if analytic_derivation==1,
|
||||||
analytic_deriv_info={analytic_derivation,DT,DYss,DOm,DH,DP,asy_Hess};
|
analytic_deriv_info={analytic_derivation,DT,DYss,DOm,DH,DP,asy_Hess};
|
||||||
else
|
else
|
||||||
|
|
|
@ -155,8 +155,8 @@ while newRank && (t<=last)
|
||||||
end
|
end
|
||||||
|
|
||||||
if (t>last)
|
if (t>last)
|
||||||
error(['univariate_diffuse_kalman_filter:: There isn''t enough information to estimate the initial conditions of the nonstationary variables']);
|
warning(['univariate_diffuse_kalman_filter:: There isn''t enough information to estimate the initial conditions of the nonstationary variables']);
|
||||||
LIK = NaN;
|
dLIK = NaN;
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,15 @@ AM_CONDITIONAL([HAVE_MATIO], [test "x$ac_cv_header_matio_h" = "xyes" -a "x$ac_cv
|
||||||
# Check for libslicot, needed by kalman_steady_state
|
# Check for libslicot, needed by kalman_steady_state
|
||||||
AC_F77_FUNC(sb02od)
|
AC_F77_FUNC(sb02od)
|
||||||
LDFLAGS_SAVED=$LDFLAGS
|
LDFLAGS_SAVED=$LDFLAGS
|
||||||
LDFLAGS=$MATLAB_LDFLAGS
|
case ${MATLAB_ARCH} in
|
||||||
|
maci | maci64)
|
||||||
|
# Work around for exported_symbols_list flag present in Mac MATLAB_LDFLAGS
|
||||||
|
LDFLAGS=$MATLAB_LDFLAGS_NOMAP
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
LDFLAGS=$MATLAB_LDFLAGS
|
||||||
|
;;
|
||||||
|
esac
|
||||||
case ${MATLAB_ARCH} in
|
case ${MATLAB_ARCH} in
|
||||||
glnxa64 | win64 | maci64)
|
glnxa64 | win64 | maci64)
|
||||||
AX_COMPARE_VERSION([$MATLAB_VERSION], [ge], [7.8], [use_64_bit_indexing=yes], [use_64_bit_indexing=no])
|
AX_COMPARE_VERSION([$MATLAB_VERSION], [ge], [7.8], [use_64_bit_indexing=yes], [use_64_bit_indexing=no])
|
||||||
|
|
Loading…
Reference in New Issue