Mercurial > octave-nkf
comparison liboctave/array/CNDArray.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 |
---|---|
533 // imaginary) values and return them in MAX_VAL and MIN_VAL. | 533 // imaginary) values and return them in MAX_VAL and MIN_VAL. |
534 | 534 |
535 bool | 535 bool |
536 ComplexNDArray::all_integers (double& max_val, double& min_val) const | 536 ComplexNDArray::all_integers (double& max_val, double& min_val) const |
537 { | 537 { |
538 octave_idx_type nel = nelem (); | 538 octave_idx_type nel = numel (); |
539 | 539 |
540 if (nel > 0) | 540 if (nel > 0) |
541 { | 541 { |
542 Complex val = elem (0); | 542 Complex val = elem (0); |
543 | 543 |
844 | 844 |
845 // This contains no information on the array structure !!! | 845 // This contains no information on the array structure !!! |
846 std::ostream& | 846 std::ostream& |
847 operator << (std::ostream& os, const ComplexNDArray& a) | 847 operator << (std::ostream& os, const ComplexNDArray& a) |
848 { | 848 { |
849 octave_idx_type nel = a.nelem (); | 849 octave_idx_type nel = a.numel (); |
850 | 850 |
851 for (octave_idx_type i = 0; i < nel; i++) | 851 for (octave_idx_type i = 0; i < nel; i++) |
852 { | 852 { |
853 os << " "; | 853 os << " "; |
854 octave_write_complex (os, a.elem (i)); | 854 octave_write_complex (os, a.elem (i)); |
858 } | 858 } |
859 | 859 |
860 std::istream& | 860 std::istream& |
861 operator >> (std::istream& is, ComplexNDArray& a) | 861 operator >> (std::istream& is, ComplexNDArray& a) |
862 { | 862 { |
863 octave_idx_type nel = a.nelem (); | 863 octave_idx_type nel = a.numel (); |
864 | 864 |
865 if (nel > 0) | 865 if (nel > 0) |
866 { | 866 { |
867 Complex tmp; | 867 Complex tmp; |
868 for (octave_idx_type i = 0; i < nel; i++) | 868 for (octave_idx_type i = 0; i < nel; i++) |