Mercurial > octave-nkf

changeset 10881:22cd681a4e28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate values.m
author Rik <octave@nomad.inbox5.com>
date Tue, 10 Aug 2010 14:09:31 -0700
parents 92c3e8068f28
children 055b95863699
files scripts/ChangeLog scripts/deprecated/module.mk scripts/deprecated/values.m scripts/statistics/base/module.mk scripts/statistics/base/values.m
diffstat 5 files changed, 68 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Tue Aug 10 12:52:52 2010 +0200
+++ b/scripts/ChangeLog	Tue Aug 10 14:09:31 2010 -0700
@@ -1,3 +1,8 @@
+2010-08-10  Rik <octave@nomad.inbox5.com>
+
+	* statistics/base/module.mk, deprecated/module.mk,
+	statistics/base/values.m, deprecated/values.m: Deprecate values.m
+	  
 2010-08-08  Rik <octave@nomad.inbox5.com>
 
 	* miscellaneous/unimplemented.m: Add newlines to format output for
--- a/scripts/deprecated/module.mk	Tue Aug 10 12:52:52 2010 +0200
+++ b/scripts/deprecated/module.mk	Tue Aug 10 14:09:31 2010 -0700
@@ -39,6 +39,7 @@
   deprecated/str2mat.m \
   deprecated/unmark_command.m \
   deprecated/unmark_rawcommand.m \
+  deprecated/values.m \
   deprecated/weibcdf.m \
   deprecated/weibinv.m \
   deprecated/weibpdf.m \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/deprecated/values.m	Tue Aug 10 14:09:31 2010 -0700
@@ -0,0 +1,62 @@
+## Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2005, 2006,
+##               2007, 2009 Kurt Hornik
+##
+## 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
+## <http://www.gnu.org/licenses/>.
+
+## -*- texinfo -*-
+## @deftypefn {Function File} {} values (@var{x})
+## Return the different values in a column vector, arranged in ascending
+## order.
+##
+## As an example, @code{values([1, 2, 3, 1])} returns the vector
+## @code{[1, 2, 3]}.
+## @end deftypefn
+
+## Author: KH <Kurt.Hornik@wu-wien.ac.at>
+## Description: Extract unique elements
+
+## Deprecated in version 3.4
+
+function v = values (x)
+
+  persistent warned = false;
+  if (! warned)
+    warned = true;
+    warning ("Octave:deprecated-function",
+             "values is obsolete and will be removed from a future version of Octave; please use unique instead");
+  endif
+
+  if (nargin != 1)
+    print_usage ();
+  endif
+
+  if (! (isvector (x)))
+    error ("values: x must be a vector");
+  endif
+
+  i = any (isnan (x));
+  ## HACK!
+  x = x(find(!isnan (x)));
+  n = length (x);
+  x = reshape (x, n, 1);
+  s = sort (x);
+  v = s([1; (find (s(2:n) > s(1:n-1)) + 1)]);
+  if (i)
+    v = [v; NaN];
+  endif
+
+endfunction
--- a/scripts/statistics/base/module.mk	Tue Aug 10 12:52:52 2010 +0200
+++ b/scripts/statistics/base/module.mk	Tue Aug 10 14:09:31 2010 -0700
@@ -34,7 +34,6 @@
   statistics/base/std.m \
   statistics/base/studentize.m \
   statistics/base/table.m \
-  statistics/base/values.m \
   statistics/base/var.m
 
 FCN_FILES += $(statistics_base_FCN_FILES)
--- a/scripts/statistics/base/values.m	Tue Aug 10 12:52:52 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-## Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2005, 2006,
-##               2007, 2009 Kurt Hornik
-##
-## 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
-## <http://www.gnu.org/licenses/>.
-
-## -*- texinfo -*-
-## @deftypefn {Function File} {} values (@var{x})
-## Return the different values in a column vector, arranged in ascending
-## order.
-##
-## As an example, @code{values([1, 2, 3, 1])} returns the vector
-## @code{[1, 2, 3]}.
-## @end deftypefn
-
-## Author: KH <Kurt.Hornik@wu-wien.ac.at>
-## Description: Extract unique elements
-
-function v = values (x)
-
-  if (nargin != 1)
-    print_usage ();
-  endif
-
-  if (! (isvector (x)))
-    error ("values: x must be a vector");
-  endif
-
-  i = any (isnan (x));
-  ## HACK!
-  x = x(find(!isnan (x)));
-  n = length (x);
-  x = reshape (x, n, 1);
-  s = sort (x);
-  v = s([1; (find (s(2:n) > s(1:n-1)) + 1)]);
-  if (i)
-    v = [v; NaN];
-  endif
-
-endfunction