From cf91fbe335f6015fcecd30b277b5202db2bcf820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?=
<stephane.adjemian@univ-lemans.fr>
Date: Wed, 1 Apr 2015 17:23:33 +0200
Subject: [PATCH] (Partial) Manual cherry-pick of
214dc747237b8a3ddce4267039ada25d0ab2f0e6.
---
matlab/dsge_likelihood.m | 2 +-
matlab/dynare_estimation_init.m | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/matlab/dsge_likelihood.m b/matlab/dsge_likelihood.m
index 1bca159152..cfb86890f1 100644
--- a/matlab/dsge_likelihood.m
+++ b/matlab/dsge_likelihood.m
@@ -627,7 +627,7 @@ if analytic_derivation,
analytic_deriv_info={analytic_derivation,DT,DYss,DOm,DH,DP,asy_Hess};
else
analytic_deriv_info={analytic_derivation,DT,DYss,DOm,DH,DP,D2T,D2Yss,D2Om,D2H,D2P};
- clear DT DYss DOm DH DP D2T D2Yss D2Om D2H D2P,
+ clear DT DYss DOm DP D2T D2Yss D2Om D2H D2P,
end
else
analytic_deriv_info={0};
diff --git a/matlab/dynare_estimation_init.m b/matlab/dynare_estimation_init.m
index b830394445..1777f4564e 100644
--- a/matlab/dynare_estimation_init.m
+++ b/matlab/dynare_estimation_init.m
@@ -421,7 +421,10 @@ else
bayestopt_.smoother_var_list);
end;
-if options_.analytic_derivation,
+if options_.analytic_derivation
+ if options_.lik_init == 3
+ error('analytic derivation is incompatible with diffuse filter')
+ end
options_.analytic_derivation = 1;
if ~(exist('sylvester3','file')==2),
dynareroot = strrep(which('dynare'),'dynare.m','');
--
GitLab