# HG changeset patch # User Rik # Date 1326135113 28800 # Node ID 6b79540a0e5280d09963b9dc5476c0ad1d563645 # Parent fbfaafe0471b8a3f990a38f327d664cc2656f035 maint: Remove deprecated functions sphcat and spvcat before 3.6.0 release. * module.mk, sphcat.m, spvcat.m: Remove deprecated functions before 3.6.0 release. diff -r fbfaafe0471b -r 6b79540a0e52 scripts/deprecated/module.mk --- a/scripts/deprecated/module.mk Mon Jan 09 10:05:18 2012 -0800 +++ b/scripts/deprecated/module.mk Mon Jan 09 10:51:53 2012 -0800 @@ -27,8 +27,6 @@ deprecated/saveimage.m \ deprecated/setstr.m \ deprecated/shell_cmd.m \ - deprecated/sphcat.m \ - deprecated/spvcat.m \ deprecated/strerror.m \ deprecated/studentize.m \ deprecated/sylvester_matrix.m \ diff -r fbfaafe0471b -r 6b79540a0e52 scripts/deprecated/sphcat.m --- a/scripts/deprecated/sphcat.m Mon Jan 09 10:05:18 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -## Copyright (C) 2004-2012 David Bateman and Andy Adler -## -## This file is part of Octave. -## -## Octave 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. -## -## Octave 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 Octave; see the file COPYING. If not, see -## . - -## -*- texinfo -*- -## @deftypefn {Function File} {@var{y} =} sphcat (@var{a1}, @var{a2}, @dots{}, @var{aN}) -## Return the horizontal concatenation of sparse matrices. This function -## is obselete and @code{horzcat} should be used instead. -## @seealso {horzcat, spvcat, vertcat, cat} -## @end deftypefn - -function y = sphcat (varargin) - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "sphcat is obsolete and will be removed from a future version of Octave; please use horzcat instead"); - endif - - y = horzcat (varargin{:}); -endfunction diff -r fbfaafe0471b -r 6b79540a0e52 scripts/deprecated/spvcat.m --- a/scripts/deprecated/spvcat.m Mon Jan 09 10:05:18 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -## Copyright (C) 2004-2012 David Bateman and Andy Adler -## -## This file is part of Octave. -## -## Octave 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. -## -## Octave 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 Octave; see the file COPYING. If not, see -## . - -## -*- texinfo -*- -## @deftypefn {Function File} {@var{y} =} spvcat (@var{a1}, @var{a2}, @dots{}, @var{aN}) -## Return the vertical concatenation of sparse matrices. This function -## is obselete and @code{vertcat} should be used instead. -## @seealso{vertcat, sphcat, horzcat, cat} -## @end deftypefn - -function y = spvcat (varargin) - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "spvcat is obsolete and will be removed from a future version of Octave; please use vertcat instead"); - endif - - y = vertcat (varargin{:}); -endfunction