Bump minimal version of MATLAB to R2014a

parent 59739c38
Pipeline #3478 passed with stage
in 1 minute and 22 seconds
......@@ -13,7 +13,7 @@ test_matlab:
test_old_matlab:
stage: test
variables:
MATLAB: /usr/local/MATLAB/R2009b/bin/matlab
MATLAB: /usr/local/MATLAB/R2014a/bin/matlab
script:
- make check-matlab
......
......@@ -9,7 +9,7 @@ function q = intersect(o, p) % --*-- Unitary tests --*--
% OUTPUTS
% - q [dates] All the common elements in o and p.
% Copyright (C) 2013-2017 Dynare Team
% Copyright (C) 2013-2020 Dynare Team
%
% This code is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
......@@ -38,7 +38,7 @@ if ~isequal(o.freq,p.freq)
return
end
if isoctave || matlab_ver_less_than('8.1.0')
if isoctave
time = intersect(o.time,p.time,'rows');
else
time = intersect(o.time,p.time,'rows','legacy');
......
......@@ -15,7 +15,7 @@ function o = remove_(o, p) % --*-- Unitary tests --*--
%
% See also pop, setdiff
% Copyright (C) 2013-2017 Dynare Team
% Copyright (C) 2013-2020 Dynare Team
%
% This code is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
......@@ -42,7 +42,7 @@ if ~isequal(o.freq,p.freq)
error('dates:remove','Inputs must have common frequency!')
end
if isoctave || matlab_ver_less_than('8.1.0')
if isoctave
time = setdiff(o.time,p.time,'rows');
else
time = setdiff(o.time,p.time,'rows','legacy');
......@@ -140,4 +140,4 @@ o.time = time;
%$ end
%$
%$ T = all(t);
%@eof:5
\ No newline at end of file
%@eof:5
......@@ -12,7 +12,7 @@ function [q, io] = setdiff(o,p) % --*-- Unitary tests --*--
%
% See also pop, remove.
% Copyright (C) 2013-2017 Dynare Team
% Copyright (C) 2013-2020 Dynare Team
%
% This code is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
......@@ -48,7 +48,7 @@ if isequal(o.length(),p.length()) && isequal(o, p)
return
end
if isoctave || matlab_ver_less_than('8.1.0')
if isoctave
if nargout<2
time = setdiff(o.time,p.time,'rows');
else
......
......@@ -11,7 +11,7 @@ function o = unique_(o) % --*-- Unitary tests --*--
% REMARKS
% 1. Only the last occurence of a date is kept.
% Copyright (C) 2013-2017 Dynare Team
% Copyright (C) 2013-2020 Dynare Team
%
% This code is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
......@@ -30,7 +30,7 @@ if o.ndat()<=1
return
end
if isoctave || matlab_ver_less_than('8.1.0')
if isoctave
[tmp, id, jd] = unique(o.time,'rows');
else
[tmp, id, jd] = unique(o.time,'rows','legacy');
......@@ -94,4 +94,4 @@ o.time = o.time(sort(id),:);
%$ t(3) = dassert(d.freq,e.freq);
%$ end
%$ T = all(t);
%@eof:1
\ No newline at end of file
%@eof:1
......@@ -2,7 +2,7 @@ classdef dseries<handle % --*-- Unitary tests --*--
% Class for time series.
% Copyright (C) 2013-2019 Dynare Team
% Copyright (C) 2013-2020 Dynare Team
%
% This code is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
......@@ -66,7 +66,7 @@ methods
elseif ischar(varargin{1})
[init, o.data, o.name, o.tex, o.ops, o.tags] = load_data(varargin{1});
o.dates = init:init+(nobs(o)-1);
elseif ~isoctave() && ~matlab_ver_less_than('8.2') && istable(varargin{1})
elseif ~isoctave() && istable(varargin{1})
% It is assumed that the dates are in the first column.
o.name = varargin{1}.Properties.VariableNames(2:end);
o.tex = name2tex(o.name);
......
......@@ -90,26 +90,6 @@ if ~exist('one_sided_hp_filter','file')
p{end+1} = 'utilities/missing/one_sided_hp_filter';
end
if ~exist('OCTAVE_VERSION', 'builtin') && ~exist('ismatrix','builtin')
p{end+1} = 'utilities/missing/ismatrix';
end
if ~exist('OCTAVE_VERSION', 'builtin') && ~exist('isrow','builtin')
p{end+1} = 'utilities/missing/isrow';
end
if ~exist('OCTAVE_VERSION', 'builtin') && ~exist('iscolumn','builtin')
p{end+1} = 'utilities/missing/iscolumn';
end
if ~exist('OCTAVE_VERSION', 'builtin') && ~exist('strsplit','file')
p{end+1} = 'utilities/missing/strsplit';
end
if ~exist('OCTAVE_VERSION', 'builtin') && ~exist('strjoin','file')
p{end+1} = 'utilities/missing/strjoin';
end
if ~exist('nanmean','file')
p{end+1} = 'utilities/missing/nanmean';
end
......
function r = iscolumn(V)
% Copyright (C) 2018 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 <http://www.gnu.org/licenses/>.
sz = size(V);
r = (length(sz) == 2) && (sz(2) == 1);
function r = ismatrix(V)
% Copyright (C) 2018 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 <http://www.gnu.org/licenses/>.
r = (ndims(V) == 2);
function r = isrow(V)
% Copyright (C) 2018 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 <http://www.gnu.org/licenses/>.
sz = size(V);
r = (length(sz) == 2) && (sz(1) == 1);
function rval = strjoin (cstr, delimiter)
% Adapted from Octave's implementation of strjoin
%
% Limitation: escaped characters (e.g. '\n') in delimiters will not be
% interpreted as the characters they represent.
% Copyright (C) 2013-2019 Ben Abbott
% Copyright (C) 2007 Muthiah Annamalai
% Copyright (C) 2019 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 <http://www.gnu.org/licenses/>.
if nargin == 1
delimiter = ' ';
elseif nargin < 1 || nargin > 2
error('strjoin: must have either one or two arguments')
end
if ~(iscellstr(cstr) && (ischar(delimiter) || iscellstr(delimiter)))
error('strjoin: first argument must be a cell array, second array either a char array or a cell array')
end
if numel(cstr) == 1
rval = cstr{1};
return;
end
if ischar(delimiter)
% There is no equivalent to do_string_escapes in MATLAB
%delimiter = do_string_escapes(delimiter);
delimiter = {delimiter};
end
num = numel(cstr);
if numel(delimiter) == 1 && num > 1
delimiter = repmat(delimiter, 1, num);
delimiter(end) = {''};
elseif num > 0 && numel(delimiter) ~= num - 1
error('strjoin: the number of delimiters does not match the number of strings');
else
delimiter(end+1) = {''};
end
if num == 0
rval = '';
else
tmp = [cstr(:).'; delimiter(:).'];
rval = [tmp{:}];
end
function l = ischarint(x)
% Returns true if and only if char x represents an integer.
% Copyright © 2018 DynareTeam
%
% 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 <http://www.gnu.org/licenses/>.
s = warning;
warning off;
l = isint(str2double(x));
warning(s);
\ No newline at end of file
function l = ischarnum(x)
% Returns true if and only if char x represents a real number.
% Copyright © 2018 DynareTeam
%
% 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 <http://www.gnu.org/licenses/>.
l = false;
s = warning;
warning off;
number = str2double(x);
warning(s);
if ~isempty(number)
if isreal(number)
l = true;
end
end
\ No newline at end of file
function tok = strsplit(str, delimiters)
% Splits a string into multiple terms.
%
% INPUTS
% - str [char] String to be splitted.
% - delimiters [char, cell(char)] Delimiters.
%
% OUTPUTS
% - tok [cell(char)] Terms.
% Copyright © 2018 DynareTeam
%
% 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 <http://www.gnu.org/licenses/>.
remove_empty = true;
remove_numbers = false;
% Check first input arguments
assert(ischar(str) && ndims(str)==2 && size(str,1)<=1, 'The first arugment has to be a row char array!');
% Set default value for second input arguments
if nargin<2
delimiters = {' '};
end
% If second input argument is a char transform it into a sigleton cell of char
if nargin>1
if ischar(delimiters)
assert(ndims(delimiters)==2 && size(delimiters,1)==1, 'The second input argument has to be be a char string!');
delimiters = {delimiters};
end
end
% Check that `delimiters` is a one dimensional cell
assert(ndim(delimiters)<=1, 'The second input argument has to be a one dimensional cell array!')
% Check that `delimiters` is a cell of row char arrays
assert(all(cellfun(@ischar, delimiters)) && all(cellfun(@rows, delimiters)==1), 'The second input argument has to be a cell of row char arrays!')
% If space is one of the delimiters obtain the index in `delimiters`
idspace = strmatch(' ', delimiters);
% Get the number of delimiters
n = length(delimiters);
% Remove unnecessary spaces
delimiters(setdiff(1:n, idspace)) = strtrim(delimiters(setdiff(1:n, idspace)));
% Join all the delimiters (strjoin is not available with matlab version less than R2013a)
if n>1
delimiter = '';
for i=1:n
if isspace(delimiters{i})
delimiter = horzcat(delimiter, '\s');
else
delimiter = horzcat(delimiter, delimiters{i});
end
delimiter = horzcat(delimiter,'|');
end
delimiter = horzcat(delimiter, '\W');
else
delimiter = delimiters{1};
end
% Get tokens
tok = regexp(str, delimiter, 'split');
if remove_empty
% Remove empty tokens
tok = tok(find(~cellfun(@isempty, tok)));
end
if remove_numbers
% Remove numbers
tok = tok(find(~cellfun(@ischarnum, tok)));
end
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment