Mercurial > octave-nkf

comparison liboctave/array/PermMatrix.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 d63878346099
children aa9ca67f09fb
comparison
equal deleted inserted replaced
18083:938f01339043 18084:8e056300994b
117 117
118 bool neg = false; 118 bool neg = false;
119 119
120 for (octave_idx_type i = 0; i < len; i++) 120 for (octave_idx_type i = 0; i < len; i++)
121 { 121 {
122 octave_idx_type j = p[i], k = q[i]; 122 octave_idx_type j = p[i];
123 octave_idx_type k = q[i];
123 if (j != i) 124 if (j != i)
124 { 125 {
125 p[k] = p[i]; 126 p[k] = p[i];
126 q[j] = q[i]; 127 q[j] = q[i];
127 neg = ! neg; 128 neg = ! neg;
189 } 190 }
190 191
191 PermMatrix 192 PermMatrix
192 operator *(const PermMatrix& a, const PermMatrix& b) 193 operator *(const PermMatrix& a, const PermMatrix& b)
193 { 194 {
194 const Array<octave_idx_type> ia = a.pvec (), ib = b.pvec (); 195 const Array<octave_idx_type> ia = a.pvec ();
196 const Array<octave_idx_type> ib = b.pvec ();
195 PermMatrix r; 197 PermMatrix r;
196 octave_idx_type n = a.columns (); 198 octave_idx_type n = a.columns ();
197 if (n != b.rows ()) 199 if (n != b.rows ())
198 gripe_nonconformant ("operator *", n, n, b.rows (), b.rows ()); 200 gripe_nonconformant ("operator *", n, n, b.rows (), b.rows ());
199 else if (a._colp == b._colp) 201 else if (a._colp == b._colp)