Mercurial > octave

comparison src/DLD-FUNCTIONS/rand.cc @ 14846:460a3c6d8bf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Example: func() => func () * dynamic.txi, func.txi, oop.txi, var.txi, embedded.cc, fortdemo.cc, funcdemo.cc, paramdemo.cc, stringdemo.cc, unwinddemo.cc, Array.cc, Array.h, CColVector.cc, CDiagMatrix.h, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc, CmplxGEPBAL.cc, EIG.cc, MSparse.cc, MatrixType.cc, Sparse-op-defs.h, Sparse-perm-op-defs.h, Sparse.cc, Sparse.h, SparseCmplxCHOL.cc, SparseCmplxCHOL.h, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseCmplxQR.h, SparseQR.cc, SparseQR.h, SparsedbleCHOL.cc, SparsedbleCHOL.h, SparsedbleLU.cc, SparsedbleLU.h, base-lu.cc, cmd-hist.cc, dColVector.cc, dDiagMatrix.h, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, dbleCHOL.cc, dbleGEPBAL.cc, dim-vector.cc, eigs-base.cc, f2c-main.c, fCColVector.cc, fCDiagMatrix.h, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fCmplxGEPBAL.cc, fColVector.cc, fDiagMatrix.h, fEIG.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc, file-ops.cc, file-stat.cc, floatCHOL.cc, floatGEPBAL.cc, idx-vector.h, lo-specfun.cc, lo-sysdep.cc, mx-inlines.cc, oct-binmap.h, oct-convn.cc, oct-md5.cc, oct-mem.h, oct-rand.cc, oct-syscalls.cc, randgamma.c, randmtzig.c, sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc, sparse-dmsolve.cc, tempname.c, curl.m, divergence.m, randi.m, dlmwrite.m, edit.m, getappdata.m, what.m, getarchdir.m, install.m, installed_packages.m, repackage.m, unload_packages.m, colorbar.m, figure.m, isosurface.m, legend.m, loglog.m, plot.m, plot3.m, plotyy.m, polar.m, __errplot__.m, __ghostscript__.m, __marching_cube__.m, __plt__.m, __scatter__.m, semilogx.m, semilogy.m, trimesh.m, trisurf.m, demo.m, test.m, datetick.m, __delaunayn__.cc, __dsearchn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, balance.cc, bsxfun.cc, ccolamd.cc, cellfun.cc, chol.cc, daspk.cc, dasrt.cc, dassl.cc, dmperm.cc, eig.cc, eigs.cc, fftw.cc, filter.cc, find.cc, kron.cc, lookup.cc, lsode.cc, matrix_type.cc, md5sum.cc, mgorth.cc, qr.cc, quad.cc, rand.cc, regexp.cc, symbfact.cc, tril.cc, urlwrite.cc, op-bm-bm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fdm-fdm.cc, op-fm-fm.cc, op-int.h, op-m-m.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-str.cc, op-struct.cc, bitfcns.cc, data.cc, debug.cc, dynamic-ld.cc, error.cc, gl-render.cc, graphics.cc, graphics.in.h, load-path.cc, ls-hdf5.cc, ls-mat5.cc, ls-mat5.h, ls-oct-ascii.cc, ls-oct-ascii.h, mex.cc, mk-errno-list, oct-map.cc, oct-obj.h, oct-parse.yy, octave-config.in.cc, ov-base-int.cc, ov-base-mat.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc, ov-class.h, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-intx.h, ov-range.h, ov-re-mat.cc, ov-re-sparse.cc, ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.h, ov.h, pr-output.cc, pt-id.cc, pt-id.h, pt-mat.cc, pt-select.cc, sparse.cc, symtab.cc, symtab.h, syscalls.cc, toplev.cc, txt-eng-ft.cc, variables.cc, zfstream.cc, zfstream.h, Dork.m, getStash.m, myStash.m, Gork.m, Pork.m, myStash.m, getStash.m, myStash.m, getStash.m, myStash.m, fntests.m: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
author Rik <octave@nomad.inbox5.com>
date Sun, 08 Jul 2012 11:28:50 -0700
parents 52c5fb67fa5f
children 72b8b39e12be
comparison
equal deleted inserted replaced
14844:5bc9b9cb4362 14846:460a3c6d8bf1
68 frame.add_fcn (octave_rand::distribution, 68 frame.add_fcn (octave_rand::distribution,
69 octave_rand::distribution ()); 69 octave_rand::distribution ());
70 70
71 octave_rand::distribution (distribution); 71 octave_rand::distribution (distribution);
72 72
73 if (nargin > 0 && args(nargin-1).is_string()) 73 if (nargin > 0 && args(nargin-1).is_string ())
74 { 74 {
75 std::string s_arg = args(nargin-1).string_value (); 75 std::string s_arg = args(nargin-1).string_value ();
76 76
77 if (s_arg == "single") 77 if (s_arg == "single")
78 { 78 {
88 if (nargin == 0) 88 if (nargin == 0)
89 { 89 {
90 error ("%s: expecting at least one argument", fcn); 90 error ("%s: expecting at least one argument", fcn);
91 goto done; 91 goto done;
92 } 92 }
93 else if (args(0).is_string()) 93 else if (args(0).is_string ())
94 additional_arg = false; 94 additional_arg = false;
95 else 95 else
96 { 96 {
97 a = args(0).array_value (); 97 a = args(0).array_value ();
98 if (error_state) 98 if (error_state)
259 259
260 if (! error_state) 260 if (! error_state)
261 octave_rand::seed (d); 261 octave_rand::seed (d);
262 } 262 }
263 else if (args(idx+1).is_string () 263 else if (args(idx+1).is_string ()
264 && args(idx+1).string_value() == "reset") 264 && args(idx+1).string_value () == "reset")
265 octave_rand::reset (); 265 octave_rand::reset ();
266 else 266 else
267 error ("%s: seed must be a real scalar", fcn); 267 error ("%s: seed must be a real scalar", fcn);
268 } 268 }
269 else if (ts == "state" || ts == "twister") 269 else if (ts == "state" || ts == "twister")
270 { 270 {
271 if (args(idx+1).is_string () 271 if (args(idx+1).is_string ()
272 && args(idx+1).string_value() == "reset") 272 && args(idx+1).string_value () == "reset")
273 octave_rand::reset (fcn); 273 octave_rand::reset (fcn);
274 else 274 else
275 { 275 {
276 ColumnVector s = 276 ColumnVector s =
277 ColumnVector (args(idx+1).vector_value(false, true)); 277 ColumnVector (args(idx+1).vector_value(false, true));
315 315
316 if (is_single) 316 if (is_single)
317 { 317 {
318 if (additional_arg) 318 if (additional_arg)
319 { 319 {
320 if (a.length() == 1) 320 if (a.length () == 1)
321 return octave_rand::float_nd_array (dims, a(0)); 321 return octave_rand::float_nd_array (dims, a(0));
322 else 322 else
323 { 323 {
324 if (a.dims() != dims) 324 if (a.dims () != dims)
325 { 325 {
326 error ("%s: mismatch in argument size", fcn); 326 error ("%s: mismatch in argument size", fcn);
327 return retval; 327 return retval;
328 } 328 }
329 octave_idx_type len = a.length (); 329 octave_idx_type len = a.length ();
339 } 339 }
340 else 340 else
341 { 341 {
342 if (additional_arg) 342 if (additional_arg)
343 { 343 {
344 if (a.length() == 1) 344 if (a.length () == 1)
345 return octave_rand::nd_array (dims, a(0)); 345 return octave_rand::nd_array (dims, a(0));
346 else 346 else
347 { 347 {
348 if (a.dims() != dims) 348 if (a.dims () != dims)
349 { 349 {
350 error ("%s: mismatch in argument size", fcn); 350 error ("%s: mismatch in argument size", fcn);
351 return retval; 351 return retval;
352 } 352 }
353 octave_idx_type len = a.length (); 353 octave_idx_type len = a.length ();