From 3cb16af5e323ada152cbac0a2a55cd4607bf6e7b Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Thu, 21 Nov 2013 20:18:05 +0100 Subject: [PATCH 1/2] Continue harmonizing figure titles in GSA --- matlab/gsa/stab_map_.m | 26 +++++++++++++------------- matlab/gsa/stab_map_2.m | 8 ++++++-- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/matlab/gsa/stab_map_.m b/matlab/gsa/stab_map_.m index 74133f22c..f2d47c78e 100644 --- a/matlab/gsa/stab_map_.m +++ b/matlab/gsa/stab_map_.m @@ -468,23 +468,23 @@ if pprior aunstablename=[aname, '_unst']; aunstabletitle='Prior StabMap: Parameter driving explosiveness of solution'; awronguniname=[aname, '_wrong']; awrongunititle='Prior StabMap: Parameter driving inability to find solution'; % bivariate - auname='prior_unacceptable'; autitle='Prior Unacceptable'; - aunstname='prior_unstable'; aunsttitle='Prior Unstable'; + auname='prior_unacceptable'; autitle='Prior non-existence of unique stable solution (Unacceptable)'; + aunstname='prior_unstable'; aunsttitle='Prior explosiveness of solution'; aindname='prior_indeterm'; aindtitle='Prior Indeterminacy'; - awrongname='prior_wrong'; awrongtitle='Prior No Solution Found'; - asname='prior_stable'; astitle='Prior Stable'; + awrongname='prior_wrong'; awrongtitle='Prior inability to find solution'; + asname='prior_stable'; astitle='Prior unique Stable Saddle-Path'; else % univariate - aname='mc_stab'; atitle='Posterior StabMap: Parameter driving non-existence of unique stable solution (Unacceptable)'; - aindetname=[aname, '_indet']; aindettitle='Posterior StabMap: Parameter driving indeterminacy'; - aunstablename=[aname, '_unst']; aunstabletitle='Posterior StabMap: Parameter driving explosiveness of solution'; - awronguniname=[aname, '_wrong']; awrongunititle='Posterior StabMap: Parameter driving inability to find solution'; + aname='mc_stab'; atitle='MC (around posterior mode) StabMap: Parameter driving non-existence of unique stable solution (Unacceptable)'; + aindetname=[aname, '_indet']; aindettitle='MC (around posterior mode) StabMap: Parameter driving indeterminacy'; + aunstablename=[aname, '_unst']; aunstabletitle='MC (around posterior mode) StabMap: Parameter driving explosiveness of solution'; + awronguniname=[aname, '_wrong']; awrongunititle='MC (around posterior mode) StabMap: Parameter driving inability to find solution'; % bivariate - auname='mc_unacceptable'; autitle='Posterior Unacceptable'; - aunstname='mc_unstable'; aunsttitle='Posterior Unstable'; - aindname='mc_indeterm'; aindtitle='Posterior Indeterminacy'; - awrongname='mc_wrong'; awrongtitle='Posterior No Solution Found'; - asname='mc_stable'; astitle='Posterior Stable'; + auname='mc_unacceptable'; autitle='MC (around posterior mode) non-existence of unique stable solution (Unacceptable)'; + aunstname='mc_unstable'; aunsttitle='MC (around posterior mode) explosiveness of solution'; + aindname='mc_indeterm'; aindtitle='MC (around posterior mode) Indeterminacy'; + awrongname='mc_wrong'; awrongtitle='MC (around posterior mode) inability to find solution'; + asname='mc_stable'; astitle='MC (around posterior mode) Unique Stable Saddle-Path'; end delete([OutputDirectoryName,filesep,fname_,'_',aname,'_*.*']); %delete([OutputDirectoryName,filesep,fname_,'_',aname,'_SA_*.*']); diff --git a/matlab/gsa/stab_map_2.m b/matlab/gsa/stab_map_2.m index dcb4bb641..e997af919 100644 --- a/matlab/gsa/stab_map_2.m +++ b/matlab/gsa/stab_map_2.m @@ -86,10 +86,14 @@ for j=1:npar, fprintf(1,'%20s: corrcoef = %7.3f\n',tmp_name,c0(i2(jx),j)); if ~options_.nograph, - + if strcmp(fnam(1:2),'mc') + type='MC (around posterior mode) StabMap: '; + elseif strcmp(fnam(1:5),'prior') + type='Prior StabMap: '; + end if mod(j2,12)==1, ifig=ifig+1; - hh=dyn_figure(options_,'name',['Correlations in the ',figtitle,' sample ', num2str(ifig)]); + hh=dyn_figure(options_,'name',[type,'Correlations in the ',figtitle,' sample ', num2str(ifig)]); end subplot(3,4,j2-(ifig-1)*12) % bar(c0(i2,j)), From 51adbd80088fc7aed4295b7e9425185db8d7f81c Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Tue, 3 Dec 2013 11:45:29 +0100 Subject: [PATCH 2/2] Update error message if SS-Anova Toolbox is missing --- matlab/dynare_sensitivity.m | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/matlab/dynare_sensitivity.m b/matlab/dynare_sensitivity.m index 79820d7af..e4df56984 100644 --- a/matlab/dynare_sensitivity.m +++ b/matlab/dynare_sensitivity.m @@ -281,10 +281,12 @@ if options_gsa.redform && ~isempty(options_gsa.namendo),% ... % check existence of the SS_ANOVA toolbox if isempty(options_gsa.threshold_redform) && ... ~(exist('gsa_sdp','file')==6 || exist('gsa_sdp','file')==2), - disp('Download Mapping routines at:') - disp('http://eemc.jrc.ec.europa.eu/softwareDYNARE-Dowload.htm') - disp(' ' ) - error('Mapping routines missing!') + fprintf('\nThe "SS-ANOVA-R: MATLAB Toolbox for the estimation of Smoothing Spline ANOVA models with Recursive algorithms" is missing.\n') + fprintf('To obtain it, go to:\n\n') + fprintf('http://ipsc.jrc.ec.europa.eu/?id=790 \n\n') + fprintf('and follow the instructions there.\n') + fprintf('After obtaining the files, you need to unpack them and set a Matlab Path to those files.\n') + error('SS-ANOVA-R Toolbox missing!') end redform_map(OutputDirectoryName,options_gsa);