Mercurial > octave-nkf

comparison liboctave/array/CMatrix.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 938f01339043
children cb37b17b6091 b314efd58072
comparison
equal deleted inserted replaced
18083:938f01339043 18084:8e056300994b
3769 xgemm (const ComplexMatrix& a, const ComplexMatrix& b, 3769 xgemm (const ComplexMatrix& a, const ComplexMatrix& b,
3770 blas_trans_type transa, blas_trans_type transb) 3770 blas_trans_type transa, blas_trans_type transb)
3771 { 3771 {
3772 ComplexMatrix retval; 3772 ComplexMatrix retval;
3773 3773
3774 bool tra = transa != blas_no_trans, trb = transb != blas_no_trans; 3774 bool tra = transa != blas_no_trans;
3775 bool cja = transa == blas_conj_trans, cjb = transb == blas_conj_trans; 3775 bool trb = transb != blas_no_trans;
3776 bool cja = transa == blas_conj_trans;
3777 bool cjb = transb == blas_conj_trans;
3776 3778
3777 octave_idx_type a_nr = tra ? a.cols () : a.rows (); 3779 octave_idx_type a_nr = tra ? a.cols () : a.rows ();
3778 octave_idx_type a_nc = tra ? a.rows () : a.cols (); 3780 octave_idx_type a_nc = tra ? a.rows () : a.cols ();
3779 3781
3780 octave_idx_type b_nr = trb ? b.cols () : b.rows (); 3782 octave_idx_type b_nr = trb ? b.cols () : b.rows ();
3826 } 3828 }
3827 3829
3828 } 3830 }
3829 else 3831 else
3830 { 3832 {
3831 octave_idx_type lda = a.rows (), tda = a.cols (); 3833 octave_idx_type lda = a.rows ();
3832 octave_idx_type ldb = b.rows (), tdb = b.cols (); 3834 octave_idx_type tda = a.cols ();
3835 octave_idx_type ldb = b.rows ();
3836 octave_idx_type tdb = b.cols ();
3833 3837
3834 retval = ComplexMatrix (a_nr, b_nc, 0.0); 3838 retval = ComplexMatrix (a_nr, b_nc, 0.0);
3835 Complex *c = retval.fortran_vec (); 3839 Complex *c = retval.fortran_vec ();
3836 3840
3837 if (b_nc == 1 && a_nr == 1) 3841 if (b_nc == 1 && a_nr == 1)