Mercurial > octave-nkf
comparison liboctave/numeric/floatCHOL.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 |
---|---|
203 void | 203 void |
204 FloatCHOL::update (const FloatColumnVector& u) | 204 FloatCHOL::update (const FloatColumnVector& u) |
205 { | 205 { |
206 octave_idx_type n = chol_mat.rows (); | 206 octave_idx_type n = chol_mat.rows (); |
207 | 207 |
208 if (u.length () == n) | 208 if (u.numel () == n) |
209 { | 209 { |
210 FloatColumnVector utmp = u; | 210 FloatColumnVector utmp = u; |
211 | 211 |
212 OCTAVE_LOCAL_BUFFER (float, w, n); | 212 OCTAVE_LOCAL_BUFFER (float, w, n); |
213 | 213 |
223 { | 223 { |
224 octave_idx_type info = -1; | 224 octave_idx_type info = -1; |
225 | 225 |
226 octave_idx_type n = chol_mat.rows (); | 226 octave_idx_type n = chol_mat.rows (); |
227 | 227 |
228 if (u.length () == n) | 228 if (u.numel () == n) |
229 { | 229 { |
230 FloatColumnVector utmp = u; | 230 FloatColumnVector utmp = u; |
231 | 231 |
232 OCTAVE_LOCAL_BUFFER (float, w, n); | 232 OCTAVE_LOCAL_BUFFER (float, w, n); |
233 | 233 |
245 { | 245 { |
246 octave_idx_type info = -1; | 246 octave_idx_type info = -1; |
247 | 247 |
248 octave_idx_type n = chol_mat.rows (); | 248 octave_idx_type n = chol_mat.rows (); |
249 | 249 |
250 if (u.length () != n + 1) | 250 if (u.numel () != n + 1) |
251 (*current_liboctave_error_handler) ("cholinsert: dimension mismatch"); | 251 (*current_liboctave_error_handler) ("cholinsert: dimension mismatch"); |
252 else if (j < 0 || j > n) | 252 else if (j < 0 || j > n) |
253 (*current_liboctave_error_handler) ("cholinsert: index out of range"); | 253 (*current_liboctave_error_handler) ("cholinsert: index out of range"); |
254 else | 254 else |
255 { | 255 { |
307 { | 307 { |
308 warn_qrupdate_once (); | 308 warn_qrupdate_once (); |
309 | 309 |
310 octave_idx_type n = chol_mat.rows (); | 310 octave_idx_type n = chol_mat.rows (); |
311 | 311 |
312 if (u.length () == n) | 312 if (u.numel () == n) |
313 { | 313 { |
314 init (chol_mat.transpose () * chol_mat | 314 init (chol_mat.transpose () * chol_mat |
315 + FloatMatrix (u) * FloatMatrix (u).transpose (), false); | 315 + FloatMatrix (u) * FloatMatrix (u).transpose (), false); |
316 } | 316 } |
317 else | 317 else |
333 | 333 |
334 octave_idx_type info = -1; | 334 octave_idx_type info = -1; |
335 | 335 |
336 octave_idx_type n = chol_mat.rows (); | 336 octave_idx_type n = chol_mat.rows (); |
337 | 337 |
338 if (u.length () == n) | 338 if (u.numel () == n) |
339 { | 339 { |
340 if (singular (chol_mat)) | 340 if (singular (chol_mat)) |
341 info = 2; | 341 info = 2; |
342 else | 342 else |
343 { | 343 { |
359 | 359 |
360 octave_idx_type info = -1; | 360 octave_idx_type info = -1; |
361 | 361 |
362 octave_idx_type n = chol_mat.rows (); | 362 octave_idx_type n = chol_mat.rows (); |
363 | 363 |
364 if (u.length () != n + 1) | 364 if (u.numel () != n + 1) |
365 (*current_liboctave_error_handler) ("cholinsert: dimension mismatch"); | 365 (*current_liboctave_error_handler) ("cholinsert: dimension mismatch"); |
366 else if (j < 0 || j > n) | 366 else if (j < 0 || j > n) |
367 (*current_liboctave_error_handler) ("cholinsert: index out of range"); | 367 (*current_liboctave_error_handler) ("cholinsert: index out of range"); |
368 else | 368 else |
369 { | 369 { |