Mercurial > octave-nkf

comparison libinterp/octave-value/ov-bool-mat.cc @ 20263:00cf2847355d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). * liboctave/array/Array.h (Array::nelem) deprecate in favour of numel(). (Array::capacity, Array:: length): change to call numel() directly. These methods will be deprecated soon. * liboctave/array/PermMatrix.h (PermMatrix::nelem): deprecate in favour of numel(). * liboctave/array/Range.h (Range::numel) new method to replace nelem(). (Range::nelem) deprecate in favour of the new method numel. * liboctave/array/Sparse.h (Sparse::nelem) deprecate in favour of nzmax(). This one is secially bad because unlike the other classes, it is different from numel(). * libinterp/corefcn/debug.cc, libinterp/corefcn/jit-typeinfo.cc, libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/luinc.cc, libinterp/corefcn/max.cc, libinterp/corefcn/pr-output.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/xpow.cc, libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/audioread.cc, libinterp/octave-value/ov-base-int.cc, libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-range.cc, libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-mat.cc, libinterp/parse-tree/pt-eval.cc, liboctave/array/Array.cc, liboctave/array/CNDArray.cc, liboctave/array/Range.cc, liboctave/array/dNDArray.cc, liboctave/array/fCNDArray.cc, liboctave/array/fNDArray.cc, liboctave/array/idx-vector.cc, liboctave/array/intNDArray.cc, liboctave/numeric/SparseCmplxLU.cc, liboctave/numeric/SparsedbleLU.cc: replace use of nelem() with numel().
author Carnë Draug <carandraug@octave.org>
date Sun, 24 May 2015 02:41:37 +0100
parents b2100e1659ac
children c6224b4e7774
comparison
equal deleted inserted replaced
20262:9f484edd8767 20263:00cf2847355d
250 NDArray tmp(dv); 250 NDArray tmp(dv);
251 is >> tmp; 251 is >> tmp;
252 252
253 if (is) 253 if (is)
254 { 254 {
255 for (octave_idx_type i = 0; i < btmp.nelem (); i++) 255 for (octave_idx_type i = 0; i < btmp.numel (); i++)
256 btmp.elem (i) = (tmp.elem (i) != 0.); 256 btmp.elem (i) = (tmp.elem (i) != 0.);
257 257
258 matrix = btmp; 258 matrix = btmp;
259 } 259 }
260 else 260 else
342 os.write (reinterpret_cast<char *> (&tmp), 4); 342 os.write (reinterpret_cast<char *> (&tmp), 4);
343 } 343 }
344 344
345 boolNDArray m = bool_array_value (); 345 boolNDArray m = bool_array_value ();
346 bool *mtmp = m.fortran_vec (); 346 bool *mtmp = m.fortran_vec ();
347 octave_idx_type nel = m.nelem (); 347 octave_idx_type nel = m.numel ();
348 OCTAVE_LOCAL_BUFFER (char, htmp, nel); 348 OCTAVE_LOCAL_BUFFER (char, htmp, nel);
349 349
350 for (octave_idx_type i = 0; i < nel; i++) 350 for (octave_idx_type i = 0; i < nel; i++)
351 htmp[i] = (mtmp[i] ? 1 : 0); 351 htmp[i] = (mtmp[i] ? 1 : 0);
352 352
446 { 446 {
447 H5Sclose (space_hid); 447 H5Sclose (space_hid);
448 return false; 448 return false;
449 } 449 }
450 450
451 octave_idx_type nel = m.nelem (); 451 octave_idx_type nel = m.numel ();
452 bool *mtmp = m.fortran_vec (); 452 bool *mtmp = m.fortran_vec ();
453 OCTAVE_LOCAL_BUFFER (hbool_t, htmp, nel); 453 OCTAVE_LOCAL_BUFFER (hbool_t, htmp, nel);
454 454
455 for (octave_idx_type i = 0; i < nel; i++) 455 for (octave_idx_type i = 0; i < nel; i++)
456 htmp[i] = mtmp[i]; 456 htmp[i] = mtmp[i];