Mercurial > octave
comparison liboctave/array/fDiagMatrix.cc @ 20232:a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
* liboctave/array/Array.h (Array::length): deprecate for ::numel.
* liboctave/array/Sparse.h (Sparse::length): deprecate for ::numel.
* libgui/graphics/QtHandlesUtils.cc, libgui/src/octave-qt-link.cc,
libinterp/corefcn/Cell.cc, libinterp/corefcn/__contourc__.cc,
libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc,
libinterp/corefcn/cellfun.cc, libinterp/corefcn/daspk.cc,
libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc,
libinterp/corefcn/data.cc, libinterp/corefcn/filter.cc,
libinterp/corefcn/find.cc, libinterp/corefcn/gl-render.cc,
libinterp/corefcn/gl-render.h, libinterp/corefcn/graphics.cc,
libinterp/corefcn/graphics.in.h, libinterp/corefcn/help.cc,
libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc,
libinterp/corefcn/load-path.cc, libinterp/corefcn/load-save.cc,
libinterp/corefcn/ls-oct-ascii.h, libinterp/corefcn/lsode.cc,
libinterp/corefcn/matrix_type.cc, libinterp/corefcn/oct-hist.cc,
libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h,
libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-stream.cc,
libinterp/corefcn/oct-stream.h, libinterp/corefcn/pr-output.cc,
libinterp/corefcn/quadcc.cc, libinterp/corefcn/rand.cc,
libinterp/corefcn/regexp.cc, libinterp/corefcn/strfns.cc,
libinterp/corefcn/sub2ind.cc, libinterp/corefcn/symtab.h,
libinterp/corefcn/syscalls.cc, libinterp/corefcn/tsearch.cc,
libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc,
libinterp/corefcn/variables.cc, libinterp/corefcn/xdiv.cc,
libinterp/corefcn/xpow.cc, libinterp/dldfcn/__glpk__.cc,
libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__magick_read__.cc,
libinterp/dldfcn/audiodevinfo.cc, libinterp/dldfcn/ccolamd.cc,
libinterp/dldfcn/colamd.cc, libinterp/octave-value/ov-cell.cc,
libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h,
libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-java.cc,
libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-struct.cc,
libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov.cc,
libinterp/operators/op-int.h, libinterp/parse-tree/pt-pr-code.cc,
liboctave/array/Array-util.cc, liboctave/array/Array.cc,
liboctave/array/CColVector.cc, liboctave/array/CDiagMatrix.cc,
liboctave/array/CMatrix.cc, liboctave/array/CRowVector.cc,
liboctave/array/DiagArray2.cc, liboctave/array/DiagArray2.h,
liboctave/array/MArray.cc, liboctave/array/PermMatrix.cc,
liboctave/array/PermMatrix.h, liboctave/array/Sparse.cc,
liboctave/array/boolMatrix.cc, liboctave/array/chMatrix.cc,
liboctave/array/chNDArray.cc, liboctave/array/dColVector.cc,
liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc,
liboctave/array/dRowVector.cc, liboctave/array/fCColVector.cc,
liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc,
liboctave/array/fCRowVector.cc, liboctave/array/fColVector.cc,
liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc,
liboctave/array/fRowVector.cc, liboctave/array/idx-vector.cc,
liboctave/array/intNDArray.cc, liboctave/numeric/CmplxCHOL.cc,
liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc,
liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc,
liboctave/numeric/DASSL.cc, liboctave/numeric/LSODE.cc,
liboctave/numeric/ODES.cc, liboctave/numeric/ODES.h,
liboctave/numeric/base-dae.h, liboctave/numeric/base-lu.cc,
liboctave/numeric/dbleCHOL.cc, liboctave/numeric/dbleLU.cc,
liboctave/numeric/dbleQR.cc, liboctave/numeric/eigs-base.cc,
liboctave/numeric/fCmplxCHOL.cc, liboctave/numeric/fCmplxLU.cc,
liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatCHOL.cc,
liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc,
liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-rand.cc,
liboctave/numeric/oct-spparms.cc, liboctave/numeric/sparse-base-chol.cc,
liboctave/operators/mx-inlines.cc, liboctave/system/file-ops.cc,
liboctave/util/glob-match.h, liboctave/util/kpse.cc,
liboctave/util/lo-regexp.cc, liboctave/util/oct-glob.cc,
liboctave/util/pathsearch.cc, liboctave/util/str-vec.cc,
liboctave/util/str-vec.h, liboctave/util/url-transfer.cc: replace all usage
of Array::length() and Sparse::length() with ::numel().
| author | Carnë Draug <carandraug@octave.org> |
|---|---|
| date | Sat, 30 May 2015 03:14:07 +0100 |
| parents | 4197fc428c7d |
| children | f61c67865d9f |
comparison
equal
deleted
inserted
replaced
| 20231:83792dd9bcc1 | 20232:a9574e3c6e9e |
|---|---|
| 76 | 76 |
| 77 FloatDiagMatrix& | 77 FloatDiagMatrix& |
| 78 FloatDiagMatrix::fill (const FloatColumnVector& a) | 78 FloatDiagMatrix::fill (const FloatColumnVector& a) |
| 79 { | 79 { |
| 80 octave_idx_type len = length (); | 80 octave_idx_type len = length (); |
| 81 if (a.length () != len) | 81 if (a.numel () != len) |
| 82 { | 82 { |
| 83 (*current_liboctave_error_handler) ("range error for fill"); | 83 (*current_liboctave_error_handler) ("range error for fill"); |
| 84 return *this; | 84 return *this; |
| 85 } | 85 } |
| 86 | 86 |
| 92 | 92 |
| 93 FloatDiagMatrix& | 93 FloatDiagMatrix& |
| 94 FloatDiagMatrix::fill (const FloatRowVector& a) | 94 FloatDiagMatrix::fill (const FloatRowVector& a) |
| 95 { | 95 { |
| 96 octave_idx_type len = length (); | 96 octave_idx_type len = length (); |
| 97 if (a.length () != len) | 97 if (a.numel () != len) |
| 98 { | 98 { |
| 99 (*current_liboctave_error_handler) ("range error for fill"); | 99 (*current_liboctave_error_handler) ("range error for fill"); |
| 100 return *this; | 100 return *this; |
| 101 } | 101 } |
| 102 | 102 |
| 107 } | 107 } |
| 108 | 108 |
| 109 FloatDiagMatrix& | 109 FloatDiagMatrix& |
| 110 FloatDiagMatrix::fill (const FloatColumnVector& a, octave_idx_type beg) | 110 FloatDiagMatrix::fill (const FloatColumnVector& a, octave_idx_type beg) |
| 111 { | 111 { |
| 112 octave_idx_type a_len = a.length (); | 112 octave_idx_type a_len = a.numel (); |
| 113 if (beg < 0 || beg + a_len >= length ()) | 113 if (beg < 0 || beg + a_len >= length ()) |
| 114 { | 114 { |
| 115 (*current_liboctave_error_handler) ("range error for fill"); | 115 (*current_liboctave_error_handler) ("range error for fill"); |
| 116 return *this; | 116 return *this; |
| 117 } | 117 } |
| 123 } | 123 } |
| 124 | 124 |
| 125 FloatDiagMatrix& | 125 FloatDiagMatrix& |
| 126 FloatDiagMatrix::fill (const FloatRowVector& a, octave_idx_type beg) | 126 FloatDiagMatrix::fill (const FloatRowVector& a, octave_idx_type beg) |
| 127 { | 127 { |
| 128 octave_idx_type a_len = a.length (); | 128 octave_idx_type a_len = a.numel (); |
| 129 if (beg < 0 || beg + a_len >= length ()) | 129 if (beg < 0 || beg + a_len >= length ()) |
| 130 { | 130 { |
| 131 (*current_liboctave_error_handler) ("range error for fill"); | 131 (*current_liboctave_error_handler) ("range error for fill"); |
| 132 return *this; | 132 return *this; |
| 133 } | 133 } |