Mercurial > octave-nkf
comparison liboctave/array/dNDArray.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 |
|---|---|
| 594 // the largest and smallest values and return them in MAX_VAL and MIN_VAL. | 594 // the largest and smallest values and return them in MAX_VAL and MIN_VAL. |
| 595 | 595 |
| 596 bool | 596 bool |
| 597 NDArray::all_integers (double& max_val, double& min_val) const | 597 NDArray::all_integers (double& max_val, double& min_val) const |
| 598 { | 598 { |
| 599 octave_idx_type nel = nelem (); | 599 octave_idx_type nel = numel (); |
| 600 | 600 |
| 601 if (nel > 0) | 601 if (nel > 0) |
| 602 { | 602 { |
| 603 max_val = elem (0); | 603 max_val = elem (0); |
| 604 min_val = elem (0); | 604 min_val = elem (0); |
| 870 | 870 |
| 871 // This contains no information on the array structure !!! | 871 // This contains no information on the array structure !!! |
| 872 std::ostream& | 872 std::ostream& |
| 873 operator << (std::ostream& os, const NDArray& a) | 873 operator << (std::ostream& os, const NDArray& a) |
| 874 { | 874 { |
| 875 octave_idx_type nel = a.nelem (); | 875 octave_idx_type nel = a.numel (); |
| 876 | 876 |
| 877 for (octave_idx_type i = 0; i < nel; i++) | 877 for (octave_idx_type i = 0; i < nel; i++) |
| 878 { | 878 { |
| 879 os << " "; | 879 os << " "; |
| 880 octave_write_double (os, a.elem (i)); | 880 octave_write_double (os, a.elem (i)); |
| 884 } | 884 } |
| 885 | 885 |
| 886 std::istream& | 886 std::istream& |
| 887 operator >> (std::istream& is, NDArray& a) | 887 operator >> (std::istream& is, NDArray& a) |
| 888 { | 888 { |
| 889 octave_idx_type nel = a.nelem (); | 889 octave_idx_type nel = a.numel (); |
| 890 | 890 |
| 891 if (nel > 0) | 891 if (nel > 0) |
| 892 { | 892 { |
| 893 double tmp; | 893 double tmp; |
| 894 for (octave_idx_type i = 0; i < nel; i++) | 894 for (octave_idx_type i = 0; i < nel; i++) |