Mercurial > octave-nkf
comparison liboctave/numeric/SparsedbleLU.cc @ 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 | 4197fc428c7d |
children |
comparison
equal
deleted
inserted
replaced
20262:9f484edd8767 | 20263:00cf2847355d |
---|---|
55 | 55 |
56 double tmp = octave_sparse_params::get_key ("spumoni"); | 56 double tmp = octave_sparse_params::get_key ("spumoni"); |
57 if (!xisnan (tmp)) | 57 if (!xisnan (tmp)) |
58 Control (UMFPACK_PRL) = tmp; | 58 Control (UMFPACK_PRL) = tmp; |
59 | 59 |
60 if (piv_thres.nelem () == 2) | 60 if (piv_thres.numel () == 2) |
61 { | 61 { |
62 tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0)); | 62 tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0)); |
63 if (!xisnan (tmp)) | 63 if (!xisnan (tmp)) |
64 Control (UMFPACK_PIVOT_TOLERANCE) = tmp; | 64 Control (UMFPACK_PIVOT_TOLERANCE) = tmp; |
65 tmp = (piv_thres (1) > 1. ? 1. : piv_thres (1)); | 65 tmp = (piv_thres (1) > 1. ? 1. : piv_thres (1)); |
251 | 251 |
252 double tmp = octave_sparse_params::get_key ("spumoni"); | 252 double tmp = octave_sparse_params::get_key ("spumoni"); |
253 if (!xisnan (tmp)) | 253 if (!xisnan (tmp)) |
254 Control (UMFPACK_PRL) = tmp; | 254 Control (UMFPACK_PRL) = tmp; |
255 | 255 |
256 if (piv_thres.nelem () == 2) | 256 if (piv_thres.numel () == 2) |
257 { | 257 { |
258 tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0)); | 258 tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0)); |
259 if (!xisnan (tmp)) | 259 if (!xisnan (tmp)) |
260 Control (UMFPACK_PIVOT_TOLERANCE) = tmp; | 260 Control (UMFPACK_PIVOT_TOLERANCE) = tmp; |
261 tmp = (piv_thres (1) > 1. ? 1. : piv_thres (1)); | 261 tmp = (piv_thres (1) > 1. ? 1. : piv_thres (1)); |