Consolidate the routines for loading JSON files, now that jsondecode is always available
parent
1d5a442fe5
commit
701afd2c7c
|
@ -1,45 +0,0 @@
|
||||||
function o = convertjsondecode(o)
|
|
||||||
|
|
||||||
% Converts the output of jsondecode to be consistent with the output of loadjson.
|
|
||||||
%
|
|
||||||
% INPUTS
|
|
||||||
% - o [struct] Output of jsondecode.
|
|
||||||
%
|
|
||||||
% OUTPUTS
|
|
||||||
% - o [struct] Converted output of jsondecode.
|
|
||||||
%
|
|
||||||
% REMARKS
|
|
||||||
% The fields returned by the loadjson are systematically cell
|
|
||||||
% array, while jsondecode returns structure arrays if
|
|
||||||
% possible. This routine reorganize the data consistently with
|
|
||||||
% loadjson.
|
|
||||||
|
|
||||||
% Copyright © 2020 Dynare Team
|
|
||||||
%
|
|
||||||
% This file is part of Dynare.
|
|
||||||
%
|
|
||||||
% Dynare is free software: you can redistribute it and/or modify
|
|
||||||
% it under the terms of the GNU General Public License as published by
|
|
||||||
% the Free Software Foundation, either version 3 of the License, or
|
|
||||||
% (at your option) any later version.
|
|
||||||
%
|
|
||||||
% Dynare is distributed in the hope that it will be useful,
|
|
||||||
% but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
% GNU General Public License for more details.
|
|
||||||
%
|
|
||||||
% You should have received a copy of the GNU General Public License
|
|
||||||
% along with Dynare. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
fnames = fieldnames(o);
|
|
||||||
|
|
||||||
for i=1:length(fnames)
|
|
||||||
tmp = o.(fnames{i});
|
|
||||||
if isstruct(tmp) && length(tmp)>1
|
|
||||||
TMP = cell(length(tmp), 1);
|
|
||||||
for j=1:length(tmp)
|
|
||||||
TMP{j} = tmp(j);
|
|
||||||
end
|
|
||||||
o.(fnames{i}) = TMP;
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -1,15 +1,17 @@
|
||||||
function o = loadjson_(jsonfilename)
|
function o = loadjson_(jsonfilename)
|
||||||
|
|
||||||
% Reads a json file using jsondecode builtin.
|
% Reads a JSON file using jsondecode builtin.
|
||||||
|
%
|
||||||
|
% Returns the output in a format consistent with the output of the JSONlab
|
||||||
|
% toolbox, that we used to rely on (jsondecode builtin was introduced in MATLAB
|
||||||
|
% R2016b and in Octave 7). Now we no longer depend on JSONlab, but for
|
||||||
|
% historical reasons we still use its format.
|
||||||
%
|
%
|
||||||
% INPUTS
|
% INPUTS
|
||||||
% - jsonfilename [char] 1×n char array, name of the JSON file.
|
% - jsonfilename [char] 1×n char array, name of the JSON file.
|
||||||
%
|
%
|
||||||
% OUTPUTS
|
% OUTPUTS
|
||||||
% - o [struct] content of the JSON file.
|
% - o [struct] content of the JSON file.
|
||||||
%
|
|
||||||
% REMARKS
|
|
||||||
% jsondecode builtin was introduced in MATLAB R2016b and in Octave 7.
|
|
||||||
|
|
||||||
% Copyright © 2020-2023 Dynare Team
|
% Copyright © 2020-2023 Dynare Team
|
||||||
%
|
%
|
||||||
|
@ -30,5 +32,19 @@ function o = loadjson_(jsonfilename)
|
||||||
|
|
||||||
json = fileread(jsonfilename);
|
json = fileread(jsonfilename);
|
||||||
|
|
||||||
o = jsondecode(json); clear('json');
|
o = jsondecode(json);
|
||||||
o = convertjsondecode(o);
|
|
||||||
|
clear json
|
||||||
|
|
||||||
|
fnames = fieldnames(o);
|
||||||
|
|
||||||
|
for i=1:length(fnames)
|
||||||
|
tmp = o.(fnames{i});
|
||||||
|
if isstruct(tmp) && length(tmp)>1
|
||||||
|
TMP = cell(length(tmp), 1);
|
||||||
|
for j=1:length(tmp)
|
||||||
|
TMP{j} = tmp(j);
|
||||||
|
end
|
||||||
|
o.(fnames{i}) = TMP;
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
Loading…
Reference in New Issue