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

submodule update: reporting (remove strjoin)

time-shift
Houtan Bastani 2016-02-24 14:41:22 +01:00
parent 458cfc4fc6
commit c386be3fb7
4 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
license.txt
View File

@ -98,11 +98,6 @@ Copyright: 1995-2007 Kurt Hornik
2008-2009 Dynare Team
License: GPL-3+
Files: matlab/missing/strjoin/strjoin.m
Copyright: 2007 Muthiah Annamalai <muthiah.annamalai@uta.edu>
2013 Dynare Team
License: GPL-3+
Files: matlab/missing/corrcoef/corrcoef.m matlab/missing/corrcoef/sumskipnan.m
matlab/missing/corrcoef/flag_implicit_skip_nan.m matlab/missing/corrcoef/tcdf.m
Copyright: 2000-2005,2008,2009,2011 by Alois Schloegl <alois.schloegl@gmail.com>

8
matlab/dynare_config.m
View File

@ -15,7 +15,7 @@ function dynareroot = dynare_config(path_to_dynare,verbose)
% SPECIAL REQUIREMENTS
% none
% Copyright (C) 2001-2015 Dynare Team
% Copyright (C) 2001-2016 Dynare Team
%
% This file is part of Dynare.
%
@ -100,12 +100,6 @@ if isoctave && ~user_has_octave_forge_package('nan')
addpath([dynareroot '/missing/corrcoef'])
end
% strjoin is missing in older versions of MATLAB and in Octave < 3.8
if (isoctave && octave_ver_less_than('3.8')) || ...
(~isoctave && matlab_ver_less_than('8.1'))
addpath([dynareroot '/missing/strjoin'])
end
% nanmean is in Octave Forge Statistics package and in MATLAB Statistics
% toolbox
if (isoctave && ~user_has_octave_forge_package('statistics')) ...

36
matlab/missing/strjoin/strjoin.m
View File

@ -1,36 +0,0 @@
function rval = strjoin (c, varargin)
%function rval = strjoin (c, varargin)
% Copyright (C) 2007 Muthiah Annamalai <muthiah.annamalai@uta.edu>
% Copyright (C) 2013 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/>.
assert(iscellstr(c), 'strjoin: first argument is a cell array of strings');
assert(nargin <= 2, 'strjoin: takes one or two arguments');
delimiter = ' ';
if nargin == 2
delimiter = varargin{1};
assert(ischar(delimiter), 'strjoin: second argument must be a char');
end
rval = '';
L = length(c);
for idx = 1:(L-1)
rval = [rval c{idx} delimiter];
end
rval = [rval c{L}];
end

2
matlab/modules/reporting

@ -1 +1 @@
Subproject commit 98941c39569bc009a111df467f6df4a1841a8055
Subproject commit 19ddc69ca430f3fa6afdb5588ebda7baced29302