# HG changeset patch
# User jwe
# Date 1127942175 0
# Node ID 04fa51cb7e9083d8b03eb442159c70ea9484ac2b
# Parent  af90c01ff4679fe9f028288c95588aafed94db07
[project @ 2005-09-28 21:14:47 by jwe]

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-28  John W. Eaton  <jwe@octave.org>
+
+	* statistics/base/unidrnd.m: New function.
+
 2005-09-27  John W. Eaton  <jwe@octave.org>
 
 	* miscellaneous/dir.m: Filename never includes directory part.
diff --git a/scripts/statistics/base/unidrnd.m b/scripts/statistics/base/unidrnd.m
new file mode 100644
--- /dev/null
+++ b/scripts/statistics/base/unidrnd.m
@@ -0,0 +1,61 @@
+## Copyright (C) 2005 John W. Eaton
+##
+## 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 2, 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, write to the Free
+## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
+
+## -*- texinfo -*-
+## @deftypefn {Function File} {} unidrnd (@var{mx});
+## @deftypefn {Function File} {} unidrnd (@var{mx}, @var{v});
+## @deftypefn {Function File} {} unidrnd (@var{mx}, @var{m}, @var{n}, @dots{});
+## Return random values from discrete uniform distribution, with maximum
+## value(s) given by the integer @var{mx}, which may be a scalar or
+## multidimensional array.
+##
+## If @var{mx} is a scalar, the size of the result is specified by
+## the vector @var{v}, or by the optional arguments @var{m}, @var{n},
+## @dots{}.  Otherwise, the size of the result is the same as the size
+## of @var{mx}.
+## @end deftypefn
+
+## Author: jwe
+
+function retval = unidrnd (n, varargin)
+  if (nargin == 1)
+    dims = size (n);
+  elseif (nargin == 2)
+    if (rows (varargin{1}) == 1 && columns (varargin{1} > 1))
+      dims = varargin{1};
+    else
+      error ("unidrnd: invalid dimension vector");
+    endif
+  elseif (nargin > 2)
+    for i = 1:nargin-1
+      if (! isscalar (varargin{i}))
+	error ("unidrnd: expecting scalar dimensions");
+      endif
+    endfor
+    dims = [varargin{:}];
+  else
+    error ("unidrnd (n, ...)");
+  endif
+  if (isscalar (n)
+      || (length (size (n)) == length (dims) && all (size (n) == dims)))
+    retval = ceil (rand (dims) .* n);
+  else
+    error ("unidrnd: dimension mismatch");
+  endif
+endfunction