Mercurial > octave-nkf
comparison liboctave/numeric/CmplxCHOL.cc @ 20267: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 | 5ce959c55cc0 |
comparison
equal
deleted
inserted
replaced
20266:83792dd9bcc1 | 20267:a9574e3c6e9e |
---|---|
198 void | 198 void |
199 ComplexCHOL::update (const ComplexColumnVector& u) | 199 ComplexCHOL::update (const ComplexColumnVector& u) |
200 { | 200 { |
201 octave_idx_type n = chol_mat.rows (); | 201 octave_idx_type n = chol_mat.rows (); |
202 | 202 |
203 if (u.length () == n) | 203 if (u.numel () == n) |
204 { | 204 { |
205 ComplexColumnVector utmp = u; | 205 ComplexColumnVector utmp = u; |
206 | 206 |
207 OCTAVE_LOCAL_BUFFER (double, rw, n); | 207 OCTAVE_LOCAL_BUFFER (double, rw, n); |
208 | 208 |
218 { | 218 { |
219 octave_idx_type info = -1; | 219 octave_idx_type info = -1; |
220 | 220 |
221 octave_idx_type n = chol_mat.rows (); | 221 octave_idx_type n = chol_mat.rows (); |
222 | 222 |
223 if (u.length () == n) | 223 if (u.numel () == n) |
224 { | 224 { |
225 ComplexColumnVector utmp = u; | 225 ComplexColumnVector utmp = u; |
226 | 226 |
227 OCTAVE_LOCAL_BUFFER (double, rw, n); | 227 OCTAVE_LOCAL_BUFFER (double, rw, n); |
228 | 228 |
240 { | 240 { |
241 octave_idx_type info = -1; | 241 octave_idx_type info = -1; |
242 | 242 |
243 octave_idx_type n = chol_mat.rows (); | 243 octave_idx_type n = chol_mat.rows (); |
244 | 244 |
245 if (u.length () != n + 1) | 245 if (u.numel () != n + 1) |
246 (*current_liboctave_error_handler) ("cholinsert: dimension mismatch"); | 246 (*current_liboctave_error_handler) ("cholinsert: dimension mismatch"); |
247 else if (j < 0 || j > n) | 247 else if (j < 0 || j > n) |
248 (*current_liboctave_error_handler) ("cholinsert: index out of range"); | 248 (*current_liboctave_error_handler) ("cholinsert: index out of range"); |
249 else | 249 else |
250 { | 250 { |
303 { | 303 { |
304 warn_qrupdate_once (); | 304 warn_qrupdate_once (); |
305 | 305 |
306 octave_idx_type n = chol_mat.rows (); | 306 octave_idx_type n = chol_mat.rows (); |
307 | 307 |
308 if (u.length () == n) | 308 if (u.numel () == n) |
309 { | 309 { |
310 init (chol_mat.hermitian () * chol_mat | 310 init (chol_mat.hermitian () * chol_mat |
311 + ComplexMatrix (u) * ComplexMatrix (u).hermitian (), false); | 311 + ComplexMatrix (u) * ComplexMatrix (u).hermitian (), false); |
312 } | 312 } |
313 else | 313 else |
329 | 329 |
330 octave_idx_type info = -1; | 330 octave_idx_type info = -1; |
331 | 331 |
332 octave_idx_type n = chol_mat.rows (); | 332 octave_idx_type n = chol_mat.rows (); |
333 | 333 |
334 if (u.length () == n) | 334 if (u.numel () == n) |
335 { | 335 { |
336 if (singular (chol_mat)) | 336 if (singular (chol_mat)) |
337 info = 2; | 337 info = 2; |
338 else | 338 else |
339 { | 339 { |
356 | 356 |
357 octave_idx_type info = -1; | 357 octave_idx_type info = -1; |
358 | 358 |
359 octave_idx_type n = chol_mat.rows (); | 359 octave_idx_type n = chol_mat.rows (); |
360 | 360 |
361 if (u.length () != n + 1) | 361 if (u.numel () != n + 1) |
362 (*current_liboctave_error_handler) ("cholinsert: dimension mismatch"); | 362 (*current_liboctave_error_handler) ("cholinsert: dimension mismatch"); |
363 else if (j < 0 || j > n) | 363 else if (j < 0 || j > n) |
364 (*current_liboctave_error_handler) ("cholinsert: index out of range"); | 364 (*current_liboctave_error_handler) ("cholinsert: index out of range"); |
365 else | 365 else |
366 { | 366 { |