From 5e230e41b4f30f8490abd48fa45805e7b587b1eb Mon Sep 17 00:00:00 2001 From: Marco Ratto Date: Tue, 12 Apr 2011 11:11:05 +0200 Subject: [PATCH] Fixed initialization of options related to identification. (cherry picked from commit 3a7119be7626e8cce4e68b7e5e28724ad46fd1d5) --- matlab/dynare_sensitivity.m | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/matlab/dynare_sensitivity.m b/matlab/dynare_sensitivity.m index a0da91e61..1a07acea2 100644 --- a/matlab/dynare_sensitivity.m +++ b/matlab/dynare_sensitivity.m @@ -72,15 +72,22 @@ if options_gsa.identification, options_gsa = set_default_option(options_gsa,'morris',1); options_gsa = set_default_option(options_gsa,'trans_ident',0); options_gsa = set_default_option(options_gsa,'load_ident_files',0); - options_gsa = set_default_option(options_gsa,'ar',3); - options_gsa = set_default_option(options_gsa,'useautocorr',1); + options_gsa = set_default_option(options_gsa,'ar',1); + options_gsa = set_default_option(options_gsa,'useautocorr',0); options_.ar = options_gsa.ar; if options_gsa.morris==2, - options_ident=[]; - options_ident = set_default_option(options_ident,'load_ident_files',options_gsa.load_ident_files); - options_ident = set_default_option(options_ident,'useautocorr',options_gsa.useautocorr); - options_ident = set_default_option(options_ident,'ar',options_gsa.ar); - options_.options_ident = options_ident; + if isfield(options_,'options_ident'), + options_.options_ident.load_ident_files = options_gsa.load_ident_files; + options_.options_ident.useautocorr = options_gsa.useautocorr; + options_.options_ident.ar = options_gsa.ar; + options_ident=options_.options_ident; + else + options_ident=[]; + options_ident = set_default_option(options_ident,'load_ident_files',options_gsa.load_ident_files); + options_ident = set_default_option(options_ident,'useautocorr',options_gsa.useautocorr); + options_ident = set_default_option(options_ident,'ar',options_gsa.ar); + options_.options_ident = options_ident; + end end end