Mercurial > octave-nkf

comparison libinterp/corefcn/rand.cc @ 17787:175b392e91fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use GNU style coding conventions for code in libinterp/ * libinterp/corefcn/Cell.h, libinterp/corefcn/__contourc__.cc, libinterp/corefcn/__dispatch__.cc, libinterp/corefcn/__lin_interpn__.cc, libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc, libinterp/corefcn/balance.cc, libinterp/corefcn/besselj.cc, libinterp/corefcn/betainc.cc, libinterp/corefcn/bitfcns.cc, libinterp/corefcn/bsxfun.cc, libinterp/corefcn/c-file-ptr-stream.cc, libinterp/corefcn/c-file-ptr-stream.h, libinterp/corefcn/cellfun.cc, libinterp/corefcn/colloc.cc, libinterp/corefcn/comment-list.h, libinterp/corefcn/conv2.cc, libinterp/corefcn/daspk.cc, libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc, libinterp/corefcn/data.cc, libinterp/corefcn/debug.cc, libinterp/corefcn/defaults.cc, libinterp/corefcn/defaults.in.h, libinterp/corefcn/defun-int.h, libinterp/corefcn/defun.cc, libinterp/corefcn/det.cc, libinterp/corefcn/dirfns.cc, libinterp/corefcn/display.cc, libinterp/corefcn/dlmread.cc, libinterp/corefcn/dot.cc, libinterp/corefcn/dynamic-ld.cc, libinterp/corefcn/dynamic-ld.h, libinterp/corefcn/eig.cc, libinterp/corefcn/ellipj.cc, libinterp/corefcn/error.cc, libinterp/corefcn/error.h, libinterp/corefcn/event-queue.h, libinterp/corefcn/fft.cc, libinterp/corefcn/fft2.cc, libinterp/corefcn/fftn.cc, libinterp/corefcn/file-io.cc, libinterp/corefcn/filter.cc, libinterp/corefcn/find.cc, libinterp/corefcn/gammainc.cc, libinterp/corefcn/gcd.cc, libinterp/corefcn/getgrent.cc, libinterp/corefcn/getpwent.cc, libinterp/corefcn/getrusage.cc, libinterp/corefcn/givens.cc, libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/gl2ps-renderer.h, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/gripes.cc, libinterp/corefcn/gripes.h, libinterp/corefcn/help.cc, libinterp/corefcn/hess.cc, libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc, libinterp/corefcn/input.h, libinterp/corefcn/inv.cc, libinterp/corefcn/jit-ir.h, libinterp/corefcn/jit-typeinfo.cc, libinterp/corefcn/jit-typeinfo.h, libinterp/corefcn/jit-util.h, libinterp/corefcn/kron.cc, libinterp/corefcn/load-path.cc, libinterp/corefcn/load-path.h, libinterp/corefcn/load-save.cc, libinterp/corefcn/load-save.h, libinterp/corefcn/lookup.cc, libinterp/corefcn/ls-ascii-helper.cc, libinterp/corefcn/ls-hdf5.cc, libinterp/corefcn/ls-hdf5.h, libinterp/corefcn/ls-mat-ascii.cc, libinterp/corefcn/ls-mat-ascii.h, libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/ls-mat5.h, libinterp/corefcn/ls-oct-ascii.cc, libinterp/corefcn/lsode.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/luinc.cc, libinterp/corefcn/mappers.cc, libinterp/corefcn/matrix_type.cc, libinterp/corefcn/max.cc, libinterp/corefcn/md5sum.cc, libinterp/corefcn/mex.cc, libinterp/corefcn/mexproto.h, libinterp/corefcn/mgorth.cc, libinterp/corefcn/mxarray.in.h, libinterp/corefcn/nproc.cc, libinterp/corefcn/oct-hist.cc, libinterp/corefcn/oct-lvalue.h, libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-prcstrm.h, libinterp/corefcn/oct-stdstrm.h, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h, libinterp/corefcn/octave-link.cc, libinterp/corefcn/octave-link.h, libinterp/corefcn/pager.cc, libinterp/corefcn/pinv.cc, libinterp/corefcn/pr-output.cc, libinterp/corefcn/procstream.h, libinterp/corefcn/profiler.cc, libinterp/corefcn/pt-jit.cc, libinterp/corefcn/pt-jit.h, libinterp/corefcn/quad.cc, libinterp/corefcn/quadcc.cc, libinterp/corefcn/qz.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/rcond.cc, libinterp/corefcn/regexp.cc, libinterp/corefcn/schur.cc, libinterp/corefcn/sighandlers.cc, libinterp/corefcn/sighandlers.h, libinterp/corefcn/sparse-xdiv.cc, libinterp/corefcn/sparse-xdiv.h, libinterp/corefcn/sparse-xpow.cc, libinterp/corefcn/sparse.cc, libinterp/corefcn/spparms.cc, libinterp/corefcn/sqrtm.cc, libinterp/corefcn/str2double.cc, libinterp/corefcn/strfind.cc, libinterp/corefcn/strfns.cc, libinterp/corefcn/sub2ind.cc, libinterp/corefcn/svd.cc, libinterp/corefcn/syl.cc, libinterp/corefcn/symtab.cc, libinterp/corefcn/symtab.h, libinterp/corefcn/syscalls.cc, libinterp/corefcn/sysdep.cc, libinterp/corefcn/sysdep.h, libinterp/corefcn/time.cc, libinterp/corefcn/toplev.cc, libinterp/corefcn/toplev.h, libinterp/corefcn/tril.cc, libinterp/corefcn/txt-eng-ft.cc, libinterp/corefcn/txt-eng-ft.h, libinterp/corefcn/txt-eng.h, libinterp/corefcn/typecast.cc, libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc, libinterp/corefcn/variables.h, libinterp/corefcn/xdiv.cc, libinterp/corefcn/xdiv.h, libinterp/corefcn/xnorm.h, libinterp/corefcn/xpow.cc, libinterp/corefcn/xpow.h, libinterp/corefcn/zfstream.cc, libinterp/corefcn/zfstream.h, libinterp/dldfcn/__delaunayn__.cc, libinterp/dldfcn/__dsearchn__.cc, libinterp/dldfcn/__eigs__.cc, libinterp/dldfcn/__fltk_uigetfile__.cc, libinterp/dldfcn/__glpk__.cc, libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__init_gnuplot__.cc, libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/__voronoi__.cc, libinterp/dldfcn/amd.cc, libinterp/dldfcn/ccolamd.cc, libinterp/dldfcn/chol.cc, libinterp/dldfcn/colamd.cc, libinterp/dldfcn/convhulln.cc, libinterp/dldfcn/dmperm.cc, libinterp/dldfcn/fftw.cc, libinterp/dldfcn/qr.cc, libinterp/dldfcn/symbfact.cc, libinterp/dldfcn/symrcm.cc, libinterp/dldfcn/tsearch.cc, libinterp/octave-value/ov-base-diag.cc, libinterp/octave-value/ov-base-diag.h, libinterp/octave-value/ov-base-int.cc, libinterp/octave-value/ov-base-int.h, libinterp/octave-value/ov-base-mat.h, libinterp/octave-value/ov-base-scalar.cc, libinterp/octave-value/ov-base-scalar.h, libinterp/octave-value/ov-base-sparse.cc, libinterp/octave-value/ov-base-sparse.h, libinterp/octave-value/ov-base.cc, libinterp/octave-value/ov-base.h, libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-bool-mat.h, libinterp/octave-value/ov-bool-sparse.cc, libinterp/octave-value/ov-bool-sparse.h, libinterp/octave-value/ov-bool.cc, libinterp/octave-value/ov-bool.h, libinterp/octave-value/ov-builtin.cc, libinterp/octave-value/ov-builtin.h, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-cell.h, libinterp/octave-value/ov-ch-mat.cc, libinterp/octave-value/ov-ch-mat.h, libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h, libinterp/octave-value/ov-colon.h, libinterp/octave-value/ov-complex.cc, libinterp/octave-value/ov-complex.h, libinterp/octave-value/ov-cx-diag.cc, libinterp/octave-value/ov-cx-diag.h, libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-cx-mat.h, libinterp/octave-value/ov-cx-sparse.cc, libinterp/octave-value/ov-cx-sparse.h, libinterp/octave-value/ov-dld-fcn.h, libinterp/octave-value/ov-fcn-handle.cc, libinterp/octave-value/ov-fcn-handle.h, libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-fcn-inline.h, libinterp/octave-value/ov-fcn.h, libinterp/octave-value/ov-float.cc, libinterp/octave-value/ov-float.h, libinterp/octave-value/ov-flt-complex.cc, libinterp/octave-value/ov-flt-complex.h, libinterp/octave-value/ov-flt-cx-diag.cc, libinterp/octave-value/ov-flt-cx-diag.h, libinterp/octave-value/ov-flt-cx-mat.cc, libinterp/octave-value/ov-flt-cx-mat.h, libinterp/octave-value/ov-flt-re-diag.cc, libinterp/octave-value/ov-flt-re-diag.h, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-flt-re-mat.h, libinterp/octave-value/ov-int16.cc, libinterp/octave-value/ov-int32.cc, libinterp/octave-value/ov-int64.cc, libinterp/octave-value/ov-int8.cc, libinterp/octave-value/ov-intx.h, libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-lazy-idx.h, libinterp/octave-value/ov-mex-fcn.cc, libinterp/octave-value/ov-mex-fcn.h, libinterp/octave-value/ov-null-mat.cc, libinterp/octave-value/ov-null-mat.h, libinterp/octave-value/ov-oncleanup.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-perm.h, libinterp/octave-value/ov-range.cc, libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-diag.cc, libinterp/octave-value/ov-re-diag.h, libinterp/octave-value/ov-re-mat.cc, libinterp/octave-value/ov-re-mat.h, libinterp/octave-value/ov-re-sparse.cc, libinterp/octave-value/ov-re-sparse.h, libinterp/octave-value/ov-scalar.cc, libinterp/octave-value/ov-scalar.h, libinterp/octave-value/ov-str-mat.cc, libinterp/octave-value/ov-str-mat.h, libinterp/octave-value/ov-struct.cc, libinterp/octave-value/ov-struct.h, libinterp/octave-value/ov-type-conv.h, libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov-typeinfo.h, libinterp/octave-value/ov-uint16.cc, libinterp/octave-value/ov-uint32.cc, libinterp/octave-value/ov-uint64.cc, libinterp/octave-value/ov-uint8.cc, libinterp/octave-value/ov-usr-fcn.cc, libinterp/octave-value/ov-usr-fcn.h, libinterp/octave-value/ov.cc, libinterp/octave-value/ov.h, libinterp/octave.cc, libinterp/operators/op-b-bm.cc, libinterp/operators/op-b-sbm.cc, libinterp/operators/op-bm-b.cc, libinterp/operators/op-bm-bm.cc, libinterp/operators/op-cdm-cdm.cc, libinterp/operators/op-chm.cc, libinterp/operators/op-class.cc, libinterp/operators/op-cm-cm.cc, libinterp/operators/op-cm-cs.cc, libinterp/operators/op-cm-s.cc, libinterp/operators/op-cm-scm.cc, libinterp/operators/op-cm-sm.cc, libinterp/operators/op-cs-cm.cc, libinterp/operators/op-cs-cs.cc, libinterp/operators/op-cs-scm.cc, libinterp/operators/op-cs-sm.cc, libinterp/operators/op-dm-dm.cc, libinterp/operators/op-dm-scm.cc, libinterp/operators/op-double-conv.cc, libinterp/operators/op-fcdm-fcdm.cc, libinterp/operators/op-fcm-fcm.cc, libinterp/operators/op-fcm-fcs.cc, libinterp/operators/op-fcm-fm.cc, libinterp/operators/op-fcm-fs.cc, libinterp/operators/op-fcs-fcm.cc, libinterp/operators/op-fcs-fcs.cc, libinterp/operators/op-fcs-fm.cc, libinterp/operators/op-fcs-fs.cc, libinterp/operators/op-fdm-fdm.cc, libinterp/operators/op-float-conv.cc, libinterp/operators/op-fm-fcm.cc, libinterp/operators/op-fm-fcs.cc, libinterp/operators/op-fm-fm.cc, libinterp/operators/op-fm-fs.cc, libinterp/operators/op-fs-fcm.cc, libinterp/operators/op-fs-fcs.cc, libinterp/operators/op-fs-fm.cc, libinterp/operators/op-fs-fs.cc, libinterp/operators/op-m-cm.cc, libinterp/operators/op-m-cs.cc, libinterp/operators/op-m-m.cc, libinterp/operators/op-m-s.cc, libinterp/operators/op-m-scm.cc, libinterp/operators/op-m-sm.cc, libinterp/operators/op-pm-scm.cc, libinterp/operators/op-range.cc, libinterp/operators/op-s-cm.cc, libinterp/operators/op-s-cs.cc, libinterp/operators/op-s-scm.cc, libinterp/operators/op-sbm-b.cc, libinterp/operators/op-sbm-bm.cc, libinterp/operators/op-sbm-sbm.cc, libinterp/operators/op-scm-cm.cc, libinterp/operators/op-scm-cs.cc, libinterp/operators/op-scm-m.cc, libinterp/operators/op-scm-s.cc, libinterp/operators/op-scm-scm.cc, libinterp/operators/op-scm-sm.cc, libinterp/operators/op-sm-cm.cc, libinterp/operators/op-sm-m.cc, libinterp/operators/op-sm-s.cc, libinterp/operators/op-sm-scm.cc, libinterp/operators/op-sm-sm.cc, libinterp/operators/op-str-m.cc, libinterp/operators/op-str-s.cc, libinterp/operators/op-str-str.cc, libinterp/operators/ops.h, libinterp/parse-tree/lex.h, libinterp/parse-tree/parse.h, libinterp/parse-tree/pt-arg-list.cc, libinterp/parse-tree/pt-arg-list.h, libinterp/parse-tree/pt-assign.cc, libinterp/parse-tree/pt-assign.h, libinterp/parse-tree/pt-binop.cc, libinterp/parse-tree/pt-binop.h, libinterp/parse-tree/pt-bp.h, libinterp/parse-tree/pt-cbinop.cc, libinterp/parse-tree/pt-check.cc, libinterp/parse-tree/pt-colon.cc, libinterp/parse-tree/pt-colon.h, libinterp/parse-tree/pt-const.cc, libinterp/parse-tree/pt-decl.cc, libinterp/parse-tree/pt-decl.h, libinterp/parse-tree/pt-eval.cc, libinterp/parse-tree/pt-except.h, libinterp/parse-tree/pt-exp.h, libinterp/parse-tree/pt-fcn-handle.cc, libinterp/parse-tree/pt-id.cc, libinterp/parse-tree/pt-id.h, libinterp/parse-tree/pt-idx.cc, libinterp/parse-tree/pt-idx.h, libinterp/parse-tree/pt-loop.h, libinterp/parse-tree/pt-mat.cc, libinterp/parse-tree/pt-misc.cc, libinterp/parse-tree/pt-misc.h, libinterp/parse-tree/pt-pr-code.cc, libinterp/parse-tree/pt-select.h, libinterp/parse-tree/pt-stmt.h, libinterp/parse-tree/token.h, libinterp/version.cc: Use GNU style coding conventions for code in libinterp/
author Rik <rik@octave.org>
date Mon, 28 Oct 2013 19:51:46 -0700
parents d63878346099
children fffd0c0ca2dc
comparison
equal deleted inserted replaced
17786:34d9812a943b 17787:175b392e91fe
303 } 303 }
304 } 304 }
305 break; 305 break;
306 } 306 }
307 307
308 done: 308 done:
309 309
310 return retval; 310 return retval;
311 311
312 gen_matrix: 312 gen_matrix:
313 313
314 dims.chop_trailing_singletons (); 314 dims.chop_trailing_singletons ();
315 315
316 if (is_single) 316 if (is_single)
317 { 317 {
362 return octave_rand::nd_array (dims); 362 return octave_rand::nd_array (dims);
363 } 363 }
364 } 364 }
365 365
366 DEFUN (rand, args, , 366 DEFUN (rand, args, ,
367 "-*- texinfo -*-\n\ 367 "-*- texinfo -*-\n\
368 @deftypefn {Built-in Function} {} rand (@var{n})\n\ 368 @deftypefn {Built-in Function} {} rand (@var{n})\n\
369 @deftypefnx {Built-in Function} {} rand (@var{n}, @var{m}, @dots{})\n\ 369 @deftypefnx {Built-in Function} {} rand (@var{n}, @var{m}, @dots{})\n\
370 @deftypefnx {Built-in Function} {} rand ([@var{n} @var{m} @dots{}])\n\ 370 @deftypefnx {Built-in Function} {} rand ([@var{n} @var{m} @dots{}])\n\
371 @deftypefnx {Built-in Function} {@var{v} =} rand (\"state\")\n\ 371 @deftypefnx {Built-in Function} {@var{v} =} rand (\"state\")\n\
372 @deftypefnx {Built-in Function} {} rand (\"state\", @var{v})\n\ 372 @deftypefnx {Built-in Function} {} rand (\"state\", @var{v})\n\
461 retval = do_rand (args, nargin, "rand", "uniform"); 461 retval = do_rand (args, nargin, "rand", "uniform");
462 462
463 return retval; 463 return retval;
464 } 464 }
465 465
466 // FIXME -- The old generator (selected when "seed" is set) will not 466 // FIXME: The old generator (selected when "seed" is set) will not
467 // work properly if compiled to use 64-bit integers. 467 // work properly if compiled to use 64-bit integers.
468 468
469 /* 469 /*
470 %!test # "state" can be a scalar 470 %!test # "state" can be a scalar
471 %! rand ("state", 12); x = rand (1,4); 471 %! rand ("state", 12); x = rand (1,4);
549 */ 549 */
550 550
551 static std::string current_distribution = octave_rand::distribution (); 551 static std::string current_distribution = octave_rand::distribution ();
552 552
553 DEFUN (randn, args, , 553 DEFUN (randn, args, ,
554 "-*- texinfo -*-\n\ 554 "-*- texinfo -*-\n\
555 @deftypefn {Built-in Function} {} randn (@var{n})\n\ 555 @deftypefn {Built-in Function} {} randn (@var{n})\n\
556 @deftypefnx {Built-in Function} {} randn (@var{n}, @var{m}, @dots{})\n\ 556 @deftypefnx {Built-in Function} {} randn (@var{n}, @var{m}, @dots{})\n\
557 @deftypefnx {Built-in Function} {} randn ([@var{n} @var{m} @dots{}])\n\ 557 @deftypefnx {Built-in Function} {} randn ([@var{n} @var{m} @dots{}])\n\
558 @deftypefnx {Built-in Function} {@var{v} =} randn (\"state\")\n\ 558 @deftypefnx {Built-in Function} {@var{v} =} randn (\"state\")\n\
559 @deftypefnx {Built-in Function} {} randn (\"state\", @var{v})\n\ 559 @deftypefnx {Built-in Function} {} randn (\"state\", @var{v})\n\
621 %! assert (kurtosis (x), 0, 0.04); 621 %! assert (kurtosis (x), 0, 0.04);
622 %! endif 622 %! endif
623 */ 623 */
624 624
625 DEFUN (rande, args, , 625 DEFUN (rande, args, ,
626 "-*- texinfo -*-\n\ 626 "-*- texinfo -*-\n\
627 @deftypefn {Built-in Function} {} rande (@var{n})\n\ 627 @deftypefn {Built-in Function} {} rande (@var{n})\n\
628 @deftypefnx {Built-in Function} {} rande (@var{n}, @var{m}, @dots{})\n\ 628 @deftypefnx {Built-in Function} {} rande (@var{n}, @var{m}, @dots{})\n\
629 @deftypefnx {Built-in Function} {} rande ([@var{n} @var{m} @dots{}])\n\ 629 @deftypefnx {Built-in Function} {} rande ([@var{n} @var{m} @dots{}])\n\
630 @deftypefnx {Built-in Function} {@var{v} =} rande (\"state\")\n\ 630 @deftypefnx {Built-in Function} {@var{v} =} rande (\"state\")\n\
631 @deftypefnx {Built-in Function} {} rande (\"state\", @var{v})\n\ 631 @deftypefnx {Built-in Function} {} rande (\"state\", @var{v})\n\
694 %! assert (kurtosis (x), 6, 0.7); 694 %! assert (kurtosis (x), 6, 0.7);
695 %! endif 695 %! endif
696 */ 696 */
697 697
698 DEFUN (randg, args, , 698 DEFUN (randg, args, ,
699 "-*- texinfo -*-\n\ 699 "-*- texinfo -*-\n\
700 @deftypefn {Built-in Function} {} randg (@var{n})\n\ 700 @deftypefn {Built-in Function} {} randg (@var{n})\n\
701 @deftypefnx {Built-in Function} {} randg (@var{n}, @var{m}, @dots{})\n\ 701 @deftypefnx {Built-in Function} {} randg (@var{n}, @var{m}, @dots{})\n\
702 @deftypefnx {Built-in Function} {} randg ([@var{n} @var{m} @dots{}])\n\ 702 @deftypefnx {Built-in Function} {} randg ([@var{n} @var{m} @dots{}])\n\
703 @deftypefnx {Built-in Function} {@var{v} =} randg (\"state\")\n\ 703 @deftypefnx {Built-in Function} {@var{v} =} randg (\"state\")\n\
704 @deftypefnx {Built-in Function} {} randg (\"state\", @var{v})\n\ 704 @deftypefnx {Built-in Function} {} randg (\"state\", @var{v})\n\
966 %! assert (kurtosis (x), 6/a, 0.2); 966 %! assert (kurtosis (x), 6/a, 0.2);
967 %! endif 967 %! endif
968 */ 968 */
969 969
970 DEFUN (randp, args, , 970 DEFUN (randp, args, ,
971 "-*- texinfo -*-\n\ 971 "-*- texinfo -*-\n\
972 @deftypefn {Built-in Function} {} randp (@var{l}, @var{n})\n\ 972 @deftypefn {Built-in Function} {} randp (@var{l}, @var{n})\n\
973 @deftypefnx {Built-in Function} {} randp (@var{l}, @var{n}, @var{m}, @dots{})\n\ 973 @deftypefnx {Built-in Function} {} randp (@var{l}, @var{n}, @var{m}, @dots{})\n\
974 @deftypefnx {Built-in Function} {} randp (@var{l}, [@var{n} @var{m} @dots{}])\n\ 974 @deftypefnx {Built-in Function} {} randp (@var{l}, [@var{n} @var{m} @dots{}])\n\
975 @deftypefnx {Built-in Function} {@var{v} =} randp (\"state\")\n\ 975 @deftypefnx {Built-in Function} {@var{v} =} randp (\"state\")\n\
976 @deftypefnx {Built-in Function} {} randp (\"state\", @var{v})\n\ 976 @deftypefnx {Built-in Function} {} randp (\"state\", @var{v})\n\
1114 %! endfor 1114 %! endfor
1115 %! endif 1115 %! endif
1116 */ 1116 */
1117 1117
1118 DEFUN (randperm, args, , 1118 DEFUN (randperm, args, ,
1119 "-*- texinfo -*-\n\ 1119 "-*- texinfo -*-\n\
1120 @deftypefn {Built-in Function} {} randperm (@var{n})\n\ 1120 @deftypefn {Built-in Function} {} randperm (@var{n})\n\
1121 @deftypefnx {Built-in Function} {} randperm (@var{n}, @var{m})\n\ 1121 @deftypefnx {Built-in Function} {} randperm (@var{n}, @var{m})\n\
1122 Return a row vector containing a random permutation of @code{1:@var{n}}.\n\ 1122 Return a row vector containing a random permutation of @code{1:@var{n}}.\n\
1123 If @var{m} is supplied, return @var{m} unique entries, sampled without\n\ 1123 If @var{m} is supplied, return @var{m} unique entries, sampled without\n\
1124 replacement from @code{1:@var{n}}. The complexity is O(@var{n}) in\n\ 1124 replacement from @code{1:@var{n}}. The complexity is O(@var{n}) in\n\
1169 Array<octave_idx_type> idx; 1169 Array<octave_idx_type> idx;
1170 try 1170 try
1171 { 1171 {
1172 idx = Array<octave_idx_type> (dim_vector (1, idx_len)); 1172 idx = Array<octave_idx_type> (dim_vector (1, idx_len));
1173 } 1173 }
1174 catch(std::bad_alloc) 1174 catch (std::bad_alloc)
1175 { 1175 {
1176 // Looks like n is too big and short_shuffle is false. 1176 // Looks like n is too big and short_shuffle is false.
1177 // Let's try again, but this time with the alternative. 1177 // Let's try again, but this time with the alternative.
1178 idx_len = m; 1178 idx_len = m;
1179 short_shuffle = true; 1179 short_shuffle = true;
1192 // Perform the Knuth shuffle only keeping track of moved 1192 // Perform the Knuth shuffle only keeping track of moved
1193 // entries in the map 1193 // entries in the map
1194 for (octave_idx_type i = 0; i < m; i++) 1194 for (octave_idx_type i = 0; i < m; i++)
1195 { 1195 {
1196 octave_idx_type k = i + 1196 octave_idx_type k = i +
1197 gnulib::floor (rvec[i] * (n - i)); 1197 gnulib::floor (rvec[i] * (n - i));
1198 1198
1199 //For shuffling first m entries, no need to use extra 1199 //For shuffling first m entries, no need to use extra
1200 //storage 1200 //storage
1201 if (k < m) 1201 if (k < m)
1202 { 1202 {
1216 1216
1217 // Perform the Knuth shuffle of the first m entries 1217 // Perform the Knuth shuffle of the first m entries
1218 for (octave_idx_type i = 0; i < m; i++) 1218 for (octave_idx_type i = 0; i < m; i++)
1219 { 1219 {
1220 octave_idx_type k = i + 1220 octave_idx_type k = i +
1221 gnulib::floor (rvec[i] * (n - i)); 1221 gnulib::floor (rvec[i] * (n - i));
1222 std::swap (ivec[i], ivec[k]); 1222 std::swap (ivec[i], ivec[k]);
1223 } 1223 }
1224 } 1224 }
1225 1225
1226 // Convert to doubles, reusing r. 1226 // Convert to doubles, reusing r.