stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

when saving, use .mat file extension because Octave doesn’t support it by default

time-shift
Houtan Bastani 2016-09-26 11:00:41 +02:00
parent d4f5977380
commit 2a6b3caa34
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matlab/ep/extended_path_core.m
View File

@ -37,7 +37,7 @@ end
oo.endo_simul = endo_simul; oo.endo_simul = endo_simul;
if debug if debug
save ep_test_1 endo_simul exo_simul save ep_test_1.mat endo_simul exo_simul
end end
if bytecode_flag && ~ep.stochastic.order if bytecode_flag && ~ep.stochastic.order

4
matlab/getH.m
View File

@ -627,8 +627,8 @@ if nargout > 5,
d2Om(:,cumjcount+1:cumjcount+jcount) = d2Om_tmp(:,1:jcount); d2Om(:,cumjcount+1:cumjcount+jcount) = d2Om_tmp(:,1:jcount);
% d2Om(:,:,j+length(indexo),i+length(indexo)) = y; % d2Om(:,:,j+length(indexo),i+length(indexo)) = y;
% d2Om(:,:,i+length(indexo),j+length(indexo)) = y; % d2Om(:,:,i+length(indexo),j+length(indexo)) = y;
save([tmpDir filesep 'd2A_' int2str(cumjcount+1) '_' int2str(cumjcount+jcount)],'d2A') save([tmpDir filesep 'd2A_' int2str(cumjcount+1) '_' int2str(cumjcount+jcount) '.mat'],'d2A')
save([tmpDir filesep 'd2Om_' int2str(cumjcount+1) '_' int2str(cumjcount+jcount)],'d2Om') save([tmpDir filesep 'd2Om_' int2str(cumjcount+1) '_' int2str(cumjcount+jcount) '.mat'],'d2Om')
cumjcount = cumjcount+jcount; cumjcount = cumjcount+jcount;
jcount=0; jcount=0;
% d2A = sparse(m1*m1,tot_param_nbr*(tot_param_nbr+1)/2); % d2A = sparse(m1*m1,tot_param_nbr*(tot_param_nbr+1)/2);

18
matlab/gsa/map_ident_.m
View File

