Mercurial > octave-nkf

comparison liboctave/array/fCDiagMatrix.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
450 if (a_nc != b_nr) 450 if (a_nc != b_nr)
451 gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); 451 gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
452 452
453 FloatComplexDiagMatrix c (a_nr, b_nc); 453 FloatComplexDiagMatrix c (a_nr, b_nc);
454 454
455 octave_idx_type len = c.length (), lenm = len < a_nc ? len : a_nc; 455 octave_idx_type len = c.length ();
456 octave_idx_type lenm = len < a_nc ? len : a_nc;
456 457
457 for (octave_idx_type i = 0; i < lenm; i++) 458 for (octave_idx_type i = 0; i < lenm; i++)
458 c.dgxelem (i) = a.dgelem (i) * b.dgelem (i); 459 c.dgxelem (i) = a.dgelem (i) * b.dgelem (i);
459 for (octave_idx_type i = lenm; i < len; i++) 460 for (octave_idx_type i = lenm; i < len; i++)
460 c.dgxelem (i) = 0.0f; 461 c.dgxelem (i) = 0.0f;
551 552
552 float 553 float
553 FloatComplexDiagMatrix::rcond (void) const 554 FloatComplexDiagMatrix::rcond (void) const
554 { 555 {
555 FloatColumnVector av = extract_diag (0).map<float> (std::abs); 556 FloatColumnVector av = extract_diag (0).map<float> (std::abs);
556 float amx = av.max (), amn = av.min (); 557 float amx = av.max ();
558 float amn = av.min ();
557 return amx == 0 ? 0.0f : amn / amx; 559 return amx == 0 ? 0.0f : amn / amx;
558 } 560 }
559 561
560 // i/o 562 // i/o
561 563