Mercurial > octave-nkf

comparison liboctave/array/fCMatrix.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 4a4897cd6da1
comparison
equal deleted inserted replaced
18083:938f01339043 18084:8e056300994b
3793 xgemm (const FloatComplexMatrix& a, const FloatComplexMatrix& b, 3793 xgemm (const FloatComplexMatrix& a, const FloatComplexMatrix& b,
3794 blas_trans_type transa, blas_trans_type transb) 3794 blas_trans_type transa, blas_trans_type transb)
3795 { 3795 {
3796 FloatComplexMatrix retval; 3796 FloatComplexMatrix retval;
3797 3797
3798 bool tra = transa != blas_no_trans, trb = transb != blas_no_trans; 3798 bool tra = transa != blas_no_trans;
3799 bool cja = transa == blas_conj_trans, cjb = transb == blas_conj_trans; 3799 bool trb = transb != blas_no_trans;
3800 bool cja = transa == blas_conj_trans;
3801 bool cjb = transb == blas_conj_trans;
3800 3802
3801 octave_idx_type a_nr = tra ? a.cols () : a.rows (); 3803 octave_idx_type a_nr = tra ? a.cols () : a.rows ();
3802 octave_idx_type a_nc = tra ? a.rows () : a.cols (); 3804 octave_idx_type a_nc = tra ? a.rows () : a.cols ();
3803 3805
3804 octave_idx_type b_nr = trb ? b.cols () : b.rows (); 3806 octave_idx_type b_nr = trb ? b.cols () : b.rows ();
3850 } 3852 }
3851 3853
3852 } 3854 }
3853 else 3855 else
3854 { 3856 {
3855 octave_idx_type lda = a.rows (), tda = a.cols (); 3857 octave_idx_type lda = a.rows ();
3856 octave_idx_type ldb = b.rows (), tdb = b.cols (); 3858 octave_idx_type tda = a.cols ();
3859 octave_idx_type ldb = b.rows ();
3860 octave_idx_type tdb = b.cols ();
3857 3861
3858 retval = FloatComplexMatrix (a_nr, b_nc, 0.0); 3862 retval = FloatComplexMatrix (a_nr, b_nc, 0.0);
3859 FloatComplex *c = retval.fortran_vec (); 3863 FloatComplex *c = retval.fortran_vec ();
3860 3864
3861 if (b_nc == 1 && a_nr == 1) 3865 if (b_nc == 1 && a_nr == 1)