Mercurial > octave-nkf

comparison liboctave/array/Sparse.cc @ 20267: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 5dfaaaae784f
children dd6345fd8a97
comparison
equal deleted inserted replaced
20266:83792dd9bcc1 20267:a9574e3c6e9e
644 ("Sparse::Sparse (const Array<T>&): dimension mismatch"); 644 ("Sparse::Sparse (const Array<T>&): dimension mismatch");
645 else 645 else
646 { 646 {
647 octave_idx_type nr = rows (); 647 octave_idx_type nr = rows ();
648 octave_idx_type nc = cols (); 648 octave_idx_type nc = cols ();
649 octave_idx_type len = a.length (); 649 octave_idx_type len = a.numel ();
650 octave_idx_type new_nzmx = 0; 650 octave_idx_type new_nzmx = 0;
651 651
652 // First count the number of nonzero terms 652 // First count the number of nonzero terms
653 for (octave_idx_type i = 0; i < len; i++) 653 for (octave_idx_type i = 0; i < len; i++)
654 if (a(i) != T ()) 654 if (a(i) != T ())
702 { 702 {
703 octave_idx_type retval = -1; 703 octave_idx_type retval = -1;
704 704
705 octave_idx_type n = dimensions.length (); 705 octave_idx_type n = dimensions.length ();
706 706
707 if (n > 0 && n == ra_idx.length ()) 707 if (n > 0 && n == ra_idx.numel ())
708 { 708 {
709 retval = ra_idx(--n); 709 retval = ra_idx(--n);
710 710
711 while (--n >= 0) 711 while (--n >= 0)
712 { 712 {
765 { 765 {
766 std::ostringstream buf; 766 std::ostringstream buf;
767 767
768 buf << fcn << " ("; 768 buf << fcn << " (";
769 769
770 octave_idx_type n = ra_idx.length (); 770 octave_idx_type n = ra_idx.numel ();
771 771
772 if (n > 0) 772 if (n > 0)
773 buf << ra_idx(0); 773 buf << ra_idx(0);
774 774
775 for (octave_idx_type i = 1; i < n; i++) 775 for (octave_idx_type i = 1; i < n; i++)
790 { 790 {
791 std::ostringstream buf; 791 std::ostringstream buf;
792 792
793 buf << fcn << " ("; 793 buf << fcn << " (";
794 794
795 octave_idx_type n = ra_idx.length (); 795 octave_idx_type n = ra_idx.numel ();
796 796
797 if (n > 0) 797 if (n > 0)
798 buf << ra_idx(0); 798 buf << ra_idx(0);
799 799
800 for (octave_idx_type i = 1; i < n; i++) 800 for (octave_idx_type i = 1; i < n; i++)
884 // The only valid permutations of a sparse array are [1, 2] and [2, 1]. 884 // The only valid permutations of a sparse array are [1, 2] and [2, 1].
885 885
886 bool fail = false; 886 bool fail = false;
887 bool trans = false; 887 bool trans = false;
888 888
889 if (perm_vec.length () == 2) 889 if (perm_vec.numel () == 2)
890 { 890 {
891 if (perm_vec(0) == 0 && perm_vec(1) == 1) 891 if (perm_vec(0) == 0 && perm_vec(1) == 1)
892 /* do nothing */; 892 /* do nothing */;
893 else if (perm_vec(0) == 1 && perm_vec(1) == 0) 893 else if (perm_vec(0) == 1 && perm_vec(1) == 0)
894 trans = true; 894 trans = true;
1080 template <class T> 1080 template <class T>
1081 Sparse<T>& 1081 Sparse<T>&
1082 Sparse<T>::insert (const Sparse<T>& a, const Array<octave_idx_type>& ra_idx) 1082 Sparse<T>::insert (const Sparse<T>& a, const Array<octave_idx_type>& ra_idx)
1083 { 1083 {
1084 1084
1085 if (ra_idx.length () != 2) 1085 if (ra_idx.numel () != 2)
1086 { 1086 {
1087 (*current_liboctave_error_handler) ("range error for insert"); 1087 (*current_liboctave_error_handler) ("range error for insert");
1088 return *this; 1088 return *this;
1089 } 1089 }
1090 1090
2242 Sparse<T> m = *this; 2242 Sparse<T> m = *this;
2243 2243
2244 octave_idx_type nr = m.rows (); 2244 octave_idx_type nr = m.rows ();
2245 octave_idx_type nc = m.columns (); 2245 octave_idx_type nc = m.columns ();
2246 2246
2247 if (m.length () < 1 || dim > 1) 2247 if (m.numel () < 1 || dim > 1)
2248 return m; 2248 return m;
2249 2249
2250 if (dim > 0) 2250 if (dim > 0)
2251 { 2251 {
2252 m = m.transpose (); 2252 m = m.transpose ();
2308 Sparse<T> m = *this; 2308 Sparse<T> m = *this;
2309 2309
2310 octave_idx_type nr = m.rows (); 2310 octave_idx_type nr = m.rows ();
2311 octave_idx_type nc = m.columns (); 2311 octave_idx_type nc = m.columns ();
2312 2312
2313 if (m.length () < 1 || dim > 1) 2313 if (m.numel () < 1 || dim > 1)
2314 { 2314 {
2315 sidx = Array<octave_idx_type> (dim_vector (nr, nc), 1); 2315 sidx = Array<octave_idx_type> (dim_vector (nr, nc), 1);
2316 return m; 2316 return m;
2317 } 2317 }
2318 2318