Mercurial > octave-nkf

comparison liboctave/array/MatrixType.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 5bd1ca29c5f0
comparison
equal deleted inserted replaced
18083:938f01339043 18084:8e056300994b
89 for (octave_idx_type j = 0; 89 for (octave_idx_type j = 0;
90 j < ncols && (upper || lower || hermitian); j++) 90 j < ncols && (upper || lower || hermitian); j++)
91 { 91 {
92 for (octave_idx_type i = 0; i < j; i++) 92 for (octave_idx_type i = 0; i < j; i++)
93 { 93 {
94 double aij = a.elem (i,j), aji = a.elem (j,i); 94 double aij = a.elem (i,j);
95 double aji = a.elem (j,i);
95 lower = lower && (aij == zero); 96 lower = lower && (aij == zero);
96 upper = upper && (aji == zero); 97 upper = upper && (aji == zero);
97 hermitian = hermitian && (aij == aji 98 hermitian = hermitian && (aij == aji
98 && aij*aij < diag[i]*diag[j]); 99 && aij*aij < diag[i]*diag[j]);
99 } 100 }
147 for (octave_idx_type j = 0; 148 for (octave_idx_type j = 0;
148 j < ncols && (upper || lower || hermitian); j++) 149 j < ncols && (upper || lower || hermitian); j++)
149 { 150 {
150 for (octave_idx_type i = 0; i < j; i++) 151 for (octave_idx_type i = 0; i < j; i++)
151 { 152 {
152 std::complex<T> aij = a.elem (i,j), aji = a.elem (j,i); 153 std::complex<T> aij = a.elem (i,j);
154 std::complex<T> aji = a.elem (j,i);
153 lower = lower && (aij == zero); 155 lower = lower && (aij == zero);
154 upper = upper && (aji == zero); 156 upper = upper && (aji == zero);
155 hermitian = hermitian && (aij == std::conj (aji) 157 hermitian = hermitian && (aij == std::conj (aji)
156 && std::norm (aij) < diag[i]*diag[j]); 158 && std::norm (aij) < diag[i]*diag[j]);
157 } 159 }