Mercurial > octave-nkf
comparison liboctave/array/fCNDArray.cc @ 20263:00cf2847355d
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 |
comparison
equal
deleted
inserted
replaced
20262:9f484edd8767 | 20263:00cf2847355d |
---|---|
530 // imaginary) values and return them in MAX_VAL and MIN_VAL. | 530 // imaginary) values and return them in MAX_VAL and MIN_VAL. |
531 | 531 |
532 bool | 532 bool |
533 FloatComplexNDArray::all_integers (float& max_val, float& min_val) const | 533 FloatComplexNDArray::all_integers (float& max_val, float& min_val) const |
534 { | 534 { |
535 octave_idx_type nel = nelem (); | 535 octave_idx_type nel = numel (); |
536 | 536 |
537 if (nel > 0) | 537 if (nel > 0) |
538 { | 538 { |
539 FloatComplex val = elem (0); | 539 FloatComplex val = elem (0); |
540 | 540 |
855 | 855 |
856 // This contains no information on the array structure !!! | 856 // This contains no information on the array structure !!! |
857 std::ostream& | 857 std::ostream& |
858 operator << (std::ostream& os, const FloatComplexNDArray& a) | 858 operator << (std::ostream& os, const FloatComplexNDArray& a) |
859 { | 859 { |
860 octave_idx_type nel = a.nelem (); | 860 octave_idx_type nel = a.numel (); |
861 | 861 |
862 for (octave_idx_type i = 0; i < nel; i++) | 862 for (octave_idx_type i = 0; i < nel; i++) |
863 { | 863 { |
864 os << " "; | 864 os << " "; |
865 octave_write_complex (os, a.elem (i)); | 865 octave_write_complex (os, a.elem (i)); |
869 } | 869 } |
870 | 870 |
871 std::istream& | 871 std::istream& |
872 operator >> (std::istream& is, FloatComplexNDArray& a) | 872 operator >> (std::istream& is, FloatComplexNDArray& a) |
873 { | 873 { |
874 octave_idx_type nel = a.nelem (); | 874 octave_idx_type nel = a.numel (); |
875 | 875 |
876 if (nel > 0) | 876 if (nel > 0) |
877 { | 877 { |
878 FloatComplex tmp; | 878 FloatComplex tmp; |
879 for (octave_idx_type i = 0; i < nel; i++) | 879 for (octave_idx_type i = 0; i < nel; i++) |