Mercurial > octave

comparison liboctave/array/CDiagMatrix.cc @ 20232:a9574e3c6e9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e39e05d90788
comparison
equal deleted inserted replaced
20231:83792dd9bcc1 20232:a9574e3c6e9e
108 108
109 ComplexDiagMatrix& 109 ComplexDiagMatrix&
110 ComplexDiagMatrix::fill (const ColumnVector& a) 110 ComplexDiagMatrix::fill (const ColumnVector& a)
111 { 111 {
112 octave_idx_type len = length (); 112 octave_idx_type len = length ();
113 if (a.length () != len) 113 if (a.numel () != len)
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 }
118 118
124 124
125 ComplexDiagMatrix& 125 ComplexDiagMatrix&
126 ComplexDiagMatrix::fill (const ComplexColumnVector& a) 126 ComplexDiagMatrix::fill (const ComplexColumnVector& a)
127 { 127 {
128 octave_idx_type len = length (); 128 octave_idx_type len = length ();
129 if (a.length () != len) 129 if (a.numel () != len)
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 }
134 134
140 140
141 ComplexDiagMatrix& 141 ComplexDiagMatrix&
142 ComplexDiagMatrix::fill (const RowVector& a) 142 ComplexDiagMatrix::fill (const RowVector& a)
143 { 143 {
144 octave_idx_type len = length (); 144 octave_idx_type len = length ();
145 if (a.length () != len) 145 if (a.numel () != len)
146 { 146 {
147 (*current_liboctave_error_handler) ("range error for fill"); 147 (*current_liboctave_error_handler) ("range error for fill");
148 return *this; 148 return *this;
149 } 149 }
150 150
156 156
157 ComplexDiagMatrix& 157 ComplexDiagMatrix&
158 ComplexDiagMatrix::fill (const ComplexRowVector& a) 158 ComplexDiagMatrix::fill (const ComplexRowVector& a)
159 { 159 {
160 octave_idx_type len = length (); 160 octave_idx_type len = length ();
161 if (a.length () != len) 161 if (a.numel () != len)
162 { 162 {
163 (*current_liboctave_error_handler) ("range error for fill"); 163 (*current_liboctave_error_handler) ("range error for fill");
164 return *this; 164 return *this;
165 } 165 }
166 166
171 } 171 }
172 172
173 ComplexDiagMatrix& 173 ComplexDiagMatrix&
174 ComplexDiagMatrix::fill (const ColumnVector& a, octave_idx_type beg) 174 ComplexDiagMatrix::fill (const ColumnVector& a, octave_idx_type beg)
175 { 175 {
176 octave_idx_type a_len = a.length (); 176 octave_idx_type a_len = a.numel ();
177 if (beg < 0 || beg + a_len >= length ()) 177 if (beg < 0 || beg + a_len >= length ())
178 { 178 {
179 (*current_liboctave_error_handler) ("range error for fill"); 179 (*current_liboctave_error_handler) ("range error for fill");
180 return *this; 180 return *this;
181 } 181 }
187 } 187 }
188 188
189 ComplexDiagMatrix& 189 ComplexDiagMatrix&
190 ComplexDiagMatrix::fill (const ComplexColumnVector& a, octave_idx_type beg) 190 ComplexDiagMatrix::fill (const ComplexColumnVector& a, octave_idx_type beg)
191 { 191 {
192 octave_idx_type a_len = a.length (); 192 octave_idx_type a_len = a.numel ();
193 if (beg < 0 || beg + a_len >= length ()) 193 if (beg < 0 || beg + a_len >= length ())
194 { 194 {
195 (*current_liboctave_error_handler) ("range error for fill"); 195 (*current_liboctave_error_handler) ("range error for fill");
196 return *this; 196 return *this;
197 } 197 }
203 } 203 }
204 204
205 ComplexDiagMatrix& 205 ComplexDiagMatrix&
206 ComplexDiagMatrix::fill (const RowVector& a, octave_idx_type beg) 206 ComplexDiagMatrix::fill (const RowVector& a, octave_idx_type beg)
207 { 207 {
208 octave_idx_type a_len = a.length (); 208 octave_idx_type a_len = a.numel ();
209 if (beg < 0 || beg + a_len >= length ()) 209 if (beg < 0 || beg + a_len >= length ())
210 { 210 {
211 (*current_liboctave_error_handler) ("range error for fill"); 211 (*current_liboctave_error_handler) ("range error for fill");
212 return *this; 212 return *this;
213 } 213 }
219 } 219 }
220 220
221 ComplexDiagMatrix& 221 ComplexDiagMatrix&
222 ComplexDiagMatrix::fill (const ComplexRowVector& a, octave_idx_type beg) 222 ComplexDiagMatrix::fill (const ComplexRowVector& a, octave_idx_type beg)
223 { 223 {
224 octave_idx_type a_len = a.length (); 224 octave_idx_type a_len = a.numel ();
225 if (beg < 0 || beg + a_len >= length ()) 225 if (beg < 0 || beg + a_len >= length ())
226 { 226 {
227 (*current_liboctave_error_handler) ("range error for fill"); 227 (*current_liboctave_error_handler) ("range error for fill");
228 return *this; 228 return *this;
229 } 229 }