Mercurial > octave-nkf

comparison liboctave/array/dRowVector.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 4197fc428c7d
children 16b9ec39ff46
comparison
equal deleted inserted replaced
20266:83792dd9bcc1 20267:a9574e3c6e9e
56 // Row Vector class. 56 // Row Vector class.
57 57
58 bool 58 bool
59 RowVector::operator == (const RowVector& a) const 59 RowVector::operator == (const RowVector& a) const
60 { 60 {
61 octave_idx_type len = length (); 61 octave_idx_type len = numel ();
62 if (len != a.length ()) 62 if (len != a.numel ())
63 return 0; 63 return 0;
64 return mx_inline_equal (len, data (), a.data ()); 64 return mx_inline_equal (len, data (), a.data ());
65 } 65 }
66 66
67 bool 67 bool
71 } 71 }
72 72
73 RowVector& 73 RowVector&
74 RowVector::insert (const RowVector& a, octave_idx_type c) 74 RowVector::insert (const RowVector& a, octave_idx_type c)
75 { 75 {
76 octave_idx_type a_len = a.length (); 76 octave_idx_type a_len = a.numel ();
77 77
78 if (c < 0 || c + a_len > length ()) 78 if (c < 0 || c + a_len > numel ())
79 { 79 {
80 (*current_liboctave_error_handler) ("range error for insert"); 80 (*current_liboctave_error_handler) ("range error for insert");
81 return *this; 81 return *this;
82 } 82 }
83 83
93 } 93 }
94 94
95 RowVector& 95 RowVector&
96 RowVector::fill (double val) 96 RowVector::fill (double val)
97 { 97 {
98 octave_idx_type len = length (); 98 octave_idx_type len = numel ();
99 99
100 if (len > 0) 100 if (len > 0)
101 { 101 {
102 make_unique (); 102 make_unique ();
103 103
109 } 109 }
110 110
111 RowVector& 111 RowVector&
112 RowVector::fill (double val, octave_idx_type c1, octave_idx_type c2) 112 RowVector::fill (double val, octave_idx_type c1, octave_idx_type c2)
113 { 113 {
114 octave_idx_type len = length (); 114 octave_idx_type len = numel ();
115 115
116 if (c1 < 0 || c2 < 0 || c1 >= len || c2 >= len) 116 if (c1 < 0 || c2 < 0 || c1 >= len || c2 >= len)
117 { 117 {
118 (*current_liboctave_error_handler) ("range error for fill"); 118 (*current_liboctave_error_handler) ("range error for fill");
119 return *this; 119 return *this;
133 } 133 }
134 134
135 RowVector 135 RowVector
136 RowVector::append (const RowVector& a) const 136 RowVector::append (const RowVector& a) const
137 { 137 {
138 octave_idx_type len = length (); 138 octave_idx_type len = numel ();
139 octave_idx_type nc_insert = len; 139 octave_idx_type nc_insert = len;
140 RowVector retval (len + a.length ()); 140 RowVector retval (len + a.numel ());
141 retval.insert (*this, 0); 141 retval.insert (*this, 0);
142 retval.insert (a, nc_insert); 142 retval.insert (a, nc_insert);
143 return retval; 143 return retval;
144 } 144 }
145 145
192 RowVector 192 RowVector
193 operator * (const RowVector& v, const Matrix& a) 193 operator * (const RowVector& v, const Matrix& a)
194 { 194 {
195 RowVector retval; 195 RowVector retval;
196 196
197 octave_idx_type len = v.length (); 197 octave_idx_type len = v.numel ();
198 198
199 octave_idx_type a_nr = a.rows (); 199 octave_idx_type a_nr = a.rows ();
200 octave_idx_type a_nc = a.cols (); 200 octave_idx_type a_nc = a.cols ();
201 201
202 if (a_nr != len) 202 if (a_nr != len)
227 // other operations 227 // other operations
228 228
229 double 229 double
230 RowVector::min (void) const 230 RowVector::min (void) const
231 { 231 {
232 octave_idx_type len = length (); 232 octave_idx_type len = numel ();
233 if (len == 0) 233 if (len == 0)
234 return 0; 234 return 0;
235 235
236 double res = elem (0); 236 double res = elem (0);
237 237
243 } 243 }
244 244
245 double 245 double
246 RowVector::max (void) const 246 RowVector::max (void) const
247 { 247 {
248 octave_idx_type len = length (); 248 octave_idx_type len = numel ();
249 if (len == 0) 249 if (len == 0)
250 return 0; 250 return 0;
251 251
252 double res = elem (0); 252 double res = elem (0);
253 253
261 std::ostream& 261 std::ostream&
262 operator << (std::ostream& os, const RowVector& a) 262 operator << (std::ostream& os, const RowVector& a)
263 { 263 {
264 // int field_width = os.precision () + 7; 264 // int field_width = os.precision () + 7;
265 265
266 for (octave_idx_type i = 0; i < a.length (); i++) 266 for (octave_idx_type i = 0; i < a.numel (); i++)
267 os << " " /* setw (field_width) */ << a.elem (i); 267 os << " " /* setw (field_width) */ << a.elem (i);
268 return os; 268 return os;
269 } 269 }
270 270
271 std::istream& 271 std::istream&
272 operator >> (std::istream& is, RowVector& a) 272 operator >> (std::istream& is, RowVector& a)
273 { 273 {
274 octave_idx_type len = a.length (); 274 octave_idx_type len = a.numel ();
275 275
276 if (len > 0) 276 if (len > 0)
277 { 277 {
278 double tmp; 278 double tmp;
279 for (octave_idx_type i = 0; i < len; i++) 279 for (octave_idx_type i = 0; i < len; i++)
311 double 311 double
312 operator * (const RowVector& v, const ColumnVector& a) 312 operator * (const RowVector& v, const ColumnVector& a)
313 { 313 {
314 double retval = 0.0; 314 double retval = 0.0;
315 315
316 octave_idx_type len = v.length (); 316 octave_idx_type len = v.numel ();
317 317
318 octave_idx_type a_len = a.length (); 318 octave_idx_type a_len = a.numel ();
319 319
320 if (len != a_len) 320 if (len != a_len)
321 gripe_nonconformant ("operator *", len, a_len); 321 gripe_nonconformant ("operator *", len, a_len);
322 else if (len != 0) 322 else if (len != 0)
323 F77_FUNC (xddot, XDDOT) (len, v.data (), 1, a.data (), 1, retval); 323 F77_FUNC (xddot, XDDOT) (len, v.data (), 1, a.data (), 1, retval);