Mercurial > hg > octave-nkf

comparison liboctave/array/fDiagMatrix.cc @ 18084:8e056300994b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Follow coding convention of defining and initializing only 1 variable per line in liboctave. * liboctave/array/Array-b.cc, liboctave/array/Array-util.cc, liboctave/array/Array.cc, liboctave/array/CDiagMatrix.cc, liboctave/array/CMatrix.cc, liboctave/array/CSparse.cc, liboctave/array/MDiagArray2.cc, liboctave/array/MatrixType.cc, liboctave/array/PermMatrix.cc, liboctave/array/Sparse.cc, liboctave/array/Sparse.h, liboctave/array/boolSparse.cc, liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc, liboctave/array/dSparse.cc, liboctave/array/dim-vector.cc, liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc, liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc, liboctave/array/idx-vector.cc, liboctave/array/idx-vector.h, liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc, liboctave/numeric/base-qr.cc, liboctave/numeric/bsxfun-defs.cc, liboctave/numeric/bsxfun.h, liboctave/numeric/dbleLU.cc, liboctave/numeric/dbleQR.cc, liboctave/numeric/fCmplxLU.cc, liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc, liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-convn.cc, liboctave/numeric/oct-norm.cc, liboctave/numeric/sparse-dmsolve.cc, liboctave/operators/mx-inlines.cc, liboctave/operators/mx-op-defs.h, liboctave/util/caseless-str.h, liboctave/util/kpse.cc, liboctave/util/lo-utils.cc, liboctave/util/oct-binmap.h, liboctave/util/oct-cmplx.h, liboctave/util/oct-inttypes.cc, liboctave/util/oct-inttypes.h, liboctave/util/oct-sort.cc: Follow coding convention of defining and initializing only 1 variable per line in liboctave.
author Rik <rik@octave.org>
date Wed, 04 Dec 2013 22:13:18 -0800
parents 49a5a4be04a1
children c5a101de2d88
comparison
equal deleted inserted replaced
18083:938f01339043 18084:8e056300994b
327 if (a_nc != b_nr) 327 if (a_nc != b_nr)
328 gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); 328 gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
329 329
330 FloatDiagMatrix c (a_nr, b_nc); 330 FloatDiagMatrix c (a_nr, b_nc);
331 331
332 octave_idx_type len = c.length (), lenm = len < a_nc ? len : a_nc; 332 octave_idx_type len = c.length ();
333 octave_idx_type lenm = len < a_nc ? len : a_nc;
333 334
334 for (octave_idx_type i = 0; i < lenm; i++) 335 for (octave_idx_type i = 0; i < lenm; i++)
335 c.dgxelem (i) = a.dgelem (i) * b.dgelem (i); 336 c.dgxelem (i) = a.dgelem (i) * b.dgelem (i);
336 for (octave_idx_type i = lenm; i < len; i++) 337 for (octave_idx_type i = lenm; i < len; i++)
337 c.dgxelem (i) = 0.0f; 338 c.dgxelem (i) = 0.0f;
362 363
363 float 364 float
364 FloatDiagMatrix::rcond (void) const 365 FloatDiagMatrix::rcond (void) const
365 { 366 {
366 FloatColumnVector av = extract_diag (0).map<float> (fabsf); 367 FloatColumnVector av = extract_diag (0).map<float> (fabsf);
367 float amx = av.max (), amn = av.min (); 368 float amx = av.max ();
369 float amn = av.min ();
368 return amx == 0 ? 0.0f : amn / amx; 370 return amx == 0 ? 0.0f : amn / amx;
369 } 371 }
370 372
371 std::ostream& 373 std::ostream&
372 operator << (std::ostream& os, const FloatDiagMatrix& a) 374 operator << (std::ostream& os, const FloatDiagMatrix& a)