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

Merge branch 'mod_comp' of git.dynare.org:JohannesPfeifer/dynare 

Ref. !2157
kalman-mex
Sébastien Villemot 2023-08-30 11:47:22 +02:00
parent 01011cb849 e70b2fdfcf
commit 0d21927381
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matlab/model_comparison.m
View File

@ -80,7 +80,7 @@ for i=1:NumberOfModels
if i==iname
mstruct.oo_ = oo;
else
if strcmpi(ModelNames{i}(end-3:end),'.mod') || strcmpi(ModelNames{i}(end-3:end),'.dyn')
if length(ModelNames{i})>3 && (strcmpi(ModelNames{i}(end-3:end),'.mod') || strcmpi(ModelNames{i}(end-3:end),'.dyn'))
mstruct = load([ModelNames{i}(1:end-4) filesep 'Output' ModelNames{i}(1:end-4) '_results.mat' ],'oo_');
else
mstruct = load([ModelNames{i} filesep 'Output' filesep ModelNames{i} '_results.mat' ],'oo_');

6
matlab/utilities/dataset/makedataset.m
View File

@ -118,13 +118,13 @@ end
% Load the data in a dseries object.
if ~isempty(datafile)
if ~( newdatainterface==0 && (strcmp(datafile(end-1:end),'.m')|| strcmp(datafile(end-3:end),'.mat')))
if ~(newdatainterface==0 && ((length(datafile)>2 && strcmp(datafile(end-1:end),'.m')) || (length(datafile)>4 && strcmp(datafile(end-3:end),'.mat'))))
DynareDataset = dseries(datafile);
else
if strcmp(datafile(end-1:end),'.m')
if length(datafile)>2 && strcmp(datafile(end-1:end),'.m')
% Load an m file with the old interface.
DynareDataset = load_m_file_data_legacy(datafile, DynareOptions.varobs);
elseif strcmp(datafile(end-3:end),'.mat')
elseif length(datafile)>4 && strcmp(datafile(end-3:end),'.mat')
% Load a mat file with the old interface.
DynareDataset = load_mat_file_data_legacy(datafile, DynareOptions.varobs);
end