Mercurial > octave-nkf
comparison libinterp/octave-value/ov-range.h @ 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 | 09ed6f7538dd |
| children | 7ac907da9fba |
comparison
equal
deleted
inserted
replaced
| 20262:9f484edd8767 | 20263:00cf2847355d |
|---|---|
| 56 : octave_base_value (), range (), idx_cache () { } | 56 : octave_base_value (), range (), idx_cache () { } |
| 57 | 57 |
| 58 octave_range (double base, double limit, double inc) | 58 octave_range (double base, double limit, double inc) |
| 59 : octave_base_value (), range (base, limit, inc), idx_cache () | 59 : octave_base_value (), range (base, limit, inc), idx_cache () |
| 60 { | 60 { |
| 61 if (range.nelem () < 0) | 61 if (range.numel () < 0) |
| 62 ::error ("invalid range"); | 62 ::error ("invalid range"); |
| 63 } | 63 } |
| 64 | 64 |
| 65 octave_range (const Range& r) | 65 octave_range (const Range& r) |
| 66 : octave_base_value (), range (r), idx_cache () | 66 : octave_base_value (), range (r), idx_cache () |
| 67 { | 67 { |
| 68 if (range.nelem () < 0 && range.nelem () != -2) | 68 if (range.numel () < 0 && range.numel () != -2) |
| 69 ::error ("invalid range"); | 69 ::error ("invalid range"); |
| 70 } | 70 } |
| 71 | 71 |
| 72 octave_range (const octave_range& r) | 72 octave_range (const octave_range& r) |
| 73 : octave_base_value (), range (r.range), | 73 : octave_base_value (), range (r.range), |
| 105 | 105 |
| 106 idx_vector index_vector (bool require_integers = false) const; | 106 idx_vector index_vector (bool require_integers = false) const; |
| 107 | 107 |
| 108 dim_vector dims (void) const | 108 dim_vector dims (void) const |
| 109 { | 109 { |
| 110 octave_idx_type n = range.nelem (); | 110 octave_idx_type n = range.numel (); |
| 111 return dim_vector (n > 0, n); | 111 return dim_vector (n > 0, n); |
| 112 } | 112 } |
| 113 | 113 |
| 114 octave_value resize (const dim_vector& dv, bool fill = false) const; | 114 octave_value resize (const dim_vector& dv, bool fill = false) const; |
| 115 | 115 |