Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dseries
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Sébastien Villemot
dseries
Commits
74167124
Verified
Commit
74167124
authored
Dec 11, 2018
by
Stéphane Adjemian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Closes #16.
parent
677c1e18
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
145 deletions
+58
-145
src/read/load_m_file_data.m
src/read/load_m_file_data.m
+45
-136
src/read/load_mat_file_data.m
src/read/load_mat_file_data.m
+13
-9
No files found.
src/read/load_m_file_data.m
View file @
74167124
...
...
@@ -16,7 +16,7 @@ function [freq, init, data, varlist, tex, ops, tags] = load_m_file_data(file) %
% be a scalar integer and INIT__ a string like '1938M11', '1945Q3', '1973W3' or '2009A'. If these variables are not specified
% default values for freq and init are 1 and dates(1,1).
% Copyright (C) 2012-201
7
Dynare Team
% Copyright (C) 2012-201
8
Dynare Team
%
% This file is part of Dynare.
%
...
...
@@ -40,146 +40,55 @@ else
run
(
basename
);
end
if
exist
(
'INIT__'
,
'var'
)
if
isdate
(
INIT__
)
init
=
dates
(
INIT__
);
clear
(
'INIT__'
)
else
error
(
'load_m_file_data: INIT__ cannot be interpreted as a date.'
)
end
else
init
=
dates
(
1
,
1
);
% Default initial date is year one.
end
if
exist
(
'FREQ__'
,
'var'
)
freq
=
FREQ__
;
clear
(
'FREQ__'
);
else
freq
=
init
.
freq
;
end
clear
file
basename
;
if
~
isequal
(
freq
,
init
.
freq
)
error
(
'load_m_file_data: INIT__ and FREQ__ are not consistent!'
)
end
save
tmp__dataSet__
;
if
exist
(
'NAMES__'
,
'var'
)
varlist0
=
NAMES__
;
clear
(
'NAMES__'
);
else
varlist0
=
[];
list_of_variables
=
[];
end
[
freq
,
init
,
data
,
varlist
,
tex
,
ops
,
tags
]
=
load_mat_file_data
(
'tmp__dataSet__.mat'
);
if
exist
(
'TEX__'
,
'var'
)
tex
=
TEX__
;
clear
(
'TEX__'
);
else
tex
=
[];
end
delete
tmp__dataSet__
.
mat
;
if
exist
(
'OPS__'
,
'var'
)
ops
=
OPS__
;
clear
(
'OPS__'
);
else
ops
=
[];
end
return
if
exist
(
'TAGS__'
,
'var'
)
tags
=
TAGS__
;
clear
(
'TAGS__'
);
else
tags
=
struct
();
end
if
isempty
(
varlist0
)
list_of_variables
=
whos
();
end
data
=
[];
varlist
=
{};
if
isempty
(
varlist0
)
for
current_variable_index
=
1
:
length
(
list_of_variables
)
if
isequal
(
list_of_variables
(
current_variable_index
)
.
name
,
'freq'
)
...
||
isequal
(
list_of_variables
(
current_variable_index
)
.
name
,
'time'
)
...
||
isequal
(
list_of_variables
(
current_variable_index
)
.
name
,
'data'
)
...
||
isequal
(
list_of_variables
(
current_variable_index
)
.
name
,
'varlist'
)
...
||
isequal
(
list_of_variables
(
current_variable_index
)
.
name
,
'varlist0'
)
...
||
isequal
(
list_of_variables
(
current_variable_index
)
.
name
,
'list_of_variables'
)
...
||
isequal
(
list_of_variables
(
current_variable_index
)
.
name
,
'tex'
)
...
||
isequal
(
list_of_variables
(
current_variable_index
)
.
name
,
'ops'
)
...
||
isequal
(
list_of_variables
(
current_variable_index
)
.
name
,
'tags'
)
...
continue
end
if
list_of_variables
(
current_variable_index
)
.
global
||
list_of_variables
(
current_variable_index
)
.
persistent
% A variable cannot be a global or persistent variable.
continue
end
if
list_of_variables
(
current_variable_index
)
.
complex
||
~
strcmp
(
list_of_variables
(
current_variable_index
)
.
class
,
'double'
)
% A variable cannot be complex.
continue
end
if
list_of_variables
(
current_variable_index
)
.
size
(
2
)
>
1
% A variable must be passed as a column vector.
continue
end
try
eval
([
'data = [data, '
list_of_variables
(
current_variable_index
)
.
name
'];'
])
eval
([
'varlist = {varlist{:},
''
'
list_of_variables
(
current_variable_index
)
.
name
'
''
};'
])
catch
error
([
'load_m_file:: All the vectors (variables) in '
inputname
(
1
)
' must have the same number of rows (observations)!'
])
end
end
else
for
current_variable_index
=
1
:
length
(
varlist0
)
eval
([
'data = [data, '
varlist0
{
current_variable_index
}
'];'
])
end
varlist
=
varlist0
;
end
%@test:1
% Create a data m-file
fid
=
fopen
(
'data_m_file.m'
,
'w'
);
fprintf
(
fid
,
'FREQ__ = 4;'
);
fprintf
(
fid
,
'INIT__ =
''
1938Q4
''
;'
);
fprintf
(
fid
,
'NAMES__ = {
''
azert
''
;
''
yuiop
''
};'
);
fprintf
(
fid
,
'TEX__ = {
''
azert
''
;
''
yuiop
''
};'
);
fprintf
(
fid
,
'OPS__ = {
''
method1(azert)
''
;
''
method2(yuiop)
''
};'
);
fprintf
(
fid
,
'TAGS__ = struct();'
);
fprintf
(
fid
,
'TAGS__.type = cell(2, 1);'
);
fprintf
(
fid
,
'TAGS__.type(1) = {
''
Haut
''
};'
);
fprintf
(
fid
,
'TAGS__.type(2) = {
''
Bas
''
};'
);
fprintf
(
fid
,
'azert = [1; 2; 3; 4; 5];'
);
fprintf
(
fid
,
'yuiop = [2; 3; 4; 5; 6];'
);
fclose
(
fid
);
if
isempty
(
ops
)
ops
=
cell
(
length
(
varlist
),
1
);
end
% Try to read the data m-file
try
datafile
=
'data_m_file.m'
;
[
freq
,
init
,
data
,
varlist
,
tex
,
ops
,
tags
]
=
load_m_file_data
(
datafile
);
delete
(
'data_m_file.m'
);
t
(
1
)
=
1
;
catch
exception
t
(
1
)
=
0
;
T
=
all
(
t
);
LOG
=
getReport
(
exception
,
'extended'
);
return
end
%@test:1
%$ % Create a data m-file
%$ fid = fopen('data_m_file.m','w');
%$ fprintf(fid,'FREQ__ = 4;');
%$ fprintf(fid,'INIT__ = ''1938Q4'';');
%$ fprintf(fid,'NAMES__ = {''azert'';''yuiop''};');
%$ fprintf(fid,'TEX__ = {''azert'';''yuiop''};');
%$ fprintf(fid,'OPS__ = {''method1(azert)'';''method2(yuiop)''};');
%$ fprintf(fid,'TAGS__ = struct();');
%$ fprintf(fid,'TAGS__.type = cell(2, 1);');
%$ fprintf(fid,'TAGS__.type(1) = {''Haut''};');
%$ fprintf(fid,'TAGS__.type(2) = {''Bas''};');
%$ fprintf(fid,'azert = [1; 2; 3; 4; 5];');
%$ fprintf(fid,'yuiop = [2; 3; 4; 5; 6];');
%$ fclose(fid);
%$
%$ % Try to read the data m-file
%$ try
%$ datafile = 'data_m_file.m';
%$ [freq, init, data, varlist, tex, ops, tags] = load_m_file_data(datafile);
%$ delete('data_m_file.m');
%$ t(1) = 1;
%$ catch exception
%$ t(1) = 0;
%$ T = all(t);
%$ LOG = getReport(exception,'extended');
%$ return
%$ end
%$
%$ % Check the results.
%$ t(2) = dassert(freq,4);
%$ t(3) = isdates(init);
%$ t(4) = dassert(init.freq,4);
%$ t(5) = dassert(init.time,[1938 4]);
%$ t(6) = dassert(varlist,{'azert';'yuiop'});
%$ t(7) = dassert(tex,{'azert';'yuiop'});
%$ t(8) = dassert(ops,{'method1(azert)';'method2(yuiop)'});
%$ t(9) = dassert(tags.type,{'Haut';'Bas'});
%$ t(10) = dassert(data(:,1),[1;2;3;4;5]);
%$ t(11) = dassert(data(:,2),[2;3;4;5;6]);
%$ T = all(t);
% Check the results.
t
(
2
)
=
dassert
(
freq
,
4
);
t
(
3
)
=
isdates
(
init
);
t
(
4
)
=
dassert
(
init
.
freq
,
4
);
t
(
5
)
=
dassert
(
init
.
time
,[
1938
4
]);
t
(
6
)
=
dassert
(
varlist
,{
'azert'
;
'yuiop'
});
t
(
7
)
=
dassert
(
tex
,{
'azert'
;
'yuiop'
});
t
(
8
)
=
dassert
(
ops
,{
'method1(azert)'
;
'method2(yuiop)'
});
t
(
9
)
=
dassert
(
tags
.
type
,{
'Haut'
;
'Bas'
});
t
(
10
)
=
dassert
(
data
(:,
1
),[
1
;
2
;
3
;
4
;
5
]);
t
(
11
)
=
dassert
(
data
(:,
2
),[
2
;
3
;
4
;
5
;
6
]);
T
=
all
(
t
);
%@eof:1
src/read/load_mat_file_data.m
View file @
74167124
...
...
@@ -3,20 +3,20 @@ function [freq, init, data, varlist, tex, ops, tags] = load_mat_file_data(file)
% Loads data in a matlab/octave mat-file.
%
% INPUTS
%
o
file string, name of the matlab/octave mat file (with path)
%
-
file string, name of the matlab/octave mat file (with path)
%
% OUTPUTS
%
o
freq integer scalar equal to 1, 4, 12 or 52 (for annual, quaterly, monthly or weekly frequencies).
%
o
init dates object, initial date in the dataset.
%
o
data matrix of doubles, the data.
%
o
varlist cell of strings, names of the variables.
%
-
freq integer scalar equal to 1, 4, 12 or 52 (for annual, quaterly, monthly or weekly frequencies).
%
-
init dates object, initial date in the dataset.
%
-
data matrix of doubles, the data.
%
-
varlist cell of strings, names of the variables.
%
% REMARKS
% The frequency and initial date can be specified with variables FREQ__ and INIT__ in the matlab/octave binary file. FREQ__ must
% be a scalar integer and INIT__ a string like '1938M11', '1945Q3', '1973W3' or '2009A'. If these variables are not specified
% default values for freq and init are 1 and dates(1,1).
% Copyright (C) 2012-201
7
Dynare Team
% Copyright (C) 2012-201
8
Dynare Team
%
% This file is part of Dynare.
%
...
...
@@ -92,10 +92,14 @@ end
for
i
=
1
:
length
(
varlist
)
try
tmp
=
getfield
(
datafile
,
varlist
{
i
});
data
=
[
data
,
tmp
(:)];
tmp
=
datafile
.
(
varlist
{
i
});
if
isvector
(
tmp
)
data
=
[
data
,
tmp
(:)];
else
error
(
'load_mat_file:: All the variables must be vectors (%s is not a vector)!'
,
varlist
{
i
})
end
catch
error
(
[
'load_mat_file:: All the vectors (variables) in '
inputname
(
1
)
' must have the same number of rows (observations)!'
]
)
error
(
'load_mat_file:: All the vectors (variables) in %s must have the same number of rows (observations)!'
,
inputname
(
1
)
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment