diff --git a/matlab/McMCDiagnostics.m b/matlab/McMCDiagnostics.m index c4628c6e90e307ad7d03fa769f5636f67b555105..9e3582b43ae29b32a689d484eac637f1f6bbb1d9 100644 --- a/matlab/McMCDiagnostics.m +++ b/matlab/McMCDiagnostics.m @@ -194,7 +194,6 @@ if reste nc = 3; end h = dyn_figure(options_,'Name','MCMC univariate diagnostic (Brooks and Gelman, 1998)'); - end boxplot = 1; for j = 1:reste k = k+1; diff --git a/matlab/gsa/filt_mc_.m b/matlab/gsa/filt_mc_.m index b64dc6c9954d02bc28334c2aa50f44375859e0f3..2b0c5cca33e2ddfaf69519ed8cba80f2102510a2 100644 --- a/matlab/gsa/filt_mc_.m +++ b/matlab/gsa/filt_mc_.m @@ -308,7 +308,7 @@ else dyn_saveas(hh,[OutDir '/' fname_ '_rmse_mc_lnprior',int2str(ifig) ],options_); end end - if ~options.nodisplay + if ~options_.nodisplay close(hh); end end @@ -339,7 +339,7 @@ else dyn_saveas(hh,[OutDir '/' fname_ '_rmse_mc_lnlik',int2str(ifig) ],options_); end end - if ~options.nodisplay + if ~options_.nodisplay close(hh); end end @@ -370,7 +370,7 @@ else dyn_saveas(hh,[OutDir '/' fname_ '_rmse_mc_lnpost',int2str(ifig)],options_); end end - if ~options.nodisplay + if ~options_.nodisplay close(hh); end end diff --git a/matlab/gsa/map_ident_.m b/matlab/gsa/map_ident_.m index 1b1c3d41be9e079ae93c3181a920cbb41adc1496..9cc1db953c2038f0698caae7ff287617614152c0 100644 --- a/matlab/gsa/map_ident_.m +++ b/matlab/gsa/map_ident_.m @@ -96,7 +96,7 @@ if opt_gsa.load_ident_files==0, title(M_.exo_names(j,:),'interpreter','none') if mod(j,6)==0 | j==M_.exo_nbr, dyn_saveas(hh,[OutputDirectoryName,'/',fname_,'_vdec_exo_',int2str(ifig)],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hh); end end @@ -218,7 +218,7 @@ if opt_gsa.morris==1, xlabel(' ') title('All variance decomposition') dyn_saveas(hh,[OutputDirectoryName,'/',fname_,'_morris_vdec'],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hh); end else @@ -737,7 +737,7 @@ if opt_gsa.morris==1, xlabel(' ') title('\mu in the model') dyn_saveas(hh,[OutputDirectoryName,'/',fname_,'_morrismu_par'],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hh); end @@ -755,7 +755,7 @@ if opt_gsa.morris==1, xlabel(' ') title('\sigma in the model') dyn_saveas(hh,[OutputDirectoryName,'/',fname_,'_morrissig_par'],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hh); end diff --git a/matlab/gsa/redform_map.m b/matlab/gsa/redform_map.m index d26e778030509ae7f80b26954ad07423ebcfe0e2..2c49e940f2e0206e611f1fb6d358c4c2ca95ea53 100644 --- a/matlab/gsa/redform_map.m +++ b/matlab/gsa/redform_map.m @@ -157,7 +157,7 @@ for j=1:size(anamendo,1) title([logflag,' ',namendo,' vs. ',namexo],'interpreter','none') if iplo==9, dyn_saveas(hfig,[dirname,'/',M_.fname,'_redform_', namendo,'_vs_shocks_',logflag,num2str(ifig)],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hfig); end end @@ -167,7 +167,7 @@ for j=1:size(anamendo,1) end if iplo<9 & iplo>0 & ifig, dyn_saveas(hfig,[dirname,'/',M_.fname,'_redform_', namendo,'_vs_shocks_',logflag,num2str(ifig)],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hfig); end end @@ -233,7 +233,7 @@ for j=1:size(anamendo,1) title([logflag,' ',namendo,' vs. ',namlagendo,'(-1)'],'interpreter','none') if iplo==9, dyn_saveas(hfig,[dirname,'/',M_.fname,'_redform_', namendo,'_vs_lags_',logflag,num2str(ifig)],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hfig); end end @@ -243,7 +243,7 @@ for j=1:size(anamendo,1) end if iplo<9 & iplo>0 & ifig, dyn_saveas(hfig,[dirname,'/',M_.fname,'_redform_', namendo,'_vs_lags_',logflag,num2str(ifig)],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hfig); end end @@ -301,7 +301,7 @@ if iload==0, mkdir(xdir) end dyn_saveas(hfig,[xdir,'/', namy,'_vs_', namx],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hfig); end % gsa_ = gsa_sdp_dyn(y0, x0, -2, [],[],[],1,fname, pnames); @@ -319,7 +319,7 @@ if iload==0, hfig=gsa_sdp_plot(gsa_,fname,pnames,iii(1:min(12,np))); close(hfig); gsa_.x0=x0(1:nfit,:); - if ~options.nodisplay + if ~options_.nodisplay close(hfig); end % copyfile([fname,'_est.mat'],[fname,'.mat']) @@ -327,7 +327,7 @@ if iload==0, plot(y0(1:nfit),[gsa_.fit y0(1:nfit)],'.'), title([namy,' vs. ', namx,' fit']) dyn_saveas(hfig,[xdir,'/', namy,'_vs_', namx,'_fit'],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hfig); end if nfit<nrun, @@ -337,7 +337,7 @@ if iload==0, plot(y0(npred),[yf y0(npred)],'.'), title([namy,' vs. ', namx,' pred']) dyn_saveas(hfig,[xdir,'/', namy,'_vs_', namx,'_pred'],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hfig); end end @@ -349,7 +349,7 @@ else plot(y0,[yf y0],'.'), title([namy,' vs. ', namx,' pred']) dyn_saveas(hfig,[xdir,'/', namy,'_vs_', namx,'_pred'],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hfig); end end diff --git a/matlab/gsa/redform_screen.m b/matlab/gsa/redform_screen.m index 67ad9c5ffcbf53ba0f326e3174832c188b1bbfee..5be8a871eb70bc97140364f03c413c5bbe3dec45 100644 --- a/matlab/gsa/redform_screen.m +++ b/matlab/gsa/redform_screen.m @@ -91,7 +91,7 @@ for j=1:size(anamendo,1), title([namendo,' vs. ',namexo],'interpreter','none') if iplo==9, dyn_saveas(hh,[dirname,'/',M_.fname,'_', namendo,'_vs_shock_',num2str(ifig)],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hh); end end @@ -101,7 +101,7 @@ for j=1:size(anamendo,1), end if iplo<9 & iplo>0 & ifig, dyn_saveas(hh,[dirname,'/',M_.fname,'_', namendo,'_vs_shocks_',num2str(ifig)],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hh); end end @@ -138,7 +138,7 @@ for j=1:size(anamendo,1), title([namendo,' vs. ',namlagendo,'(-1)'],'interpreter','none') if iplo==9, dyn_saveas(hh,[dirname,'/',M_.fname,'_', namendo,'_vs_lags_',num2str(ifig)],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hh); end end diff --git a/matlab/gsa/stab_map_1.m b/matlab/gsa/stab_map_1.m index 8ca2337c940a31e94b0f8bd27f48bd50dad884a3..3c354cc994f6469266e0040ee44290e830ee1f10 100644 --- a/matlab/gsa/stab_map_1.m +++ b/matlab/gsa/stab_map_1.m @@ -98,7 +98,7 @@ for i=1:ceil(nparplot/12), title([ftit{j},'. p-value ', num2str(proba(ipar(j)),2)],'interpreter','none') end dyn_saveas(hh,[dirname,'/',fname_,'_',aname,'_SA_',int2str(i)],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hh); end end diff --git a/matlab/gsa/stab_map_2.m b/matlab/gsa/stab_map_2.m index c5a48c20d5e681596080c63ecb94cb74acf71c61..a1a72c790760bb06dd6f3551bac32010faf26eef 100644 --- a/matlab/gsa/stab_map_2.m +++ b/matlab/gsa/stab_map_2.m @@ -98,7 +98,7 @@ for j=1:npar, title(['cc = ',num2str(c0(i2(jx),j))]) if (mod(j2,12)==0) && j2>0, dyn_saveas(hh,[dirname,'/',fig_nam_,int2str(ifig)],options_); - if ~options.nodisplay + if ~options_.nodisplay close(hh); end end