@ -177,14 +177,14 @@ if opt_gsa.load_ident_files==0,
% [ytr, j0r]=teff(R,Nsam,istable); % [ytr, j0r]=teff(R,Nsam,istable);
% %
% yt=[yt1 yt2 ytr]; % yt=[yt1 yt2 ytr];
save([OutputDirectoryName,'/',fname_,'_main_eff'],'ac','cc','vdec','yt','mss') save([OutputDirectoryName,'/',fname_,'_main_eff.mat'],'ac','cc','vdec','yt','mss')
else else
if opt_gsa.morris==2, if opt_gsa.morris==2,
% [pdraws, TAU, GAM] = dynare_identification([1:npT]); %,[lpmatx lpmat(istable,:)]); % [pdraws, TAU, GAM] = dynare_identification([1:npT]); %,[lpmatx lpmat(istable,:)]);
% [pdraws, TAU, GAM] = dynare_identification(options_.options_ident); % [pdraws, TAU, GAM] = dynare_identification(options_.options_ident);
pdraws = dynare_identification(options_.options_ident); pdraws = dynare_identification(options_.options_ident);
end end
load([OutputDirectoryName,'/',fname_,'_main_eff'],'ac','cc','vdec','yt','mss') load([OutputDirectoryName,'/',fname_,'_main_eff.mat'],'ac','cc','vdec','yt','mss')
end end
% for j=1:nr, % for j=1:nr,
@ -209,7 +209,7 @@ if opt_gsa.morris==1,
[SAmeas, SAMorris(:,:,i)] = Morris_Measure_Groups(npT, [lpmat0 lpmat], vdec(:,i),nliv); [SAmeas, SAMorris(:,:,i)] = Morris_Measure_Groups(npT, [lpmat0 lpmat], vdec(:,i),nliv);
end end
SAvdec = squeeze(SAMorris(:,1,:))'; SAvdec = squeeze(SAMorris(:,1,:))';
save([OutputDirectoryName,'/',fname_,'_morris_IDE'],'SAvdec','vdec','ir_vdec','ic_vdec') save([OutputDirectoryName,'/',fname_,'_morris_IDE.mat'],'SAvdec','vdec','ir_vdec','ic_vdec')
else else
load([OutputDirectoryName,'/',fname_,'_morris_IDE'],'SAvdec','vdec','ir_vdec','ic_vdec') load([OutputDirectoryName,'/',fname_,'_morris_IDE'],'SAvdec','vdec','ir_vdec','ic_vdec')
end end
@ -230,7 +230,7 @@ if opt_gsa.morris==1,
dyn_saveas(hh,[OutputDirectoryName,'/',fname_,'_morris_vdec'],options_); dyn_saveas(hh,[OutputDirectoryName,'/',fname_,'_morris_vdec'],options_);
create_TeX_loader(options_,[OutputDirectoryName,'/',fname_,'_morris_vdec'],1,'Screening identification: variance decomposition','morris_vdec',1) create_TeX_loader(options_,[OutputDirectoryName,'/',fname_,'_morris_vdec'],1,'Screening identification: variance decomposition','morris_vdec',1)
else else
save([OutputDirectoryName,'/',fname_,'_morris_IDE'],'vdec') save([OutputDirectoryName,'/',fname_,'_morris_IDE.mat'],'vdec')
end end
@ -313,8 +313,8 @@ if opt_gsa.morris==1,
end end
SAcc = squeeze(SAMorris(:,1,:))'; SAcc = squeeze(SAMorris(:,1,:))';
SAcc = SAcc./(max(SAcc')'*ones(1,npT)); SAcc = SAcc./(max(SAcc')'*ones(1,npT));
save([OutputDirectoryName,'/',fname_,'_morris_IDE'],'SAcc','cc','ir_cc','ic_cc','-append') save([OutputDirectoryName,'/',fname_,'_morris_IDE.mat'],'SAcc','cc','ir_cc','ic_cc','-append')
save([OutputDirectoryName,'/',fname_,'_morris_IDE'],'ac','ir_ac','ic_ac','-append') save([OutputDirectoryName,'/',fname_,'_morris_IDE.mat'],'ac','ir_ac','ic_ac','-append')
else else
load([OutputDirectoryName,'/',fname_,'_morris_IDE'],'SAcc','cc','ir_cc','ic_cc') load([OutputDirectoryName,'/',fname_,'_morris_IDE'],'SAcc','cc','ir_cc','ic_cc')
load([OutputDirectoryName,'/',fname_,'_morris_IDE'],'ac','ir_ac','ic_ac') load([OutputDirectoryName,'/',fname_,'_morris_IDE'],'ac','ir_ac','ic_ac')
@ -713,7 +713,7 @@ if opt_gsa.morris==1,
for j=1:j0 for j=1:j0
SAsignorm(:,j)=SAMsig(:,j)./max(SAMsig(:,j)); SAsignorm(:,j)=SAMsig(:,j)./max(SAMsig(:,j));
end end
save([OutputDirectoryName,'/',fname_,'_morris_IDE'],'SAnorm','SAmunorm','SAsignorm','-append') save([OutputDirectoryName,'/',fname_,'_morris_IDE.mat'],'SAnorm','SAmunorm','SAsignorm','-append')
else else
load([OutputDirectoryName,'/',fname_,'_morris_IDE'],'SAnorm','SAmunorm','SAsignorm') load([OutputDirectoryName,'/',fname_,'_morris_IDE'],'SAnorm','SAmunorm','SAsignorm')
end end
@ -1030,8 +1030,8 @@ else, % main effects analysis
imap_cc{j}=imap; imap_cc{j}=imap;
end end
save([OutputDirectoryName,'/map_cc',fsuffix],'gsa_') save([OutputDirectoryName,'/map_cc',fsuffix,'.mat'],'gsa_')
save([OutputDirectoryName,'/',fname_,'_main_eff'],'imap_cc','SAcc','ccac','-append') save([OutputDirectoryName,'/',fname_,'_main_eff.mat'],'imap_cc','SAcc','ccac','-append')
else else
load([OutputDirectoryName,'/',fname_,'_main_eff'],'imap_cc','SAcc','ccac') load([OutputDirectoryName,'/',fname_,'_main_eff'],'imap_cc','SAcc','ccac')

2
matlab/mode_check.m
View File

@ -204,4 +204,4 @@ if TeX && any(strcmp('eps',cellstr(DynareOptions.graph_format)))
end end
OutputDirectoryName = CheckPath('modecheck',Model.dname); OutputDirectoryName = CheckPath('modecheck',Model.dname);
save([OutputDirectoryName '/check_plot_data'],'mcheck'); save([OutputDirectoryName '/check_plot_data.mat'],'mcheck');

8
matlab/ms-sbvar/ms_forecast.m
View File

@ -14,7 +14,7 @@ function [options_, oo_]=ms_forecast(M_, options_, oo_)
% SPECIAL REQUIREMENTS % SPECIAL REQUIREMENTS
% none % none
% Copyright (C) 2011-2012 Dynare Team % Copyright (C) 2011-2016 Dynare Team
% %
% This file is part of Dynare. % This file is part of Dynare.
% %
@ -93,7 +93,7 @@ if options_.ms.regimes
'.out'], '-ascii'); '.out'], '-ascii');
forecast_data = reshape_ascii_forecast_data(M_.endo_nbr, ... forecast_data = reshape_ascii_forecast_data(M_.endo_nbr, ...
percentiles_size, options_.ms.horizon, forecast_data); percentiles_size, options_.ms.horizon, forecast_data);
save([forecastdir filesep 'forecast_regime_' num2str(regime_i-1)], ... save([forecastdir filesep 'forecast_regime_' num2str(regime_i-1) '.mat'], ...
'forecast_data'); 'forecast_data');
plot_ms_forecast(M_, options_, forecast_data, forecast_title); plot_ms_forecast(M_, options_, forecast_data, forecast_title);
end end
@ -103,12 +103,12 @@ else
num2str(options_.ms.regime-1) '_' options_.ms.output_file_tag ... num2str(options_.ms.regime-1) '_' options_.ms.output_file_tag ...
'.out'], '-ascii'); '.out'], '-ascii');
forecast_title = ['Forecast, Regime ' num2str(options_.ms.regime)]; forecast_title = ['Forecast, Regime ' num2str(options_.ms.regime)];
save_filename = ['forecast_regime_' num2str(options_.ms.regime-1)]; save_filename = ['forecast_regime_' num2str(options_.ms.regime-1) '.mat'];
else else
forecast_data = load([forecastdir filesep 'forecasts_percentiles_' ... forecast_data = load([forecastdir filesep 'forecasts_percentiles_' ...
options_.ms.output_file_tag '.out'], '-ascii'); options_.ms.output_file_tag '.out'], '-ascii');
forecast_title = 'Forecast'; forecast_title = 'Forecast';
save_filename = 'forecast'; save_filename = 'forecast.mat';
end end
forecast_data = reshape_ascii_forecast_data(M_.endo_nbr, ... forecast_data = reshape_ascii_forecast_data(M_.endo_nbr, ...

10
matlab/ms-sbvar/ms_irf.m
View File

@ -15,7 +15,7 @@ function [options_, oo_]=ms_irf(varlist, M_, options_, oo_)
% SPECIAL REQUIREMENTS % SPECIAL REQUIREMENTS
% none % none
% Copyright (C) 2011-2012 Dynare Team % Copyright (C) 2011-2016 Dynare Team
% %
% This file is part of Dynare. % This file is part of Dynare.
% %
@ -95,7 +95,7 @@ if options_.ms.regimes
'.out'], '-ascii'); '.out'], '-ascii');
irf_data = reshape_ascii_irf_data(M_.endo_nbr, percentiles_size, ... irf_data = reshape_ascii_irf_data(M_.endo_nbr, percentiles_size, ...
options_.ms.horizon, irf_data); options_.ms.horizon, irf_data);
save([irfdir filesep 'irf_regime_' num2str(regime_i-1)], 'irf_data'); save([irfdir filesep 'irf_regime_' num2str(regime_i-1) '.mat'], 'irf_data');
plot_ms_irf(M_, options_, irf_data, irf_title, varlist); plot_ms_irf(M_, options_, irf_data, irf_title, varlist);
end end
else else
@ -104,17 +104,17 @@ else
num2str(options_.ms.regime-1) '_' options_.ms.output_file_tag ... num2str(options_.ms.regime-1) '_' options_.ms.output_file_tag ...
'.out'], '-ascii'); '.out'], '-ascii');
irf_title = ['Impulse Response, Regime ' num2str(options_.ms.regime)]; irf_title = ['Impulse Response, Regime ' num2str(options_.ms.regime)];
save_filename = ['irf_regime_' num2str(options_.ms.regime-1)]; save_filename = ['irf_regime_' num2str(options_.ms.regime-1) '.mat'];
elseif options_.ms.filtered_probabilities elseif options_.ms.filtered_probabilities
irf_data = load([irfdir filesep 'ir_percentiles_filtered_' ... irf_data = load([irfdir filesep 'ir_percentiles_filtered_' ...
options_.ms.output_file_tag '.out'], '-ascii'); options_.ms.output_file_tag '.out'], '-ascii');
irf_title = 'Impulse Response Filtered'; irf_title = 'Impulse Response Filtered';
save_filename = 'irf'; save_filename = 'irf.mat';
else else
irf_data = load([irfdir filesep 'ir_percentiles_ergodic_' ... irf_data = load([irfdir filesep 'ir_percentiles_ergodic_' ...
options_.ms.output_file_tag '.out'], '-ascii'); options_.ms.output_file_tag '.out'], '-ascii');
irf_title = 'Impulse Response Ergodic'; irf_title = 'Impulse Response Ergodic';
save_filename = 'irf'; save_filename = 'irf.mat';
end end
irf_data = reshape_ascii_irf_data(M_.endo_nbr, percentiles_size, ... irf_data = reshape_ascii_irf_data(M_.endo_nbr, percentiles_size, ...

8
matlab/ms-sbvar/ms_variance_decomposition.m
View File

@ -14,7 +14,7 @@ function [options_, oo_]=ms_variance_decomposition(M_, options_, oo_)
% SPECIAL REQUIREMENTS % SPECIAL REQUIREMENTS
% none % none
% Copyright (C) 2011-2012 Dynare Team % Copyright (C) 2011-2016 Dynare Team
% %
% This file is part of Dynare. % This file is part of Dynare.
% %
@ -106,15 +106,15 @@ if options_.ms.regimes
options_.ms.output_file_tag '.out'], '-ascii'); options_.ms.output_file_tag '.out'], '-ascii');
vd_data = reshape_ascii_variance_decomposition_data( ... vd_data = reshape_ascii_variance_decomposition_data( ...
M_.endo_nbr, percentiles_size, options_.ms.horizon, vd_data); M_.endo_nbr, percentiles_size, options_.ms.horizon, vd_data);
save([vddir filesep 'variance_decomposition_regime_' num2str(regime_i-1)], 'vd_data'); save([vddir filesep 'variance_decomposition_regime_' num2str(regime_i-1) '.mat'], 'vd_data');
plot_ms_variance_decomposition(M_, options_, vd_data, vd_title); plot_ms_variance_decomposition(M_, options_, vd_data, vd_title);
end end
else else
if options_.ms.regime if options_.ms.regime
vd_title = ['Variance Decomposition, Regime ' num2str(options_.ms.regime)]; vd_title = ['Variance Decomposition, Regime ' num2str(options_.ms.regime)];
save_filename = ['variance_decomposition_regime_' num2str(options_.ms.regime-1)]; save_filename = ['variance_decomposition_regime_' num2str(options_.ms.regime-1) '.mat'];
else else
save_filename = 'variance_decomposition'; save_filename = 'variance_decomposition.mat';
if options_.ms.filtered_probabilities if options_.ms.filtered_probabilities
vd_title = 'Variance Decomposition Filtered'; vd_title = 'Variance Decomposition Filtered';
else else