Mercurial > octave
changeset 15018:3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
* Array-util.cc, Array.cc, Array.h, CMatrix.cc, CNDArray.cc, CSparse.cc,
CmplxQR.cc, CollocWt.cc, DASPK.cc, DASRT.cc, DASSL.cc, EIG.cc, LSODE.cc,
MSparse.cc, MatrixType.cc, Sparse-op-defs.h, Sparse-perm-op-defs.h, Sparse.cc,
Sparse.h, SparseCmplxCHOL.cc, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseQR.cc,
SparsedbleCHOL.cc, SparsedbleLU.cc, boolSparse.cc, cmd-hist.cc, dDiagMatrix.cc,
dMatrix.cc, dNDArray.cc, dSparse.cc, data-conv.cc, dbleQR.cc, dbleSVD.cc,
dim-vector.cc, eigs-base.cc, f2c-main.c, fCMatrix.cc, fCNDArray.cc,
fCmplxQR.cc, fEIG.cc, fMatrix.cc, fNDArray.cc, floatQR.cc, floatSVD.cc,
idx-vector.cc, kpse.cc, lo-specfun.cc, mx-inlines.cc, mx-op-defs.h,
oct-alloc.cc, oct-binmap.h, oct-fftw.cc, oct-group.h, oct-inttypes.cc,
oct-inttypes.h, oct-locbuf.cc, oct-md5.cc, oct-rand.cc, oct-sort.cc,
oct-syscalls.cc, randgamma.c, randmtzig.c, randpoisson.c, sparse-base-chol.cc,
sparse-base-lu.cc, sparse-dmsolve.cc, str-vec.cc, str-vec.h, tempnam.c,
tempname.c: Use Octave coding conventions for cuddled parentheses in liboctave/.
line wrap: on
line diff
--- a/liboctave/Array-util.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/Array-util.cc Thu Jul 26 08:13:22 2012 -0700 @@ -445,7 +445,7 @@ if (all_colons) { rdv = rhdv; - rdv.resize(ial, 1); + rdv.resize (ial, 1); } else if (nonsc == rhdvl) { @@ -466,7 +466,7 @@ { if (scalar[i]) continue; if (colon[i]) - rdv(i) = (j < rhdv0l) ? rhdv0(j++) : 1; + rdv(i) = (j < rhdv0l) ? rhdv0(j++) : 1; } }
--- a/liboctave/Array.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/Array.cc Thu Jul 26 08:13:22 2012 -0700 @@ -723,17 +723,17 @@ // FIXME -- this is for Matlab compatibility. Matlab 2007 given // - // b = ones(3,1) + // b = ones (3,1) // // yields the following: // - // b(zeros(0,0)) gives [] - // b(zeros(1,0)) gives zeros(0,1) - // b(zeros(0,1)) gives zeros(0,1) - // b(zeros(0,m)) gives zeros(0,m) - // b(zeros(m,0)) gives zeros(m,0) - // b(1:2) gives ones(2,1) - // b(ones(2)) gives ones(2) etc. + // b(zeros (0,0)) gives [] + // b(zeros (1,0)) gives zeros (0,1) + // b(zeros (0,1)) gives zeros (0,1) + // b(zeros (0,m)) gives zeros (0,m) + // b(zeros (m,0)) gives zeros (m,0) + // b(1:2) gives ones (2,1) + // b(ones (2)) gives ones (2) etc. // // As you can see, the behaviour is weird, but the tests end up pretty // simple. Nah, I don't want to suggest that this is ad hoc :) @@ -2223,13 +2223,13 @@ } // Fixup return dimensions, for Matlab compatibility. - // find(zeros(0,0)) -> zeros(0,0) - // find(zeros(1,0)) -> zeros(1,0) - // find(zeros(0,1)) -> zeros(0,1) - // find(zeros(0,X)) -> zeros(0,1) - // find(zeros(1,1)) -> zeros(0,0) !!!! WHY? - // find(zeros(0,1,0)) -> zeros(0,0) - // find(zeros(0,1,0,1)) -> zeros(0,0) etc + // find (zeros (0,0)) -> zeros (0,0) + // find (zeros (1,0)) -> zeros (1,0) + // find (zeros (0,1)) -> zeros (0,1) + // find (zeros (0,X)) -> zeros (0,1) + // find (zeros (1,1)) -> zeros (0,0) !!!! WHY? + // find (zeros (0,1,0)) -> zeros (0,0) + // find (zeros (0,1,0,1)) -> zeros (0,0) etc if ((numel () == 1 && retval.is_empty ()) || (rows () == 0 && dims ().numel (1) == 0)) @@ -2741,7 +2741,7 @@ for (octave_idx_type k = 0; k < cols; k++) { ra_idx(1) = k; - os << " " << a.elem(ra_idx); + os << " " << a.elem (ra_idx); } os << "\n"; } @@ -2753,7 +2753,7 @@ for (octave_idx_type k = 0; k < rows; k++) { ra_idx(0) = k; - os << " " << a.elem(ra_idx); + os << " " << a.elem (ra_idx); } break; } @@ -2781,7 +2781,7 @@ for (octave_idx_type k = 0; k < cols; k++) { ra_idx(1) = k; - os << " " << a.elem(ra_idx); + os << " " << a.elem (ra_idx); } os << "\n";
--- a/liboctave/Array.h Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/Array.h Thu Jul 26 08:13:22 2012 -0700 @@ -332,8 +332,8 @@ // No checking, even for multiple references, ever. - T& xelem (octave_idx_type n) { return slice_data [n]; } - crefT xelem (octave_idx_type n) const { return slice_data [n]; } + T& xelem (octave_idx_type n) { return slice_data[n]; } + crefT xelem (octave_idx_type n) const { return slice_data[n]; } T& xelem (octave_idx_type i, octave_idx_type j) { return xelem (dim1 ()*j+i); } crefT xelem (octave_idx_type i, octave_idx_type j) const { return xelem (dim1 ()*j+i); }
--- a/liboctave/CMatrix.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/CMatrix.cc Thu Jul 26 08:13:22 2012 -0700 @@ -1079,7 +1079,7 @@ F77_XFCN (zgetri, ZGETRI, (nc, tmp_data, nr, pipvt, z.fortran_vec (), lwork, info)); - lwork = static_cast<octave_idx_type> (std::real(z(0))); + lwork = static_cast<octave_idx_type> (std::real (z(0))); lwork = (lwork < 2 *nc ? 2*nc : lwork); z.resize (dim_vector (lwork, 1)); Complex *pz = z.fortran_vec (); @@ -1089,7 +1089,7 @@ // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = retval.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + anorm = retval.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); F77_XFCN (zgetrf, ZGETRF, (nc, nc, tmp_data, nr, pipvt, info)); @@ -1163,7 +1163,7 @@ } if (!mattype.is_hermitian ()) - ret = finverse(mattype, info, rcon, force, calc_cond); + ret = finverse (mattype, info, rcon, force, calc_cond); if ((mattype.is_hermitian () || calc_cond) && rcon == 0.) ret = ComplexMatrix (rows (), columns (), Complex (octave_Inf, 0.)); @@ -1832,7 +1832,7 @@ Array<octave_idx_type> ipvt (dim_vector (nr, 1)); octave_idx_type *pipvt = ipvt.fortran_vec (); - if(anorm < 0.) + if (anorm < 0.) anorm = atmp.abs ().sum (). row(static_cast<octave_idx_type>(0)).max (); @@ -2100,7 +2100,7 @@ char job = 'L'; ComplexMatrix atmp = *this; Complex *tmp_data = atmp.fortran_vec (); - anorm = atmp.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + anorm = atmp.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, tmp_data, nr, info @@ -2184,7 +2184,7 @@ // Calculate the norm of the matrix, for later use. if (anorm < 0.) - anorm = atmp.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + anorm = atmp.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); F77_XFCN (zgetrf, ZGETRF, (nr, nr, tmp_data, nr, pipvt, info)); @@ -2410,7 +2410,7 @@ ComplexMatrix tmp (b); tmp = solve (typ, tmp, info, rcon, sing_handler, true, transt); - return tmp.column(static_cast<octave_idx_type> (0)); + return tmp.column (static_cast<octave_idx_type> (0)); } ComplexMatrix
--- a/liboctave/CNDArray.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/CNDArray.cc Thu Jul 26 08:13:22 2012 -0700 @@ -240,7 +240,7 @@ octave_quit (); for (octave_idx_type i = 0; i < npts; i++) - tmp[i] = elem((i + k*npts)*stride + j*dist); + tmp[i] = elem ((i + k*npts)*stride + j*dist); F77_FUNC (zfftf, ZFFTF) (npts, tmp, pwsave); @@ -287,7 +287,7 @@ octave_quit (); for (octave_idx_type i = 0; i < npts; i++) - tmp[i] = elem((i + k*npts)*stride + j*dist); + tmp[i] = elem ((i + k*npts)*stride + j*dist); F77_FUNC (zfftb, ZFFTB) (npts, tmp, pwsave);
--- a/liboctave/CSparse.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/CSparse.cc Thu Jul 26 08:13:22 2012 -0700 @@ -172,7 +172,7 @@ } } for (octave_idx_type i = l; i <= a.cols (); i++) - cidx(i) = j; + cidx (i) = j; } bool SparseComplexMatrix::operator == (const SparseComplexMatrix& a) const @@ -188,11 +188,11 @@ return false; for (octave_idx_type i = 0; i < nc + 1; i++) - if (cidx(i) != a.cidx(i)) + if (cidx (i) != a.cidx (i)) return false; for (octave_idx_type i = 0; i < nz; i++) - if (data(i) != a.data(i) || ridx(i) != a.ridx(i)) + if (data (i) != a.data (i) || ridx (i) != a.ridx (i)) return false; return true; @@ -214,19 +214,19 @@ { for (octave_idx_type j = 0; j < nc; j++) { - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - { - octave_idx_type ri = ridx(i); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + { + octave_idx_type ri = ridx (i); if (ri != j) { bool found = false; - for (octave_idx_type k = cidx(ri); k < cidx(ri+1); k++) + for (octave_idx_type k = cidx (ri); k < cidx (ri+1); k++) { - if (ridx(k) == j) + if (ridx (k) == j) { - if (data(i) == conj(data(k))) + if (data (i) == conj (data (k))) found = true; break; } @@ -277,9 +277,9 @@ Complex tmp_max; double abs_max = octave_NaN; octave_idx_type idx_j = 0; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - { - if (ridx(i) != idx_j) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + { + if (ridx (i) != idx_j) break; else idx_j++; @@ -291,7 +291,7 @@ abs_max = 0.; } - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { Complex tmp = data (i); @@ -332,30 +332,30 @@ { idx_arg.resize (dim_vector (nr, 1), 0); - for (octave_idx_type i = cidx(0); i < cidx(1); i++) - idx_arg.elem(ridx(i)) = -1; + for (octave_idx_type i = cidx (0); i < cidx (1); i++) + idx_arg.elem (ridx (i)) = -1; for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - if (idx_arg.elem(i) != -1) + if (idx_arg.elem (i) != -1) continue; bool found = false; - for (octave_idx_type k = cidx(j); k < cidx(j+1); k++) - if (ridx(k) == i) + for (octave_idx_type k = cidx (j); k < cidx (j+1); k++) + if (ridx (k) == i) { found = true; break; } if (!found) - idx_arg.elem(i) = j; + idx_arg.elem (i) = j; } for (octave_idx_type j = 0; j < nc; j++) { - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ir = ridx (i); octave_idx_type ix = idx_arg.elem (ir); @@ -363,14 +363,14 @@ if (xisnan (tmp)) continue; - else if (ix == -1 || std::abs(tmp) > std::abs(elem (ir, ix))) + else if (ix == -1 || std::abs (tmp) > std::abs (elem (ir, ix))) idx_arg.elem (ir) = j; } } octave_idx_type nel = 0; for (octave_idx_type j = 0; j < nr; j++) - if (idx_arg.elem(j) == -1 || elem (j, idx_arg.elem (j)) != 0.) + if (idx_arg.elem (j) == -1 || elem (j, idx_arg.elem (j)) != 0.) nel++; result = SparseComplexMatrix (nr, 1, nel); @@ -432,9 +432,9 @@ Complex tmp_min; double abs_min = octave_NaN; octave_idx_type idx_j = 0; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - { - if (ridx(i) != idx_j) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + { + if (ridx (i) != idx_j) break; else idx_j++; @@ -446,7 +446,7 @@ abs_min = 0.; } - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { Complex tmp = data (i); @@ -487,30 +487,30 @@ { idx_arg.resize (dim_vector (nr, 1), 0); - for (octave_idx_type i = cidx(0); i < cidx(1); i++) - idx_arg.elem(ridx(i)) = -1; + for (octave_idx_type i = cidx (0); i < cidx (1); i++) + idx_arg.elem (ridx (i)) = -1; for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - if (idx_arg.elem(i) != -1) + if (idx_arg.elem (i) != -1) continue; bool found = false; - for (octave_idx_type k = cidx(j); k < cidx(j+1); k++) - if (ridx(k) == i) + for (octave_idx_type k = cidx (j); k < cidx (j+1); k++) + if (ridx (k) == i) { found = true; break; } if (!found) - idx_arg.elem(i) = j; + idx_arg.elem (i) = j; } for (octave_idx_type j = 0; j < nc; j++) { - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ir = ridx (i); octave_idx_type ix = idx_arg.elem (ir); @@ -518,14 +518,14 @@ if (xisnan (tmp)) continue; - else if (ix == -1 || std::abs(tmp) < std::abs(elem (ir, ix))) + else if (ix == -1 || std::abs (tmp) < std::abs (elem (ir, ix))) idx_arg.elem (ir) = j; } } octave_idx_type nel = 0; for (octave_idx_type j = 0; j < nr; j++) - if (idx_arg.elem(j) == -1 || elem (j, idx_arg.elem (j)) != 0.) + if (idx_arg.elem (j) == -1 || elem (j, idx_arg.elem (j)) != 0.) nel++; result = SparseComplexMatrix (nr, 1, nel); @@ -663,7 +663,7 @@ // retval.xcidx[1:nr] holds row entry *start* offsets for rows 0:(nr-1) for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type k = cidx(j); k < cidx(j+1); k++) + for (octave_idx_type k = cidx (j); k < cidx (j+1); k++) { octave_idx_type q = retval.xcidx (ridx (k) + 1)++; retval.xridx (q) = j; @@ -755,7 +755,7 @@ double dmax = 0., dmin = octave_Inf; for (octave_idx_type i = 0; i < nr; i++) { - double tmp = std::abs(v[i]); + double tmp = std::abs (v[i]); if (tmp > dmax) dmax = tmp; if (tmp < dmin) @@ -805,8 +805,8 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -831,9 +831,9 @@ retval.change_capacity (nz2); } - retval.xcidx(i) = cx; - retval.xridx(cx) = i; - retval.xdata(cx) = 1.0; + retval.xcidx (i) = cx; + retval.xridx (cx) = i; + retval.xdata (cx) = 1.0; cx++; // iterate accross columns of input matrix @@ -841,11 +841,11 @@ { Complex v = 0.; // iterate to calculate sum - octave_idx_type colXp = retval.xcidx(i); - octave_idx_type colUp = cidx(j); + octave_idx_type colXp = retval.xcidx (i); + octave_idx_type colUp = cidx (j); octave_idx_type rpX, rpU; - if (cidx(j) == cidx(j+1)) + if (cidx (j) == cidx (j+1)) { (*current_liboctave_error_handler) ("division by zero"); @@ -855,8 +855,8 @@ do { octave_quit (); - rpX = retval.xridx(colXp); - rpU = ridx(colUp); + rpX = retval.xridx (colXp); + rpU = ridx (colUp); if (rpX < rpU) colXp++; @@ -864,7 +864,7 @@ colUp++; else { - v -= retval.xdata(colXp) * data(colUp); + v -= retval.xdata (colXp) * data (colUp); colXp++; colUp++; } @@ -874,11 +874,11 @@ // get A(m,m) if (typ == MatrixType::Upper) - colUp = cidx(j+1) - 1; + colUp = cidx (j+1) - 1; else - colUp = cidx(j); - Complex pivot = data(colUp); - if (pivot == 0. || ridx(colUp) != j) + colUp = cidx (j); + Complex pivot = data (colUp); + if (pivot == 0. || ridx (colUp) != j) { (*current_liboctave_error_handler) ("division by zero"); @@ -893,8 +893,8 @@ retval.change_capacity (nz2); } - retval.xridx(cx) = j; - retval.xdata(cx) = v / pivot; + retval.xridx (cx) = j; + retval.xdata (cx) = v / pivot; cx++; } } @@ -902,11 +902,11 @@ // get A(m,m) octave_idx_type colUp; if (typ == MatrixType::Upper) - colUp = cidx(i+1) - 1; + colUp = cidx (i+1) - 1; else - colUp = cidx(i); - Complex pivot = data(colUp); - if (pivot == 0. || ridx(colUp) != i) + colUp = cidx (i); + Complex pivot = data (colUp); + if (pivot == 0. || ridx (colUp) != i) { (*current_liboctave_error_handler) ("division by zero"); goto inverse_singular; @@ -914,9 +914,9 @@ if (pivot != 1.0) for (octave_idx_type j = cx_colstart; j < cx; j++) - retval.xdata(j) /= pivot; - } - retval.xcidx(nr) = cx; + retval.xdata (j) /= pivot; + } + retval.xcidx (nr) = cx; retval.maybe_compress (); } else @@ -960,19 +960,19 @@ Complex v = 0.; octave_idx_type jidx = perm[j]; // iterate to calculate sum - for (octave_idx_type k = cidx(jidx); - k < cidx(jidx+1); k++) + for (octave_idx_type k = cidx (jidx); + k < cidx (jidx+1); k++) { octave_quit (); - v -= work[ridx(k)] * data(k); + v -= work[ridx (k)] * data (k); } // get A(m,m) Complex pivot; if (typ == MatrixType::Permuted_Upper) - pivot = data(cidx(jidx+1) - 1); + pivot = data (cidx (jidx+1) - 1); else - pivot = data(cidx(jidx)); + pivot = data (cidx (jidx)); if (pivot == 0.) { (*current_liboctave_error_handler) @@ -986,11 +986,11 @@ // get A(m,m) octave_idx_type colUp; if (typ == MatrixType::Permuted_Upper) - colUp = cidx(perm[iidx]+1) - 1; + colUp = cidx (perm[iidx]+1) - 1; else - colUp = cidx(perm[iidx]); - - Complex pivot = data(colUp); + colUp = cidx (perm[iidx]); + + Complex pivot = data (colUp); if (pivot == 0.) { (*current_liboctave_error_handler) @@ -1013,16 +1013,16 @@ retval.change_capacity (nz2); } - retval.xcidx(i) = cx; + retval.xcidx (i) = cx; for (octave_idx_type j = iidx; j < nr; j++) if (work[j] != 0.) { - retval.xridx(cx) = j; - retval.xdata(cx++) = work[j]; + retval.xridx (cx) = j; + retval.xdata (cx++) = work[j]; } } - retval.xcidx(nr) = cx; + retval.xcidx (nr) = cx; retval.maybe_compress (); } @@ -1032,9 +1032,9 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = retval.cidx(j); - i < retval.cidx(j+1); i++) - atmp += std::abs(retval.data(i)); + for (octave_idx_type i = retval.cidx (j); + i < retval.cidx (j+1); i++) + atmp += std::abs (retval.data (i)); if (atmp > ainvnorm) ainvnorm = atmp; } @@ -1083,7 +1083,7 @@ double rcond2; SparseMatrix Q = fact.Q (); SparseComplexMatrix InvL = fact.L ().transpose (). - tinverse(tmp_typ, info, rcond2, true, false); + tinverse (tmp_typ, info, rcond2, true, false); ret = Q * InvL.hermitian () * InvL * Q.transpose (); } else @@ -1106,9 +1106,9 @@ rcond = fact.rcond (); double rcond2; SparseComplexMatrix InvL = fact.L ().transpose (). - tinverse(tmp_typ, info, rcond2, true, false); + tinverse (tmp_typ, info, rcond2, true, false); SparseComplexMatrix InvU = fact.U (). - tinverse(tmp_typ, info, rcond2, true, false).transpose (); + tinverse (tmp_typ, info, rcond2, true, false).transpose (); ret = fact.Pc ().transpose () * InvU * InvL * fact.Pr (); } } @@ -1279,7 +1279,7 @@ if (typ == MatrixType::Diagonal || typ == MatrixType::Permuted_Diagonal) { - retval.resize (nc, b.cols (), Complex(0.,0.)); + retval.resize (nc, b.cols (), Complex (0.,0.)); if (typ == MatrixType::Diagonal) for (octave_idx_type j = 0; j < b.cols (); j++) for (octave_idx_type i = 0; i < nm; i++) @@ -1287,15 +1287,15 @@ else for (octave_idx_type j = 0; j < b.cols (); j++) for (octave_idx_type k = 0; k < nc; k++) - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - retval(k,j) = b(ridx(i),j) / data (i); + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + retval(k,j) = b(ridx (i),j) / data (i); if (calc_cond) { double dmax = 0., dmin = octave_Inf; for (octave_idx_type i = 0; i < nm; i++) { - double tmp = std::abs(data(i)); + double tmp = std::abs (data (i)); if (tmp > dmax) dmax = tmp; if (tmp < dmin) @@ -1344,30 +1344,30 @@ octave_idx_type b_nz = b.nnz (); retval = SparseComplexMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; if (typ == MatrixType::Diagonal) for (octave_idx_type j = 0; j < b.cols (); j++) { - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) { - if (b.ridx(i) >= nm) + if (b.ridx (i) >= nm) break; - retval.xridx (ii) = b.ridx(i); - retval.xdata (ii++) = b.data(i) / data (b.ridx (i)); + retval.xridx (ii) = b.ridx (i); + retval.xdata (ii++) = b.data (i) / data (b.ridx (i)); } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } else for (octave_idx_type j = 0; j < b.cols (); j++) { for (octave_idx_type l = 0; l < nc; l++) - for (octave_idx_type i = cidx(l); i < cidx(l+1); i++) + for (octave_idx_type i = cidx (l); i < cidx (l+1); i++) { bool found = false; octave_idx_type k; - for (k = b.cidx(j); k < b.cidx(j+1); k++) - if (ridx(i) == b.ridx(k)) + for (k = b.cidx (j); k < b.cidx (j+1); k++) + if (ridx (i) == b.ridx (k)) { found = true; break; @@ -1375,10 +1375,10 @@ if (found) { retval.xridx (ii) = l; - retval.xdata (ii++) = b.data(k) / data (i); + retval.xdata (ii++) = b.data (k) / data (i); } } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } if (calc_cond) @@ -1386,7 +1386,7 @@ double dmax = 0., dmin = octave_Inf; for (octave_idx_type i = 0; i < nm; i++) { - double tmp = std::abs(data(i)); + double tmp = std::abs (data (i)); if (tmp > dmax) dmax = tmp; if (tmp < dmin) @@ -1431,7 +1431,7 @@ if (typ == MatrixType::Diagonal || typ == MatrixType::Permuted_Diagonal) { - retval.resize (nc, b.cols (), Complex(0.,0.)); + retval.resize (nc, b.cols (), Complex (0.,0.)); if (typ == MatrixType::Diagonal) for (octave_idx_type j = 0; j < b.cols (); j++) for (octave_idx_type i = 0; i < nm; i++) @@ -1439,15 +1439,15 @@ else for (octave_idx_type j = 0; j < b.cols (); j++) for (octave_idx_type k = 0; k < nc; k++) - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - retval(k,j) = b(ridx(i),j) / data (i); + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + retval(k,j) = b(ridx (i),j) / data (i); if (calc_cond) { double dmax = 0., dmin = octave_Inf; for (octave_idx_type i = 0; i < nr; i++) { - double tmp = std::abs(data(i)); + double tmp = std::abs (data (i)); if (tmp > dmax) dmax = tmp; if (tmp < dmin) @@ -1496,30 +1496,30 @@ octave_idx_type b_nz = b.nnz (); retval = SparseComplexMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; if (typ == MatrixType::Diagonal) for (octave_idx_type j = 0; j < b.cols (); j++) { - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) { - if (b.ridx(i) >= nm) + if (b.ridx (i) >= nm) break; - retval.xridx (ii) = b.ridx(i); - retval.xdata (ii++) = b.data(i) / data (b.ridx (i)); + retval.xridx (ii) = b.ridx (i); + retval.xdata (ii++) = b.data (i) / data (b.ridx (i)); } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } else for (octave_idx_type j = 0; j < b.cols (); j++) { for (octave_idx_type l = 0; l < nc; l++) - for (octave_idx_type i = cidx(l); i < cidx(l+1); i++) + for (octave_idx_type i = cidx (l); i < cidx (l+1); i++) { bool found = false; octave_idx_type k; - for (k = b.cidx(j); k < b.cidx(j+1); k++) - if (ridx(i) == b.ridx(k)) + for (k = b.cidx (j); k < b.cidx (j+1); k++) + if (ridx (i) == b.ridx (k)) { found = true; break; @@ -1527,10 +1527,10 @@ if (found) { retval.xridx (ii) = l; - retval.xdata (ii++) = b.data(k) / data (i); + retval.xdata (ii++) = b.data (k) / data (i); } } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } if (calc_cond) @@ -1538,7 +1538,7 @@ double dmax = 0., dmin = octave_Inf; for (octave_idx_type i = 0; i < nm; i++) { - double tmp = std::abs(data(i)); + double tmp = std::abs (data (i)); if (tmp > dmax) dmax = tmp; if (tmp < dmin) @@ -1594,8 +1594,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -1620,20 +1620,20 @@ if (work[k] != 0.) { - if (ridx(cidx(kidx+1)-1) != k || - data(cidx(kidx+1)-1) == 0.) + if (ridx (cidx (kidx+1)-1) != k || + data (cidx (kidx+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(kidx+1)-1); + Complex tmp = work[k] / data (cidx (kidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(kidx); - i < cidx(kidx+1)-1; i++) + for (octave_idx_type i = cidx (kidx); + i < cidx (kidx+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -1658,20 +1658,20 @@ if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(iidx+1)-1); + Complex tmp = work[k] / data (cidx (iidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(iidx); - i < cidx(iidx+1)-1; i++) + for (octave_idx_type i = cidx (iidx); + i < cidx (iidx+1)-1; i++) { - octave_idx_type idx2 = ridx(i); - work[idx2] = work[idx2] - tmp * data(i); + octave_idx_type idx2 = ridx (i); + work[idx2] = work[idx2] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -1696,19 +1696,19 @@ { if (work[k] != 0.) { - if (ridx(cidx(k+1)-1) != k || - data(cidx(k+1)-1) == 0.) + if (ridx (cidx (k+1)-1) != k || + data (cidx (k+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(k+1)-1); + Complex tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -1731,20 +1731,20 @@ { if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(k+1)-1); + Complex tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -1829,8 +1829,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -1839,7 +1839,7 @@ octave_idx_type b_nc = b.cols (); octave_idx_type b_nz = b.nnz (); retval = SparseComplexMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; octave_idx_type x_nz = b_nz; @@ -1856,8 +1856,8 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); for (octave_idx_type k = nc-1; k >= 0; k--) { @@ -1865,20 +1865,20 @@ if (work[k] != 0.) { - if (ridx(cidx(kidx+1)-1) != k || - data(cidx(kidx+1)-1) == 0.) + if (ridx (cidx (kidx+1)-1) != k || + data (cidx (kidx+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(kidx+1)-1); + Complex tmp = work[k] / data (cidx (kidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(kidx); - i < cidx(kidx+1)-1; i++) + for (octave_idx_type i = cidx (kidx); + i < cidx (kidx+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -1901,10 +1901,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[rperm[i]] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[rperm[i]]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[rperm[i]]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -1925,20 +1925,20 @@ if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(iidx+1)-1); + Complex tmp = work[k] / data (cidx (iidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(iidx); - i < cidx(iidx+1)-1; i++) + for (octave_idx_type i = cidx (iidx); + i < cidx (iidx+1)-1; i++) { - octave_idx_type idx2 = ridx(i); - work[idx2] = work[idx2] - tmp * data(i); + octave_idx_type idx2 = ridx (i); + work[idx2] = work[idx2] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -1955,26 +1955,26 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); for (octave_idx_type k = nc-1; k >= 0; k--) { if (work[k] != 0.) { - if (ridx(cidx(k+1)-1) != k || - data(cidx(k+1)-1) == 0.) + if (ridx (cidx (k+1)-1) != k || + data (cidx (k+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(k+1)-1); + Complex tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -1997,10 +1997,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -2019,20 +2019,20 @@ { if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(k+1)-1); + Complex tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2117,8 +2117,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -2143,20 +2143,20 @@ if (work[k] != 0.) { - if (ridx(cidx(kidx+1)-1) != k || - data(cidx(kidx+1)-1) == 0.) + if (ridx (cidx (kidx+1)-1) != k || + data (cidx (kidx+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(kidx+1)-1); + Complex tmp = work[k] / data (cidx (kidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(kidx); - i < cidx(kidx+1)-1; i++) + for (octave_idx_type i = cidx (kidx); + i < cidx (kidx+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2181,20 +2181,20 @@ if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(iidx+1)-1); + Complex tmp = work[k] / data (cidx (iidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(iidx); - i < cidx(iidx+1)-1; i++) + for (octave_idx_type i = cidx (iidx); + i < cidx (iidx+1)-1; i++) { - octave_idx_type idx2 = ridx(i); - work[idx2] = work[idx2] - tmp * data(i); + octave_idx_type idx2 = ridx (i); + work[idx2] = work[idx2] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2219,19 +2219,19 @@ { if (work[k] != 0.) { - if (ridx(cidx(k+1)-1) != k || - data(cidx(k+1)-1) == 0.) + if (ridx (cidx (k+1)-1) != k || + data (cidx (k+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(k+1)-1); + Complex tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2254,20 +2254,20 @@ { if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(k+1)-1); + Complex tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2352,8 +2352,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -2362,7 +2362,7 @@ octave_idx_type b_nc = b.cols (); octave_idx_type b_nz = b.nnz (); retval = SparseComplexMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; octave_idx_type x_nz = b_nz; @@ -2379,8 +2379,8 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); for (octave_idx_type k = nc-1; k >= 0; k--) { @@ -2388,20 +2388,20 @@ if (work[k] != 0.) { - if (ridx(cidx(kidx+1)-1) != k || - data(cidx(kidx+1)-1) == 0.) + if (ridx (cidx (kidx+1)-1) != k || + data (cidx (kidx+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(kidx+1)-1); + Complex tmp = work[k] / data (cidx (kidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(kidx); - i < cidx(kidx+1)-1; i++) + for (octave_idx_type i = cidx (kidx); + i < cidx (kidx+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2424,10 +2424,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[rperm[i]] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[rperm[i]]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[rperm[i]]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -2448,20 +2448,20 @@ if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(iidx+1)-1); + Complex tmp = work[k] / data (cidx (iidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(iidx); - i < cidx(iidx+1)-1; i++) + for (octave_idx_type i = cidx (iidx); + i < cidx (iidx+1)-1; i++) { - octave_idx_type idx2 = ridx(i); - work[idx2] = work[idx2] - tmp * data(i); + octave_idx_type idx2 = ridx (i); + work[idx2] = work[idx2] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2478,26 +2478,26 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); for (octave_idx_type k = nr-1; k >= 0; k--) { if (work[k] != 0.) { - if (ridx(cidx(k+1)-1) != k || - data(cidx(k+1)-1) == 0.) + if (ridx (cidx (k+1)-1) != k || + data (cidx (k+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(k+1)-1); + Complex tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2520,10 +2520,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -2542,20 +2542,20 @@ { if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(k+1)-1); + Complex tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2641,8 +2641,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -2668,10 +2668,10 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } @@ -2681,15 +2681,15 @@ goto triangular_error; } - Complex tmp = work[k] / data(mini); + Complex tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2715,24 +2715,24 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - Complex tmp = work[k] / data(mini); + Complex tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2740,7 +2740,7 @@ double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2764,19 +2764,19 @@ { if (work[k] != 0.) { - if (ridx(cidx(k)) != k || - data(cidx(k)) == 0.) + if (ridx (cidx (k)) != k || + data (cidx (k)) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(k)); + Complex tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2799,20 +2799,20 @@ if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(k)); + Complex tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; + i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2897,8 +2897,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -2907,7 +2907,7 @@ octave_idx_type b_nc = b.cols (); octave_idx_type b_nz = b.nnz (); retval = SparseComplexMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; octave_idx_type x_nz = b_nz; @@ -2920,8 +2920,8 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[perm[b.ridx(i)]] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[perm[b.ridx (i)]] = b.data (i); for (octave_idx_type k = 0; k < nc; k++) { @@ -2930,10 +2930,10 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } @@ -2943,15 +2943,15 @@ goto triangular_error; } - Complex tmp = work[k] / data(mini); + Complex tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2974,10 +2974,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -2999,24 +2999,24 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - Complex tmp = work[k] / data(mini); + Complex tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3024,7 +3024,7 @@ double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3041,26 +3041,26 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); for (octave_idx_type k = 0; k < nc; k++) { if (work[k] != 0.) { - if (ridx(cidx(k)) != k || - data(cidx(k)) == 0.) + if (ridx (cidx (k)) != k || + data (cidx (k)) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(k)); + Complex tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3083,10 +3083,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -3106,20 +3106,20 @@ if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(k)); + Complex tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; + i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3205,8 +3205,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -3232,10 +3232,10 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } @@ -3245,15 +3245,15 @@ goto triangular_error; } - Complex tmp = work[k] / data(mini); + Complex tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3279,24 +3279,24 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - Complex tmp = work[k] / data(mini); + Complex tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3304,7 +3304,7 @@ double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3330,19 +3330,19 @@ { if (work[k] != 0.) { - if (ridx(cidx(k)) != k || - data(cidx(k)) == 0.) + if (ridx (cidx (k)) != k || + data (cidx (k)) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(k)); + Complex tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3366,20 +3366,20 @@ if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(k)); + Complex tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; + i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3464,8 +3464,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -3474,7 +3474,7 @@ octave_idx_type b_nc = b.cols (); octave_idx_type b_nz = b.nnz (); retval = SparseComplexMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; octave_idx_type x_nz = b_nz; @@ -3487,8 +3487,8 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[perm[b.ridx(i)]] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[perm[b.ridx (i)]] = b.data (i); for (octave_idx_type k = 0; k < nc; k++) { @@ -3497,10 +3497,10 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } @@ -3510,15 +3510,15 @@ goto triangular_error; } - Complex tmp = work[k] / data(mini); + Complex tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3541,10 +3541,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -3566,24 +3566,24 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - Complex tmp = work[k] / data(mini); + Complex tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3591,7 +3591,7 @@ double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3608,26 +3608,26 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); for (octave_idx_type k = 0; k < nc; k++) { if (work[k] != 0.) { - if (ridx(cidx(k)) != k || - data(cidx(k)) == 0.) + if (ridx (cidx (k)) != k || + data (cidx (k)) == 0.) { err = -2; goto triangular_error; } - Complex tmp = work[k] / data(cidx(k)); + Complex tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3650,10 +3650,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -3673,20 +3673,20 @@ if (work[k] != 0.) { - Complex tmp = work[k] / data(cidx(k)); + Complex tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; + i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += std::abs(work[i]); + atmp += std::abs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3771,11 +3771,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = std::real(data(ii++)); - DL[j] = data(ii); + D[j] = std::real (data (ii++)); + DL[j] = data (ii); ii += 2; } - D[nc-1] = std::real(data(ii)); + D[nc-1] = std::real (data (ii)); } else { @@ -3787,12 +3787,12 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = std::real(data(i)); - else if (ridx(i) == j + 1) - DL[j] = data(i); + if (ridx (i) == j) + D[j] = std::real (data (i)); + else if (ridx (i) == j + 1) + DL[j] = data (i); } } @@ -3825,11 +3825,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = data(ii++); - DL[j] = data(ii++); - DU[j] = data(ii++); - } - D[nc-1] = data(ii); + D[j] = data (ii++); + DL[j] = data (ii++); + DU[j] = data (ii++); + } + D[nc-1] = data (ii); } else { @@ -3842,14 +3842,14 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = data(i); - else if (ridx(i) == j + 1) - DL[j] = data(i); - else if (ridx(i) == j - 1) - DU[j-1] = data(i); + if (ridx (i) == j) + D[j] = data (i); + else if (ridx (i) == j + 1) + DL[j] = data (i); + else if (ridx (i) == j - 1) + DU[j-1] = data (i); } } @@ -3928,11 +3928,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = data(ii++); - DL[j] = data(ii++); - DU[j] = data(ii++); - } - D[nc-1] = data(ii); + D[j] = data (ii++); + DL[j] = data (ii++); + DU[j] = data (ii++); + } + D[nc-1] = data (ii); } else { @@ -3945,14 +3945,14 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = data(i); - else if (ridx(i) == j + 1) - DL[j] = data(i); - else if (ridx(i) == j - 1) - DU[j-1] = data(i); + if (ridx (i) == j) + D[j] = data (i); + else if (ridx (i) == j + 1) + DL[j] = data (i); + else if (ridx (i) == j - 1) + DU[j-1] = data (i); } } @@ -3979,7 +3979,7 @@ volatile octave_idx_type x_nz = b.nnz (); octave_idx_type b_nc = b.cols (); retval = SparseComplexMatrix (nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; volatile octave_idx_type ii = 0; rcond = 1.0; @@ -3989,8 +3989,8 @@ { for (octave_idx_type i = 0; i < nr; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); F77_XFCN (zgttrs, ZGTTRS, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4016,10 +4016,10 @@ for (octave_idx_type i = 0; i < nr; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -4069,11 +4069,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = std::real(data(ii++)); - DL[j] = data(ii); + D[j] = std::real (data (ii++)); + DL[j] = data (ii); ii += 2; } - D[nc-1] = std::real(data(ii)); + D[nc-1] = std::real (data (ii)); } else { @@ -4085,12 +4085,12 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = std::real (data(i)); - else if (ridx(i) == j + 1) - DL[j] = data(i); + if (ridx (i) == j) + D[j] = std::real (data (i)); + else if (ridx (i) == j + 1) + DL[j] = data (i); } } @@ -4124,11 +4124,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = data(ii++); - DL[j] = data(ii++); - DU[j] = data(ii++); - } - D[nc-1] = data(ii); + D[j] = data (ii++); + DL[j] = data (ii++); + DU[j] = data (ii++); + } + D[nc-1] = data (ii); } else { @@ -4141,14 +4141,14 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = data(i); - else if (ridx(i) == j + 1) - DL[j] = data(i); - else if (ridx(i) == j - 1) - DU[j-1] = data(i); + if (ridx (i) == j) + D[j] = data (i); + else if (ridx (i) == j + 1) + DL[j] = data (i); + else if (ridx (i) == j - 1) + DU[j-1] = data (i); } } @@ -4228,11 +4228,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = data(ii++); - DL[j] = data(ii++); - DU[j] = data(ii++); - } - D[nc-1] = data(ii); + D[j] = data (ii++); + DL[j] = data (ii++); + DU[j] = data (ii++); + } + D[nc-1] = data (ii); } else { @@ -4245,14 +4245,14 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = data(i); - else if (ridx(i) == j + 1) - DL[j] = data(i); - else if (ridx(i) == j - 1) - DU[j-1] = data(i); + if (ridx (i) == j) + D[j] = data (i); + else if (ridx (i) == j + 1) + DL[j] = data (i); + else if (ridx (i) == j - 1) + DU[j-1] = data (i); } } @@ -4286,7 +4286,7 @@ volatile octave_idx_type ii = 0; retval = SparseComplexMatrix (b_nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (volatile octave_idx_type j = 0; j < b_nc; j++) { @@ -4326,11 +4326,11 @@ for (octave_idx_type i = 0; i < nr; i++) if (Bx[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = Bx[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = Bx[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -4383,17 +4383,17 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ri = ridx (i); if (ri >= j) - m_band(ri - j, j) = data(i); + m_band(ri - j, j) = data (i); } // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs ().sum ().row(0).max (); + anorm = m_band.abs ().sum ().row (0).max (); char job = 'L'; F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4490,8 +4490,8 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - m_band(ridx(i) - j + n_lower + n_upper, j) = data(i); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + m_band(ridx (i) - j + n_lower + n_upper, j) = data (i); // Calculate the norm of the matrix, for later use. double anorm; @@ -4500,8 +4500,8 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -4632,17 +4632,17 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ri = ridx (i); if (ri >= j) - m_band(ri - j, j) = data(i); + m_band(ri - j, j) = data (i); } // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs ().sum ().row(0).max (); + anorm = m_band.abs ().sum ().row (0).max (); char job = 'L'; F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4706,7 +4706,7 @@ volatile octave_idx_type ii = 0; retval = SparseComplexMatrix (b_nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (volatile octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type i = 0; i < b_nr; i++) @@ -4740,11 +4740,11 @@ retval.change_capacity (sz); x_nz = sz; } - retval.xdata(ii) = tmp; - retval.xridx(ii++) = i; + retval.xdata (ii) = tmp; + retval.xridx (ii++) = i; } } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -4772,8 +4772,8 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - m_band(ridx(i) - j + n_lower + n_upper, j) = data(i); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + m_band(ridx (i) - j + n_lower + n_upper, j) = data (i); // Calculate the norm of the matrix, for later use. double anorm; @@ -4782,8 +4782,8 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -4855,7 +4855,7 @@ volatile octave_idx_type x_nz = b.nnz (); octave_idx_type b_nc = b.cols (); retval = SparseComplexMatrix (nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; volatile octave_idx_type ii = 0; OCTAVE_LOCAL_BUFFER (Complex, work, nr); @@ -4864,9 +4864,9 @@ { for (octave_idx_type i = 0; i < nr; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); - i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); + i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); F77_XFCN (zgbtrs, ZGBTRS, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4892,10 +4892,10 @@ for (octave_idx_type i = 0; i < nr; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -4950,17 +4950,17 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ri = ridx (i); if (ri >= j) - m_band(ri - j, j) = data(i); + m_band(ri - j, j) = data (i); } // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs ().sum ().row(0).max (); + anorm = m_band.abs ().sum ().row (0).max (); char job = 'L'; F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5057,8 +5057,8 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - m_band(ridx(i) - j + n_lower + n_upper, j) = data(i); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + m_band(ridx (i) - j + n_lower + n_upper, j) = data (i); // Calculate the norm of the matrix, for later use. double anorm; @@ -5067,8 +5067,8 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -5196,17 +5196,17 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ri = ridx (i); if (ri >= j) - m_band(ri - j, j) = data(i); + m_band(ri - j, j) = data (i); } // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs ().sum ().row(0).max (); + anorm = m_band.abs ().sum ().row (0).max (); char job = 'L'; F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5273,7 +5273,7 @@ volatile octave_idx_type ii = 0; retval = SparseComplexMatrix (b_nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (volatile octave_idx_type j = 0; j < b_nc; j++) { @@ -5312,11 +5312,11 @@ for (octave_idx_type i = 0; i < nr; i++) if (Bx[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = Bx[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = Bx[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -5344,8 +5344,8 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - m_band(ridx(i) - j + n_lower + n_upper, j) = data(i); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + m_band(ridx (i) - j + n_lower + n_upper, j) = data (i); // Calculate the norm of the matrix, for later use. double anorm; @@ -5354,8 +5354,8 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += std::abs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += std::abs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -5427,7 +5427,7 @@ volatile octave_idx_type x_nz = b.nnz (); octave_idx_type b_nc = b.cols (); retval = SparseComplexMatrix (nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; volatile octave_idx_type ii = 0; OCTAVE_LOCAL_BUFFER (Complex, Bx, nr); @@ -5437,9 +5437,9 @@ for (octave_idx_type i = 0; i < nr; i++) Bx[i] = 0.; - for (octave_idx_type i = b.cidx(j); - i < b.cidx(j+1); i++) - Bx[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); + i < b.cidx (j+1); i++) + Bx[b.ridx (i)] = b.data (i); F77_XFCN (zgbtrs, ZGBTRS, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5465,10 +5465,10 @@ for (octave_idx_type i = 0; i < nr; i++) if (Bx[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = Bx[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = Bx[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -5736,7 +5736,7 @@ { octave_idx_type jr = j * b.rows (); for (octave_idx_type i = 0; i < b.rows (); i++) - retval.xelem(i,j) = static_cast<Complex *>(X->x)[jr + i]; + retval.xelem (i,j) = static_cast<Complex *>(X->x)[jr + i]; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -5990,12 +5990,12 @@ static_cast<octave_idx_type>(X->nzmax)); for (octave_idx_type j = 0; j <= static_cast<octave_idx_type>(X->ncol); j++) - retval.xcidx(j) = static_cast<octave_idx_type *>(X->p)[j]; + retval.xcidx (j) = static_cast<octave_idx_type *>(X->p)[j]; for (octave_idx_type j = 0; j < static_cast<octave_idx_type>(X->nzmax); j++) { - retval.xridx(j) = static_cast<octave_idx_type *>(X->i)[j]; - retval.xdata(j) = static_cast<Complex *>(X->x)[j]; + retval.xridx (j) = static_cast<octave_idx_type *>(X->i)[j]; + retval.xdata (j) = static_cast<Complex *>(X->x)[j]; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6050,7 +6050,7 @@ OCTAVE_LOCAL_BUFFER (Complex, Xx, b_nr); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (octave_idx_type j = 0; j < b_nc; j++) { @@ -6105,11 +6105,11 @@ retval.change_capacity (sz); x_nz = sz; } - retval.xdata(ii) = tmp; - retval.xridx(ii++) = i; + retval.xdata (ii) = tmp; + retval.xridx (ii++) = i; } } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -6270,7 +6270,7 @@ { octave_idx_type jr = j * b.rows (); for (octave_idx_type i = 0; i < b.rows (); i++) - retval.xelem(i,j) = static_cast<Complex *>(X->x)[jr + i]; + retval.xelem (i,j) = static_cast<Complex *>(X->x)[jr + i]; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6503,12 +6503,12 @@ static_cast<octave_idx_type>(X->nzmax)); for (octave_idx_type j = 0; j <= static_cast<octave_idx_type>(X->ncol); j++) - retval.xcidx(j) = static_cast<octave_idx_type *>(X->p)[j]; + retval.xcidx (j) = static_cast<octave_idx_type *>(X->p)[j]; for (octave_idx_type j = 0; j < static_cast<octave_idx_type>(X->nzmax); j++) { - retval.xridx(j) = static_cast<octave_idx_type *>(X->i)[j]; - retval.xdata(j) = static_cast<Complex *>(X->x)[j]; + retval.xridx (j) = static_cast<octave_idx_type *>(X->i)[j]; + retval.xdata (j) = static_cast<Complex *>(X->x)[j]; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6556,7 +6556,7 @@ OCTAVE_LOCAL_BUFFER (Complex, Xx, b_nr); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type i = 0; i < b_nr; i++) @@ -6596,11 +6596,11 @@ retval.change_capacity (sz); x_nz = sz; } - retval.xdata(ii) = tmp; - retval.xridx(ii++) = i; + retval.xdata (ii) = tmp; + retval.xridx (ii++) = i; } } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -6694,7 +6694,7 @@ return ComplexMatrix (); } - if (singular_fallback && mattype.type(false) == MatrixType::Rectangular) + if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; #ifdef USE_QRSOLVE @@ -6762,7 +6762,7 @@ return SparseComplexMatrix (); } - if (singular_fallback && mattype.type(false) == MatrixType::Rectangular) + if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; #ifdef USE_QRSOLVE @@ -6830,7 +6830,7 @@ return ComplexMatrix (); } - if (singular_fallback && mattype.type(false) == MatrixType::Rectangular) + if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; #ifdef USE_QRSOLVE @@ -6899,7 +6899,7 @@ return SparseComplexMatrix (); } - if (singular_fallback && mattype.type(false) == MatrixType::Rectangular) + if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; #ifdef USE_QRSOLVE @@ -7177,12 +7177,12 @@ { for (octave_idx_type j = 0; j < nr; j++) { - if (jj < cidx(i+1) && ridx(jj) == j) + if (jj < cidx (i+1) && ridx (jj) == j) jj++; else { - r.data(ii) = true; - r.ridx(ii++) = j; + r.data (ii) = true; + r.ridx (ii++) = j; } } r.cidx (i+1) = ii; @@ -7267,8 +7267,8 @@ if (nel == 0) return false; - max_val = std::real(data (0)); - min_val = std::real(data (0)); + max_val = std::real (data (0)); + min_val = std::real (data (0)); for (octave_idx_type i = 0; i < nel; i++) { @@ -7353,7 +7353,7 @@ else { SPARSE_REDUCTION_OP (SparseComplexMatrix, Complex, *=, - (cidx(j+1) - cidx(j) < nr ? 0.0 : 1.0), 1.0); + (cidx (j+1) - cidx (j) < nr ? 0.0 : 1.0), 1.0); } } @@ -7368,11 +7368,11 @@ { #define ROW_EXPR \ Complex d = data (i); \ - tmp [ridx(i)] += d * conj (d) + tmp[ridx (i)] += d * conj (d) #define COL_EXPR \ Complex d = data (i); \ - tmp [j] += d * conj (d) + tmp[j] += d * conj (d) SPARSE_BASE_REDUCTION_OP (SparseComplexMatrix, Complex, ROW_EXPR, COL_EXPR, 0.0, 0.0); @@ -7416,10 +7416,10 @@ for (octave_idx_type j = 0; j < nc; j++) { octave_quit (); - for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) + for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) { - os << a.ridx(i) + 1 << " " << j + 1 << " "; - octave_write_complex (os, a.data(i)); + os << a.ridx (i) + 1 << " " << j + 1 << " "; + octave_write_complex (os, a.data (i)); os << "\n"; } } @@ -7640,15 +7640,15 @@ EMPTY_RETURN_CHECK (SparseComplexMatrix); - if (abs(c) == 0.) + if (abs (c) == 0.) return SparseComplexMatrix (nr, nc); else { result = SparseComplexMatrix (m); for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) - result.data(i) = xmin(c, m.data(i)); + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) + result.data (i) = xmin (c, m.data (i)); } return result; @@ -7686,38 +7686,38 @@ r.cidx (0) = 0; for (octave_idx_type i = 0 ; i < a_nc ; i++) { - octave_idx_type ja = a.cidx(i); - octave_idx_type ja_max = a.cidx(i+1); + octave_idx_type ja = a.cidx (i); + octave_idx_type ja_max = a.cidx (i+1); bool ja_lt_max= ja < ja_max; - octave_idx_type jb = b.cidx(i); - octave_idx_type jb_max = b.cidx(i+1); + octave_idx_type jb = b.cidx (i); + octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; while (ja_lt_max || jb_lt_max ) { octave_quit (); if ((! jb_lt_max) || - (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) + (ja_lt_max && (a.ridx (ja) < b.ridx (jb)))) { - Complex tmp = xmin (a.data(ja), 0.); + Complex tmp = xmin (a.data (ja), 0.); if (tmp != 0.) { - r.ridx(jx) = a.ridx(ja); - r.data(jx) = tmp; + r.ridx (jx) = a.ridx (ja); + r.data (jx) = tmp; jx++; } ja++; ja_lt_max= ja < ja_max; } else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx(jb) < a.ridx(ja)) ) ) + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) { - Complex tmp = xmin (0., b.data(jb)); + Complex tmp = xmin (0., b.data (jb)); if (tmp != 0.) { - r.ridx(jx) = b.ridx(jb); - r.data(jx) = tmp; + r.ridx (jx) = b.ridx (jb); + r.data (jx) = tmp; jx++; } jb++; @@ -7725,11 +7725,11 @@ } else { - Complex tmp = xmin (a.data(ja), b.data(jb)); + Complex tmp = xmin (a.data (ja), b.data (jb)); if (tmp != 0.) { - r.data(jx) = tmp; - r.ridx(jx) = a.ridx(ja); + r.data (jx) = tmp; + r.ridx (jx) = a.ridx (ja); jx++; } ja++; @@ -7738,7 +7738,7 @@ jb_lt_max= jb < jb_max; } } - r.cidx(i+1) = jx; + r.cidx (i+1) = jx; } r.maybe_compress (); @@ -7761,12 +7761,12 @@ EMPTY_RETURN_CHECK (SparseComplexMatrix); // Count the number of non-zero elements - if (xmax(c, 0.) != 0.) + if (xmax (c, 0.) != 0.) { result = SparseComplexMatrix (nr, nc, c); for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) - result.xdata(m.ridx(i) + j * nr) = xmax (c, m.data(i)); + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) + result.xdata (m.ridx (i) + j * nr) = xmax (c, m.data (i)); } else result = SparseComplexMatrix (m); @@ -7810,38 +7810,38 @@ r.cidx (0) = 0; for (octave_idx_type i = 0 ; i < a_nc ; i++) { - octave_idx_type ja = a.cidx(i); - octave_idx_type ja_max = a.cidx(i+1); + octave_idx_type ja = a.cidx (i); + octave_idx_type ja_max = a.cidx (i+1); bool ja_lt_max= ja < ja_max; - octave_idx_type jb = b.cidx(i); - octave_idx_type jb_max = b.cidx(i+1); + octave_idx_type jb = b.cidx (i); + octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; while (ja_lt_max || jb_lt_max ) { octave_quit (); if ((! jb_lt_max) || - (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) + (ja_lt_max && (a.ridx (ja) < b.ridx (jb)))) { - Complex tmp = xmax (a.data(ja), 0.); + Complex tmp = xmax (a.data (ja), 0.); if (tmp != 0.) { - r.ridx(jx) = a.ridx(ja); - r.data(jx) = tmp; + r.ridx (jx) = a.ridx (ja); + r.data (jx) = tmp; jx++; } ja++; ja_lt_max= ja < ja_max; } else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx(jb) < a.ridx(ja)) ) ) + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) { - Complex tmp = xmax (0., b.data(jb)); + Complex tmp = xmax (0., b.data (jb)); if (tmp != 0.) { - r.ridx(jx) = b.ridx(jb); - r.data(jx) = tmp; + r.ridx (jx) = b.ridx (jb); + r.data (jx) = tmp; jx++; } jb++; @@ -7849,11 +7849,11 @@ } else { - Complex tmp = xmax (a.data(ja), b.data(jb)); + Complex tmp = xmax (a.data (ja), b.data (jb)); if (tmp != 0.) { - r.data(jx) = tmp; - r.ridx(jx) = a.ridx(ja); + r.data (jx) = tmp; + r.ridx (jx) = a.ridx (ja); jx++; } ja++; @@ -7862,7 +7862,7 @@ jb_lt_max= jb < jb_max; } } - r.cidx(i+1) = jx; + r.cidx (i+1) = jx; } r.maybe_compress ();
--- a/liboctave/CmplxQR.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/CmplxQR.cc Thu Jul 26 08:13:22 2012 -0700 @@ -469,7 +469,7 @@ if (u.length () == m && v.length () == n) { - init(q*r + ComplexMatrix (u) * ComplexMatrix (v).hermitian (), get_type ()); + init (q*r + ComplexMatrix (u) * ComplexMatrix (v).hermitian (), get_type ()); } else (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch"); @@ -485,7 +485,7 @@ if (u.rows () == m && v.rows () == n && u.cols () == v.cols ()) { - init(q*r + u * v.hermitian (), get_type ()); + init (q*r + u * v.hermitian (), get_type ()); } else (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch");
--- a/liboctave/CollocWt.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/CollocWt.cc Thu Jul 26 08:13:22 2012 -0700 @@ -212,7 +212,7 @@ xn1 = xp1; } - double zc = 1.0; + double zc = 1.0; double z = xn / xn1; if (i != 0)
--- a/liboctave/DASPK.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/DASPK.cc Thu Jul 26 08:13:22 2012 -0700 @@ -83,8 +83,8 @@ for (octave_idx_type i = 0; i < nn; i++) { - tmp_deriv.elem (i) = deriv [i]; - tmp_state.elem (i) = state [i]; + tmp_deriv.elem (i) = deriv[i]; + tmp_state.elem (i) = state[i]; } tmp_delta = user_fun (tmp_state, tmp_deriv, time, ires); @@ -96,7 +96,7 @@ else { for (octave_idx_type i = 0; i < nn; i++) - delta [i] = tmp_delta.elem (i); + delta[i] = tmp_delta.elem (i); } } @@ -137,8 +137,8 @@ for (octave_idx_type i = 0; i < nn; i++) { - tmp_deriv.elem (i) = deriv [i]; - tmp_state.elem (i) = state [i]; + tmp_deriv.elem (i) = deriv[i]; + tmp_state.elem (i) = state[i]; } Matrix tmp_pd = user_jac (tmp_state, tmp_deriv, time, cj);
--- a/liboctave/DASRT.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/DASRT.cc Thu Jul 26 08:13:22 2012 -0700 @@ -113,8 +113,8 @@ for (octave_idx_type i = 0; i < nn; i++) { - tmp_deriv.elem (i) = deriv [i]; - tmp_state.elem (i) = state [i]; + tmp_deriv.elem (i) = deriv[i]; + tmp_state.elem (i) = state[i]; } Matrix tmp_pd = (*user_jsub) (tmp_state, tmp_deriv, time, cj);
--- a/liboctave/DASSL.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/DASSL.cc Thu Jul 26 08:13:22 2012 -0700 @@ -76,8 +76,8 @@ for (octave_idx_type i = 0; i < nn; i++) { - tmp_deriv.elem (i) = deriv [i]; - tmp_state.elem (i) = state [i]; + tmp_deriv.elem (i) = deriv[i]; + tmp_state.elem (i) = state[i]; } tmp_delta = user_fun (tmp_state, tmp_deriv, time, ires); @@ -89,7 +89,7 @@ else { for (octave_idx_type i = 0; i < nn; i++) - delta [i] = tmp_delta.elem (i); + delta[i] = tmp_delta.elem (i); } } @@ -111,8 +111,8 @@ for (octave_idx_type i = 0; i < nn; i++) { - tmp_deriv.elem (i) = deriv [i]; - tmp_state.elem (i) = state [i]; + tmp_deriv.elem (i) = deriv[i]; + tmp_state.elem (i) = state[i]; } Matrix tmp_pd = user_jac (tmp_state, tmp_deriv, time, cj);
--- a/liboctave/EIG.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/EIG.cc Thu Jul 26 08:13:22 2012 -0700 @@ -230,8 +230,8 @@ return -1; } - lambda.elem(j) = Complex (wr.elem(j), wi.elem(j)); - lambda.elem(j+1) = Complex (wr.elem(j+1), wi.elem(j+1)); + lambda.elem (j) = Complex (wr.elem (j), wi.elem (j)); + lambda.elem (j+1) = Complex (wr.elem (j+1), wi.elem (j+1)); for (octave_idx_type i = 0; i < nvr; i++) { @@ -581,10 +581,10 @@ return -1; } - lambda.elem(j) = Complex (ar.elem(j) / beta.elem (j), - ai.elem(j) / beta.elem (j)); - lambda.elem(j+1) = Complex (ar.elem(j+1) / beta.elem (j+1), - ai.elem(j+1) / beta.elem (j+1)); + lambda.elem (j) = Complex (ar.elem (j) / beta.elem (j), + ai.elem (j) / beta.elem (j)); + lambda.elem (j+1) = Complex (ar.elem (j+1) / beta.elem (j+1), + ai.elem (j+1) / beta.elem (j+1)); for (octave_idx_type i = 0; i < nvr; i++) { @@ -780,7 +780,7 @@ lambda.resize (n); for (octave_idx_type j = 0; j < n; j++) - lambda.elem (j) = alpha.elem (j) / beta.elem(j); + lambda.elem (j) = alpha.elem (j) / beta.elem (j); v = vtmp; }
--- a/liboctave/LSODE.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/LSODE.cc Thu Jul 26 08:13:22 2012 -0700 @@ -79,7 +79,7 @@ else { for (octave_idx_type i = 0; i < neq; i++) - deriv [i] = tmp_deriv.elem (i); + deriv[i] = tmp_deriv.elem (i); } END_INTERRUPT_WITH_EXCEPTIONS;
--- a/liboctave/MSparse.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/MSparse.cc Thu Jul 26 08:13:22 2012 -0700 @@ -60,41 +60,41 @@ octave_idx_type jx = 0; for (octave_idx_type i = 0 ; i < a_nc ; i++) { - octave_idx_type ja = a.cidx(i); - octave_idx_type ja_max = a.cidx(i+1); + octave_idx_type ja = a.cidx (i); + octave_idx_type ja_max = a.cidx (i+1); bool ja_lt_max= ja < ja_max; - octave_idx_type jb = b.cidx(i); - octave_idx_type jb_max = b.cidx(i+1); + octave_idx_type jb = b.cidx (i); + octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; while (ja_lt_max || jb_lt_max ) { octave_quit (); if ((! jb_lt_max) || - (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) + (ja_lt_max && (a.ridx (ja) < b.ridx (jb)))) { - r.ridx(jx) = a.ridx(ja); - r.data(jx) = op (a.data(ja), 0.); + r.ridx (jx) = a.ridx (ja); + r.data (jx) = op (a.data (ja), 0.); jx++; ja++; ja_lt_max= ja < ja_max; } else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx(jb) < a.ridx(ja)) ) ) + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) { - r.ridx(jx) = b.ridx(jb); - r.data(jx) = op (0., b.data(jb)); + r.ridx (jx) = b.ridx (jb); + r.data (jx) = op (0., b.data (jb)); jx++; jb++; jb_lt_max= jb < jb_max; } else { - if (op (a.data(ja), b.data(jb)) != 0.) + if (op (a.data (ja), b.data (jb)) != 0.) { - r.data(jx) = op (a.data(ja), b.data(jb)); - r.ridx(jx) = a.ridx(ja); + r.data (jx) = op (a.data (ja), b.data (jb)); + r.ridx (jx) = a.ridx (ja); jx++; } ja++; @@ -103,7 +103,7 @@ jb_lt_max= jb < jb_max; } } - r.cidx(i+1) = jx; + r.cidx (i+1) = jx; } a = r.maybe_compress (); @@ -139,7 +139,7 @@ MArray<T> r (dim_vector (nr, nc), op (0.0, s)); for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) + for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) r.elem (a.ridx (i), j) = op (a.data (i), s); return r; } @@ -171,11 +171,11 @@ for (octave_idx_type i = 0; i < nz; i++) { - r.data(i) = op (a.data(i), s); - r.ridx(i) = a.ridx(i); + r.data (i) = op (a.data (i), s); + r.ridx (i) = a.ridx (i); } for (octave_idx_type i = 0; i < nc + 1; i++) - r.cidx(i) = a.cidx(i); + r.cidx (i) = a.cidx (i); r.maybe_compress (true); return r; } @@ -207,7 +207,7 @@ MArray<T> r (dim_vector (nr, nc), op (s, 0.0)); for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) + for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) r.elem (a.ridx (i), j) = op (s, a.data (i)); return r; } @@ -238,11 +238,11 @@ for (octave_idx_type i = 0; i < nz; i++) { - r.data(i) = op (s, a.data(i)); - r.ridx(i) = a.ridx(i); + r.data (i) = op (s, a.data (i)); + r.ridx (i) = a.ridx (i); } for (octave_idx_type i = 0; i < nc + 1; i++) - r.cidx(i) = a.cidx(i); + r.cidx (i) = a.cidx (i); r.maybe_compress (true); return r; } @@ -279,23 +279,23 @@ if (a_nr == 1 && a_nc == 1) { - if (a.elem(0,0) == 0.) + if (a.elem (0,0) == 0.) if (negate) r = -MSparse<T> (b); else r = MSparse<T> (b); else { - r = MSparse<T> (b_nr, b_nc, op (a.data(0), 0.)); + r = MSparse<T> (b_nr, b_nc, op (a.data (0), 0.)); for (octave_idx_type j = 0 ; j < b_nc ; j++) { octave_quit (); octave_idx_type idxj = j * b_nr; - for (octave_idx_type i = b.cidx(j) ; i < b.cidx(j+1) ; i++) + for (octave_idx_type i = b.cidx (j) ; i < b.cidx (j+1) ; i++) { octave_quit (); - r.data(idxj + b.ridx(i)) = op (a.data(0), b.data(i)); + r.data (idxj + b.ridx (i)) = op (a.data (0), b.data (i)); } } r.maybe_compress (); @@ -303,20 +303,20 @@ } else if (b_nr == 1 && b_nc == 1) { - if (b.elem(0,0) == 0.) + if (b.elem (0,0) == 0.) r = MSparse<T> (a); else { - r = MSparse<T> (a_nr, a_nc, op (0.0, b.data(0))); + r = MSparse<T> (a_nr, a_nc, op (0.0, b.data (0))); for (octave_idx_type j = 0 ; j < a_nc ; j++) { octave_quit (); octave_idx_type idxj = j * a_nr; - for (octave_idx_type i = a.cidx(j) ; i < a.cidx(j+1) ; i++) + for (octave_idx_type i = a.cidx (j) ; i < a.cidx (j+1) ; i++) { octave_quit (); - r.data(idxj + a.ridx(i)) = op (a.data(i), b.data(0)); + r.data (idxj + a.ridx (i)) = op (a.data (i), b.data (0)); } } r.maybe_compress (); @@ -332,41 +332,41 @@ r.cidx (0) = 0; for (octave_idx_type i = 0 ; i < a_nc ; i++) { - octave_idx_type ja = a.cidx(i); - octave_idx_type ja_max = a.cidx(i+1); + octave_idx_type ja = a.cidx (i); + octave_idx_type ja_max = a.cidx (i+1); bool ja_lt_max= ja < ja_max; - octave_idx_type jb = b.cidx(i); - octave_idx_type jb_max = b.cidx(i+1); + octave_idx_type jb = b.cidx (i); + octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; while (ja_lt_max || jb_lt_max ) { octave_quit (); if ((! jb_lt_max) || - (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) + (ja_lt_max && (a.ridx (ja) < b.ridx (jb)))) { - r.ridx(jx) = a.ridx(ja); - r.data(jx) = op (a.data(ja), 0.); + r.ridx (jx) = a.ridx (ja); + r.data (jx) = op (a.data (ja), 0.); jx++; ja++; ja_lt_max= ja < ja_max; } else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx(jb) < a.ridx(ja)) ) ) + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) { - r.ridx(jx) = b.ridx(jb); - r.data(jx) = op (0., b.data(jb)); + r.ridx (jx) = b.ridx (jb); + r.data (jx) = op (0., b.data (jb)); jx++; jb++; jb_lt_max= jb < jb_max; } else { - if (op (a.data(ja), b.data(jb)) != 0.) + if (op (a.data (ja), b.data (jb)) != 0.) { - r.data(jx) = op (a.data(ja), b.data(jb)); - r.ridx(jx) = a.ridx(ja); + r.data (jx) = op (a.data (ja), b.data (jb)); + r.ridx (jx) = a.ridx (ja); jx++; } ja++; @@ -375,7 +375,7 @@ jb_lt_max= jb < jb_max; } } - r.cidx(i+1) = jx; + r.cidx (i+1) = jx; } r.maybe_compress (); @@ -412,7 +412,7 @@ if (a_nr == 1 && a_nc == 1) { - if (a.elem(0,0) == 0.) + if (a.elem (0,0) == 0.) r = MSparse<T> (b_nr, b_nc); else { @@ -422,14 +422,14 @@ for (octave_idx_type i = 0 ; i < b_nnz ; i++) { octave_quit (); - r.data (i) = a.data(0) * r.data(i); + r.data (i) = a.data (0) * r.data (i); } r.maybe_compress (); } } else if (b_nr == 1 && b_nc == 1) { - if (b.elem(0,0) == 0.) + if (b.elem (0,0) == 0.) r = MSparse<T> (a_nr, a_nc); else { @@ -439,7 +439,7 @@ for (octave_idx_type i = 0 ; i < a_nnz ; i++) { octave_quit (); - r.data (i) = r.data(i) * b.data(0); + r.data (i) = r.data (i) * b.data (0); } r.maybe_compress (); } @@ -454,40 +454,40 @@ r.cidx (0) = 0; for (octave_idx_type i = 0 ; i < a_nc ; i++) { - octave_idx_type ja = a.cidx(i); - octave_idx_type ja_max = a.cidx(i+1); + octave_idx_type ja = a.cidx (i); + octave_idx_type ja_max = a.cidx (i+1); bool ja_lt_max= ja < ja_max; - octave_idx_type jb = b.cidx(i); - octave_idx_type jb_max = b.cidx(i+1); + octave_idx_type jb = b.cidx (i); + octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; while (ja_lt_max || jb_lt_max ) { octave_quit (); if ((! jb_lt_max) || - (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) + (ja_lt_max && (a.ridx (ja) < b.ridx (jb)))) { ja++; ja_lt_max= ja < ja_max; } else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx(jb) < a.ridx(ja)) ) ) + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) { jb++; jb_lt_max= jb < jb_max; } else { - if ((a.data(ja) * b.data(jb)) != 0.) + if ((a.data (ja) * b.data (jb)) != 0.) { - r.data(jx) = a.data(ja) * b.data(jb); - r.ridx(jx) = a.ridx(ja); + r.data (jx) = a.data (ja) * b.data (jb); + r.ridx (jx) = a.ridx (ja); jx++; } ja++; ja_lt_max= ja < ja_max; jb++; jb_lt_max= jb < jb_max; } } - r.cidx(i+1) = jx; + r.cidx (i+1) = jx; } r.maybe_compress (); @@ -518,7 +518,7 @@ octave_idx_type b_nnz = b.nnz (); r = MSparse<T> (b); for (octave_idx_type i = 0 ; i < b_nnz ; i++) - r.data (i) = val / r.data(i); + r.data (i) = val / r.data (i); r.maybe_compress (); } else @@ -528,10 +528,10 @@ { octave_quit (); octave_idx_type idxj = j * b_nr; - for (octave_idx_type i = b.cidx(j) ; i < b.cidx(j+1) ; i++) + for (octave_idx_type i = b.cidx (j) ; i < b.cidx (j+1) ; i++) { octave_quit (); - r.data(idxj + b.ridx(i)) = val / b.data(i); + r.data (idxj + b.ridx (i)) = val / b.data (i); } } r.maybe_compress (); @@ -546,7 +546,7 @@ octave_idx_type a_nnz = a.nnz (); r = MSparse<T> (a); for (octave_idx_type i = 0 ; i < a_nnz ; i++) - r.data (i) = r.data(i) / val; + r.data (i) = r.data (i) / val; r.maybe_compress (); } else @@ -556,10 +556,10 @@ { octave_quit (); octave_idx_type idxj = j * a_nr; - for (octave_idx_type i = a.cidx(j) ; i < a.cidx(j+1) ; i++) + for (octave_idx_type i = a.cidx (j) ; i < a.cidx (j+1) ; i++) { octave_quit (); - r.data(idxj + a.ridx(i)) = a.data(i) / val; + r.data (idxj + a.ridx (i)) = a.data (i) / val; } } r.maybe_compress (); @@ -573,32 +573,32 @@ for (octave_idx_type i = 0 ; i < a_nc ; i++) { - octave_idx_type ja = a.cidx(i); - octave_idx_type ja_max = a.cidx(i+1); + octave_idx_type ja = a.cidx (i); + octave_idx_type ja_max = a.cidx (i+1); bool ja_lt_max= ja < ja_max; - octave_idx_type jb = b.cidx(i); - octave_idx_type jb_max = b.cidx(i+1); + octave_idx_type jb = b.cidx (i); + octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; while (ja_lt_max || jb_lt_max ) { octave_quit (); if ((! jb_lt_max) || - (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) + (ja_lt_max && (a.ridx (ja) < b.ridx (jb)))) { - r.elem (a.ridx(ja),i) = a.data(ja) / Zero; + r.elem (a.ridx (ja),i) = a.data (ja) / Zero; ja++; ja_lt_max= ja < ja_max; } else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx(jb) < a.ridx(ja)) ) ) + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) { - r.elem (b.ridx(jb),i) = Zero / b.data(jb); + r.elem (b.ridx (jb),i) = Zero / b.data (jb); jb++; jb_lt_max= jb < jb_max; } else { - r.elem (a.ridx(ja),i) = a.data(ja) / b.data(jb); + r.elem (a.ridx (ja),i) = a.data (ja) / b.data (jb); ja++; ja_lt_max= ja < ja_max; jb++; jb_lt_max= jb < jb_max; } @@ -629,6 +629,6 @@ MSparse<T> retval (a); octave_idx_type nz = a.nnz (); for (octave_idx_type i = 0; i < nz; i++) - retval.data(i) = - retval.data(i); + retval.data (i) = - retval.data (i); return retval; }
--- a/liboctave/MatrixType.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/MatrixType.cc Thu Jul 26 08:13:22 2012 -0700 @@ -51,7 +51,7 @@ { if (nperm != 0) { - perm = new octave_idx_type [nperm]; + perm = new octave_idx_type[nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = a.perm[i]; } @@ -231,12 +231,12 @@ // Maybe the matrix is diagonal for (i = 0; i < nm; i++) { - if (a.cidx(i+1) != a.cidx(i) + 1) + if (a.cidx (i+1) != a.cidx (i) + 1) { tmp_typ = MatrixType::Full; break; } - if (a.ridx(i) != i) + if (a.ridx (i) != i) { tmp_typ = MatrixType::Permuted_Diagonal; break; @@ -248,19 +248,19 @@ std::vector<bool> found (nrows); for (octave_idx_type j = 0; j < i; j++) - found [j] = true; + found[j] = true; for (octave_idx_type j = i; j < nrows; j++) - found [j] = false; + found[j] = false; for (octave_idx_type j = i; j < nm; j++) { - if ((a.cidx(j+1) > a.cidx(j) + 1) || - ((a.cidx(j+1) == a.cidx(j) + 1) && found [a.ridx(j)])) + if ((a.cidx (j+1) > a.cidx (j) + 1) || + ((a.cidx (j+1) == a.cidx (j) + 1) && found [a.ridx (j)])) { tmp_typ = MatrixType::Full; break; } - found [a.ridx(j)] = true; + found [a.ridx (j)] = true; } } typ = tmp_typ; @@ -278,8 +278,8 @@ if (j < nrows) { zero_on_diagonal = true; - for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) - if (a.ridx(i) == j) + for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) + if (a.ridx (i) == j) { zero_on_diagonal = false; break; @@ -292,10 +292,10 @@ break; } - if (a.cidx(j+1) != a.cidx(j)) + if (a.cidx (j+1) != a.cidx (j)) { - octave_idx_type ru = a.ridx(a.cidx(j)); - octave_idx_type rl = a.ridx(a.cidx(j+1)-1); + octave_idx_type ru = a.ridx (a.cidx (j)); + octave_idx_type rl = a.ridx (a.cidx (j+1)-1); if (j - ru > upper_band) upper_band = j - ru; @@ -348,10 +348,10 @@ bool found = false; nperm = ncols; - perm = new octave_idx_type [ncols]; + perm = new octave_idx_type[ncols]; for (octave_idx_type i = 0; i < ncols; i++) - perm [i] = -1; + perm[i] = -1; for (octave_idx_type i = 0; i < nm; i++) { @@ -359,10 +359,10 @@ for (octave_idx_type j = 0; j < ncols; j++) { - if ((a.cidx(j+1) - a.cidx(j)) > 0 && - (a.ridx(a.cidx(j+1)-1) == i)) + if ((a.cidx (j+1) - a.cidx (j)) > 0 && + (a.ridx (a.cidx (j+1)-1) == i)) { - perm [i] = j; + perm[i] = j; found = true; break; } @@ -379,26 +379,26 @@ { octave_idx_type k = nrows; for (octave_idx_type i = 0; i < ncols; i++) - if (perm [i] == -1) + if (perm[i] == -1) perm[i] = k++; } } - else if (a.cidx(nm) == a.cidx(ncols)) + else if (a.cidx (nm) == a.cidx (ncols)) { nperm = nrows; delete [] perm; - perm = new octave_idx_type [nrows]; + perm = new octave_idx_type[nrows]; OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, nrows); for (octave_idx_type i = 0; i < nrows; i++) { - perm [i] = -1; - tmp [i] = -1; + perm[i] = -1; + tmp[i] = -1; } for (octave_idx_type j = 0; j < ncols; j++) - for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) - perm [a.ridx(i)] = j; + for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) + perm [a.ridx (i)] = j; found = true; for (octave_idx_type i = 0; i < nm; i++) @@ -478,11 +478,11 @@ for (octave_idx_type j = 0; is_herm && j < ncols; j++) { is_herm = false; - for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) + for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) { - if (a.ridx(i) == j) + if (a.ridx (i) == j) { - double d = a.data(i); + double d = a.data (i); is_herm = d > 0.; diag(j) = d; break; @@ -494,20 +494,20 @@ // next, check symmetry and 2x2 positiveness for (octave_idx_type j = 0; is_herm && j < ncols; j++) - for (octave_idx_type i = a.cidx(j); is_herm && i < a.cidx(j+1); i++) + for (octave_idx_type i = a.cidx (j); is_herm && i < a.cidx (j+1); i++) { - octave_idx_type k = a.ridx(i); + octave_idx_type k = a.ridx (i); is_herm = k == j; if (is_herm) continue; - double d = a.data(i); + double d = a.data (i); if (d*d < diag(j)*diag(k)) { - for (octave_idx_type l = a.cidx(k); l < a.cidx(k+1); l++) + for (octave_idx_type l = a.cidx (k); l < a.cidx (k+1); l++) { - if (a.ridx(l) == j) + if (a.ridx (l) == j) { - is_herm = a.data(l) == d; + is_herm = a.data (l) == d; break; } } @@ -552,12 +552,12 @@ // Maybe the matrix is diagonal for (i = 0; i < nm; i++) { - if (a.cidx(i+1) != a.cidx(i) + 1) + if (a.cidx (i+1) != a.cidx (i) + 1) { tmp_typ = MatrixType::Full; break; } - if (a.ridx(i) != i) + if (a.ridx (i) != i) { tmp_typ = MatrixType::Permuted_Diagonal; break; @@ -569,19 +569,19 @@ std::vector<bool> found (nrows); for (octave_idx_type j = 0; j < i; j++) - found [j] = true; + found[j] = true; for (octave_idx_type j = i; j < nrows; j++) - found [j] = false; + found[j] = false; for (octave_idx_type j = i; j < nm; j++) { - if ((a.cidx(j+1) > a.cidx(j) + 1) || - ((a.cidx(j+1) == a.cidx(j) + 1) && found [a.ridx(j)])) + if ((a.cidx (j+1) > a.cidx (j) + 1) || + ((a.cidx (j+1) == a.cidx (j) + 1) && found [a.ridx (j)])) { tmp_typ = MatrixType::Full; break; } - found [a.ridx(j)] = true; + found [a.ridx (j)] = true; } } typ = tmp_typ; @@ -599,8 +599,8 @@ if (j < nrows) { zero_on_diagonal = true; - for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) - if (a.ridx(i) == j) + for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) + if (a.ridx (i) == j) { zero_on_diagonal = false; break; @@ -613,10 +613,10 @@ break; } - if (a.cidx(j+1) != a.cidx(j)) + if (a.cidx (j+1) != a.cidx (j)) { - octave_idx_type ru = a.ridx(a.cidx(j)); - octave_idx_type rl = a.ridx(a.cidx(j+1)-1); + octave_idx_type ru = a.ridx (a.cidx (j)); + octave_idx_type rl = a.ridx (a.cidx (j+1)-1); if (j - ru > upper_band) upper_band = j - ru; @@ -669,10 +669,10 @@ bool found = false; nperm = ncols; - perm = new octave_idx_type [ncols]; + perm = new octave_idx_type[ncols]; for (octave_idx_type i = 0; i < ncols; i++) - perm [i] = -1; + perm[i] = -1; for (octave_idx_type i = 0; i < nm; i++) { @@ -680,10 +680,10 @@ for (octave_idx_type j = 0; j < ncols; j++) { - if ((a.cidx(j+1) - a.cidx(j)) > 0 && - (a.ridx(a.cidx(j+1)-1) == i)) + if ((a.cidx (j+1) - a.cidx (j)) > 0 && + (a.ridx (a.cidx (j+1)-1) == i)) { - perm [i] = j; + perm[i] = j; found = true; break; } @@ -700,26 +700,26 @@ { octave_idx_type k = nrows; for (octave_idx_type i = 0; i < ncols; i++) - if (perm [i] == -1) + if (perm[i] == -1) perm[i] = k++; } } - else if (a.cidx(nm) == a.cidx(ncols)) + else if (a.cidx (nm) == a.cidx (ncols)) { nperm = nrows; delete [] perm; - perm = new octave_idx_type [nrows]; + perm = new octave_idx_type[nrows]; OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, nrows); for (octave_idx_type i = 0; i < nrows; i++) { - perm [i] = -1; - tmp [i] = -1; + perm[i] = -1; + tmp[i] = -1; } for (octave_idx_type j = 0; j < ncols; j++) - for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) - perm [a.ridx(i)] = j; + for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) + perm [a.ridx (i)] = j; found = true; for (octave_idx_type i = 0; i < nm; i++) @@ -799,11 +799,11 @@ for (octave_idx_type j = 0; is_herm && j < ncols; j++) { is_herm = false; - for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) + for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) { - if (a.ridx(i) == j) + if (a.ridx (i) == j) { - Complex d = a.data(i); + Complex d = a.data (i); is_herm = d.real () > 0. && d.imag () == 0.; diag(j) = d.real (); break; @@ -814,21 +814,21 @@ // next, check symmetry and 2x2 positiveness for (octave_idx_type j = 0; is_herm && j < ncols; j++) - for (octave_idx_type i = a.cidx(j); is_herm && i < a.cidx(j+1); i++) + for (octave_idx_type i = a.cidx (j); is_herm && i < a.cidx (j+1); i++) { - octave_idx_type k = a.ridx(i); + octave_idx_type k = a.ridx (i); is_herm = k == j; if (is_herm) continue; - Complex d = a.data(i); + Complex d = a.data (i); if (std::norm (d) < diag(j)*diag(k)) { d = std::conj (d); - for (octave_idx_type l = a.cidx(k); l < a.cidx(k+1); l++) + for (octave_idx_type l = a.cidx (k); l < a.cidx (k+1); l++) { - if (a.ridx(l) == j) + if (a.ridx (l) == j) { - is_herm = a.data(l) == d; + is_herm = a.data (l) == d; break; } } @@ -876,7 +876,7 @@ { typ = t; nperm = np; - perm = new octave_idx_type [nperm]; + perm = new octave_idx_type[nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = p[i]; } @@ -989,7 +989,7 @@ if (nperm != 0) { - perm = new octave_idx_type [nperm]; + perm = new octave_idx_type[nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } @@ -1022,7 +1022,7 @@ if (nperm != 0) { - perm = new octave_idx_type [nperm]; + perm = new octave_idx_type[nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } @@ -1049,7 +1049,7 @@ if (nperm != 0) { - perm = new octave_idx_type [nperm]; + perm = new octave_idx_type[nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } @@ -1076,7 +1076,7 @@ if (nperm != 0) { - perm = new octave_idx_type [nperm]; + perm = new octave_idx_type[nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } @@ -1103,7 +1103,7 @@ if (nperm != 0) { - perm = new octave_idx_type [nperm]; + perm = new octave_idx_type[nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } @@ -1130,7 +1130,7 @@ if (nperm != 0) { - perm = new octave_idx_type [nperm]; + perm = new octave_idx_type[nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } @@ -1225,7 +1225,7 @@ MatrixType::mark_as_permuted (const octave_idx_type np, const octave_idx_type *p) { nperm = np; - perm = new octave_idx_type [nperm]; + perm = new octave_idx_type[nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = p[i];
--- a/liboctave/Sparse-op-defs.h Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/Sparse-op-defs.h Thu Jul 26 08:13:22 2012 -0700 @@ -74,11 +74,11 @@ \ for (octave_idx_type i = 0; i < nz; i++) \ { \ - r.xdata(i) = m.data(i) OP s; \ - r.xridx(i) = m.ridx(i); \ + r.xdata (i) = m.data (i) OP s; \ + r.xridx (i) = m.ridx (i); \ } \ for (octave_idx_type i = 0; i < nc + 1; i++) \ - r.xcidx(i) = m.cidx(i); \ + r.xcidx (i) = m.cidx (i); \ \ r.maybe_compress (true); \ return r; \ @@ -114,7 +114,7 @@ { \ r = SparseBoolMatrix (nr, nc, true); \ for (octave_idx_type j = 0; j < nc; j++) \ - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) \ + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \ if (! (MC (m.data (i)) OP SC (s))) \ r.data (m.ridx (i) + j * nr) = false; \ r.maybe_compress (true); \ @@ -126,7 +126,7 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < nc; j++) \ { \ - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) \ + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \ if (MC (m.data (i)) OP SC (s)) \ { \ r.ridx (nel) = m.ridx (i); \ @@ -169,8 +169,8 @@ { \ r = SparseBoolMatrix (nr, nc, true); \ for (octave_idx_type j = 0; j < nc; j++) \ - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) \ - if (! ((m.data(i) != LHS_ZERO) OP (s != RHS_ZERO))) \ + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \ + if (! ((m.data (i) != LHS_ZERO) OP (s != RHS_ZERO))) \ r.data (m.ridx (i) + j * nr) = false; \ r.maybe_compress (true); \ } \ @@ -181,8 +181,8 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < nc; j++) \ { \ - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) \ - if ((m.data(i) != LHS_ZERO) OP (s != RHS_ZERO)) \ + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \ + if ((m.data (i) != LHS_ZERO) OP (s != RHS_ZERO)) \ { \ r.ridx (nel) = m.ridx (i); \ r.data (nel++) = true; \ @@ -243,11 +243,11 @@ \ for (octave_idx_type i = 0; i < nz; i++) \ { \ - r.xdata(i) = s OP m.data(i); \ - r.xridx(i) = m.ridx(i); \ + r.xdata (i) = s OP m.data (i); \ + r.xridx (i) = m.ridx (i); \ } \ for (octave_idx_type i = 0; i < nc + 1; i++) \ - r.xcidx(i) = m.cidx(i); \ + r.xcidx (i) = m.cidx (i); \ \ r.maybe_compress(true); \ return r; \ @@ -283,7 +283,7 @@ { \ r = SparseBoolMatrix (nr, nc, true); \ for (octave_idx_type j = 0; j < nc; j++) \ - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) \ + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \ if (! (SC (s) OP MC (m.data (i)))) \ r.data (m.ridx (i) + j * nr) = false; \ r.maybe_compress (true); \ @@ -295,7 +295,7 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < nc; j++) \ { \ - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) \ + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \ if (SC (s) OP MC (m.data (i))) \ { \ r.ridx (nel) = m.ridx (i); \ @@ -338,8 +338,8 @@ { \ r = SparseBoolMatrix (nr, nc, true); \ for (octave_idx_type j = 0; j < nc; j++) \ - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) \ - if (! ((s != LHS_ZERO) OP (m.data(i) != RHS_ZERO))) \ + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \ + if (! ((s != LHS_ZERO) OP (m.data (i) != RHS_ZERO))) \ r.data (m.ridx (i) + j * nr) = false; \ r.maybe_compress (true); \ } \ @@ -350,8 +350,8 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < nc; j++) \ { \ - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) \ - if ((s != LHS_ZERO) OP (m.data(i) != RHS_ZERO)) \ + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \ + if ((s != LHS_ZERO) OP (m.data (i) != RHS_ZERO)) \ { \ r.ridx (nel) = m.ridx (i); \ r.data (nel++) = true; \ @@ -398,20 +398,20 @@ \ if (m1_nr == 1 && m1_nc == 1) \ { \ - if (m1.elem(0,0) == 0.) \ + if (m1.elem (0,0) == 0.) \ r = OP R (m2); \ else \ { \ - r = R (m2_nr, m2_nc, m1.data(0) OP 0.); \ + r = R (m2_nr, m2_nc, m1.data (0) OP 0.); \ \ for (octave_idx_type j = 0 ; j < m2_nc ; j++) \ { \ octave_quit (); \ octave_idx_type idxj = j * m2_nr; \ - for (octave_idx_type i = m2.cidx(j) ; i < m2.cidx(j+1) ; i++) \ + for (octave_idx_type i = m2.cidx (j) ; i < m2.cidx (j+1) ; i++) \ { \ octave_quit (); \ - r.data(idxj + m2.ridx(i)) = m1.data(0) OP m2.data(i); \ + r.data (idxj + m2.ridx (i)) = m1.data (0) OP m2.data (i); \ } \ } \ r.maybe_compress (); \ @@ -419,20 +419,20 @@ } \ else if (m2_nr == 1 && m2_nc == 1) \ { \ - if (m2.elem(0,0) == 0.) \ + if (m2.elem (0,0) == 0.) \ r = R (m1); \ else \ { \ - r = R (m1_nr, m1_nc, 0. OP m2.data(0)); \ + r = R (m1_nr, m1_nc, 0. OP m2.data (0)); \ \ for (octave_idx_type j = 0 ; j < m1_nc ; j++) \ { \ octave_quit (); \ octave_idx_type idxj = j * m1_nr; \ - for (octave_idx_type i = m1.cidx(j) ; i < m1.cidx(j+1) ; i++) \ + for (octave_idx_type i = m1.cidx (j) ; i < m1.cidx (j+1) ; i++) \ { \ octave_quit (); \ - r.data(idxj + m1.ridx(i)) = m1.data(i) OP m2.data(0); \ + r.data (idxj + m1.ridx (i)) = m1.data (i) OP m2.data (0); \ } \ } \ r.maybe_compress (); \ @@ -448,41 +448,41 @@ r.cidx (0) = 0; \ for (octave_idx_type i = 0 ; i < m1_nc ; i++) \ { \ - octave_idx_type ja = m1.cidx(i); \ - octave_idx_type ja_max = m1.cidx(i+1); \ + octave_idx_type ja = m1.cidx (i); \ + octave_idx_type ja_max = m1.cidx (i+1); \ bool ja_lt_max= ja < ja_max; \ \ - octave_idx_type jb = m2.cidx(i); \ - octave_idx_type jb_max = m2.cidx(i+1); \ + octave_idx_type jb = m2.cidx (i); \ + octave_idx_type jb_max = m2.cidx (i+1); \ bool jb_lt_max = jb < jb_max; \ \ while (ja_lt_max || jb_lt_max ) \ { \ octave_quit (); \ if ((! jb_lt_max) || \ - (ja_lt_max && (m1.ridx(ja) < m2.ridx(jb)))) \ + (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \ { \ - r.ridx(jx) = m1.ridx(ja); \ - r.data(jx) = m1.data(ja) OP 0.; \ + r.ridx (jx) = m1.ridx (ja); \ + r.data (jx) = m1.data (ja) OP 0.; \ jx++; \ ja++; \ ja_lt_max= ja < ja_max; \ } \ else if (( !ja_lt_max ) || \ - (jb_lt_max && (m2.ridx(jb) < m1.ridx(ja)) ) ) \ + (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)) ) ) \ { \ - r.ridx(jx) = m2.ridx(jb); \ - r.data(jx) = 0. OP m2.data(jb); \ + r.ridx (jx) = m2.ridx (jb); \ + r.data (jx) = 0. OP m2.data (jb); \ jx++; \ jb++; \ jb_lt_max= jb < jb_max; \ } \ else \ { \ - if ((m1.data(ja) OP m2.data(jb)) != 0.) \ + if ((m1.data (ja) OP m2.data (jb)) != 0.) \ { \ - r.data(jx) = m1.data(ja) OP m2.data(jb); \ - r.ridx(jx) = m1.ridx(ja); \ + r.data (jx) = m1.data (ja) OP m2.data (jb); \ + r.ridx (jx) = m1.ridx (ja); \ jx++; \ } \ ja++; \ @@ -491,7 +491,7 @@ jb_lt_max= jb < jb_max; \ } \ } \ - r.cidx(i+1) = jx; \ + r.cidx (i+1) = jx; \ } \ \ r.maybe_compress (); \ @@ -514,7 +514,7 @@ \ if (m1_nr == 1 && m1_nc == 1) \ { \ - if (m1.elem(0,0) == 0.) \ + if (m1.elem (0,0) == 0.) \ r = R (m2_nr, m2_nc); \ else \ { \ @@ -524,14 +524,14 @@ for (octave_idx_type i = 0 ; i < m2_nnz ; i++) \ { \ octave_quit (); \ - r.data (i) = m1.data(0) OP r.data(i); \ + r.data (i) = m1.data (0) OP r.data (i); \ } \ r.maybe_compress (); \ } \ } \ else if (m2_nr == 1 && m2_nc == 1) \ { \ - if (m2.elem(0,0) == 0.) \ + if (m2.elem (0,0) == 0.) \ r = R (m1_nr, m1_nc); \ else \ { \ @@ -541,7 +541,7 @@ for (octave_idx_type i = 0 ; i < m1_nnz ; i++) \ { \ octave_quit (); \ - r.data (i) = r.data(i) OP m2.data(0); \ + r.data (i) = r.data (i) OP m2.data (0); \ } \ r.maybe_compress (); \ } \ @@ -556,40 +556,40 @@ r.cidx (0) = 0; \ for (octave_idx_type i = 0 ; i < m1_nc ; i++) \ { \ - octave_idx_type ja = m1.cidx(i); \ - octave_idx_type ja_max = m1.cidx(i+1); \ + octave_idx_type ja = m1.cidx (i); \ + octave_idx_type ja_max = m1.cidx (i+1); \ bool ja_lt_max= ja < ja_max; \ \ - octave_idx_type jb = m2.cidx(i); \ - octave_idx_type jb_max = m2.cidx(i+1); \ + octave_idx_type jb = m2.cidx (i); \ + octave_idx_type jb_max = m2.cidx (i+1); \ bool jb_lt_max = jb < jb_max; \ \ while (ja_lt_max || jb_lt_max ) \ { \ octave_quit (); \ if ((! jb_lt_max) || \ - (ja_lt_max && (m1.ridx(ja) < m2.ridx(jb)))) \ + (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \ { \ ja++; ja_lt_max= ja < ja_max; \ } \ else if (( !ja_lt_max ) || \ - (jb_lt_max && (m2.ridx(jb) < m1.ridx(ja)) ) ) \ + (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)) ) ) \ { \ jb++; jb_lt_max= jb < jb_max; \ } \ else \ { \ - if ((m1.data(ja) OP m2.data(jb)) != 0.) \ + if ((m1.data (ja) OP m2.data (jb)) != 0.) \ { \ - r.data(jx) = m1.data(ja) OP m2.data(jb); \ - r.ridx(jx) = m1.ridx(ja); \ + r.data (jx) = m1.data (ja) OP m2.data (jb); \ + r.ridx (jx) = m1.ridx (ja); \ jx++; \ } \ ja++; ja_lt_max= ja < ja_max; \ jb++; jb_lt_max= jb < jb_max; \ } \ } \ - r.cidx(i+1) = jx; \ + r.cidx (i+1) = jx; \ } \ \ r.maybe_compress (); \ @@ -617,20 +617,20 @@ octave_idx_type m2_nnz = m2.nnz (); \ r = R (m2); \ for (octave_idx_type i = 0 ; i < m2_nnz ; i++) \ - r.data (i) = m1.elem(0,0) OP r.data(i); \ + r.data (i) = m1.elem (0,0) OP r.data (i); \ r.maybe_compress (); \ } \ else \ { \ - r = R (m2_nr, m2_nc, m1.elem(0,0) OP Complex ()); \ + r = R (m2_nr, m2_nc, m1.elem (0,0) OP Complex ()); \ for (octave_idx_type j = 0 ; j < m2_nc ; j++) \ { \ octave_quit (); \ octave_idx_type idxj = j * m2_nr; \ - for (octave_idx_type i = m2.cidx(j) ; i < m2.cidx(j+1) ; i++) \ + for (octave_idx_type i = m2.cidx (j) ; i < m2.cidx (j+1) ; i++) \ { \ octave_quit (); \ - r.data(idxj + m2.ridx(i)) = m1.elem(0,0) OP m2.data(i); \ + r.data (idxj + m2.ridx (i)) = m1.elem (0,0) OP m2.data (i); \ } \ } \ r.maybe_compress (); \ @@ -643,20 +643,20 @@ octave_idx_type m1_nnz = m1.nnz (); \ r = R (m1); \ for (octave_idx_type i = 0 ; i < m1_nnz ; i++) \ - r.data (i) = r.data(i) OP m2.elem(0,0); \ + r.data (i) = r.data (i) OP m2.elem (0,0); \ r.maybe_compress (); \ } \ else \ { \ - r = R (m1_nr, m1_nc, Complex () OP m2.elem(0,0)); \ + r = R (m1_nr, m1_nc, Complex () OP m2.elem (0,0)); \ for (octave_idx_type j = 0 ; j < m1_nc ; j++) \ { \ octave_quit (); \ octave_idx_type idxj = j * m1_nr; \ - for (octave_idx_type i = m1.cidx(j) ; i < m1.cidx(j+1) ; i++) \ + for (octave_idx_type i = m1.cidx (j) ; i < m1.cidx (j+1) ; i++) \ { \ octave_quit (); \ - r.data(idxj + m1.ridx(i)) = m1.data(i) OP m2.elem(0,0); \ + r.data (idxj + m1.ridx (i)) = m1.data (i) OP m2.elem (0,0); \ } \ } \ r.maybe_compress (); \ @@ -672,36 +672,36 @@ \ for (octave_idx_type i = 0 ; i < m1_nc ; i++) \ { \ - octave_idx_type ja = m1.cidx(i); \ - octave_idx_type ja_max = m1.cidx(i+1); \ + octave_idx_type ja = m1.cidx (i); \ + octave_idx_type ja_max = m1.cidx (i+1); \ bool ja_lt_max= ja < ja_max; \ \ - octave_idx_type jb = m2.cidx(i); \ - octave_idx_type jb_max = m2.cidx(i+1); \ + octave_idx_type jb = m2.cidx (i); \ + octave_idx_type jb_max = m2.cidx (i+1); \ bool jb_lt_max = jb < jb_max; \ \ while (ja_lt_max || jb_lt_max ) \ { \ octave_quit (); \ if ((! jb_lt_max) || \ - (ja_lt_max && (m1.ridx(ja) < m2.ridx(jb)))) \ + (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \ { \ /* keep those kludges coming */ \ - r.elem(m1.ridx(ja),i) = m1.data(ja) OP Complex (); \ + r.elem (m1.ridx (ja),i) = m1.data (ja) OP Complex (); \ ja++; \ ja_lt_max= ja < ja_max; \ } \ else if (( !ja_lt_max ) || \ - (jb_lt_max && (m2.ridx(jb) < m1.ridx(ja)) ) ) \ + (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)) ) ) \ { \ /* keep those kludges coming */ \ - r.elem(m2.ridx(jb),i) = Complex () OP m2.data(jb); \ + r.elem (m2.ridx (jb),i) = Complex () OP m2.data (jb); \ jb++; \ jb_lt_max= jb < jb_max; \ } \ else \ { \ - r.elem(m1.ridx(ja),i) = m1.data(ja) OP m2.data(jb); \ + r.elem (m1.ridx (ja),i) = m1.data (ja) OP m2.data (jb); \ ja++; \ ja_lt_max= ja < ja_max; \ jb++; \ @@ -755,12 +755,12 @@ \ if (m1_nr == 1 && m1_nc == 1) \ { \ - if (C1 (m1.elem(0,0)) OP C2 (Z2)) \ + if (C1 (m1.elem (0,0)) OP C2 (Z2)) \ { \ r = SparseBoolMatrix (m2_nr, m2_nc, true); \ for (octave_idx_type j = 0; j < m2_nc; j++) \ - for (octave_idx_type i = m2.cidx(j); i < m2.cidx(j+1); i++) \ - if (! (C1 (m1.elem (0,0)) OP C2 (m2.data(i)))) \ + for (octave_idx_type i = m2.cidx (j); i < m2.cidx (j+1); i++) \ + if (! (C1 (m1.elem (0,0)) OP C2 (m2.data (i)))) \ r.data (m2.ridx (i) + j * m2_nr) = false; \ r.maybe_compress (true); \ } \ @@ -771,8 +771,8 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < m2_nc; j++) \ { \ - for (octave_idx_type i = m2.cidx(j); i < m2.cidx(j+1); i++) \ - if (C1 (m1.elem (0,0)) OP C2 (m2.data(i))) \ + for (octave_idx_type i = m2.cidx (j); i < m2.cidx (j+1); i++) \ + if (C1 (m1.elem (0,0)) OP C2 (m2.data (i))) \ { \ r.ridx (nel) = m2.ridx (i); \ r.data (nel++) = true; \ @@ -788,8 +788,8 @@ { \ r = SparseBoolMatrix (m1_nr, m1_nc, true); \ for (octave_idx_type j = 0; j < m1_nc; j++) \ - for (octave_idx_type i = m1.cidx(j); i < m1.cidx(j+1); i++) \ - if (! (C1 (m1.data (i)) OP C2 (m2.elem(0,0)))) \ + for (octave_idx_type i = m1.cidx (j); i < m1.cidx (j+1); i++) \ + if (! (C1 (m1.data (i)) OP C2 (m2.elem (0,0)))) \ r.data (m1.ridx (i) + j * m1_nr) = false; \ r.maybe_compress (true); \ } \ @@ -800,8 +800,8 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < m1_nc; j++) \ { \ - for (octave_idx_type i = m1.cidx(j); i < m1.cidx(j+1); i++) \ - if (C1 (m1.data (i)) OP C2 (m2.elem(0,0))) \ + for (octave_idx_type i = m1.cidx (j); i < m1.cidx (j+1); i++) \ + if (C1 (m1.data (i)) OP C2 (m2.elem (0,0))) \ { \ r.ridx (nel) = m1.ridx (i); \ r.data (nel++) = true; \ @@ -826,13 +826,13 @@ octave_idx_type e2 = m2.cidx (j+1); \ while (i1 < e1 || i2 < e2) \ { \ - if (i1 == e1 || (i2 < e2 && m1.ridx(i1) > m2.ridx(i2))) \ + if (i1 == e1 || (i2 < e2 && m1.ridx (i1) > m2.ridx (i2))) \ { \ if (! (C1 (Z1) OP C2 (m2.data (i2)))) \ r.data (m2.ridx (i2) + j * m1_nr) = false; \ i2++; \ } \ - else if (i2 == e2 || m1.ridx(i1) < m2.ridx(i2)) \ + else if (i2 == e2 || m1.ridx (i1) < m2.ridx (i2)) \ { \ if (! (C1 (m1.data (i1)) OP C2 (Z2))) \ r.data (m1.ridx (i1) + j * m1_nr) = false; \ @@ -862,7 +862,7 @@ octave_idx_type e2 = m2.cidx (j+1); \ while (i1 < e1 || i2 < e2) \ { \ - if (i1 == e1 || (i2 < e2 && m1.ridx(i1) > m2.ridx(i2))) \ + if (i1 == e1 || (i2 < e2 && m1.ridx (i1) > m2.ridx (i2))) \ { \ if (C1 (Z1) OP C2 (m2.data (i2))) \ { \ @@ -871,7 +871,7 @@ } \ i2++; \ } \ - else if (i2 == e2 || m1.ridx(i1) < m2.ridx(i2)) \ + else if (i2 == e2 || m1.ridx (i1) < m2.ridx (i2)) \ { \ if (C1 (m1.data (i1)) OP C2 (Z2)) \ { \ @@ -941,12 +941,12 @@ { \ if (m2_nr > 0 && m2_nc > 0) \ { \ - if ((m1.elem(0,0) != LHS_ZERO) OP RHS_ZERO) \ + if ((m1.elem (0,0) != LHS_ZERO) OP RHS_ZERO) \ { \ r = SparseBoolMatrix (m2_nr, m2_nc, true); \ for (octave_idx_type j = 0; j < m2_nc; j++) \ - for (octave_idx_type i = m2.cidx(j); i < m2.cidx(j+1); i++) \ - if (! ((m1.elem(0,0) != LHS_ZERO) OP (m2.data(i) != RHS_ZERO))) \ + for (octave_idx_type i = m2.cidx (j); i < m2.cidx (j+1); i++) \ + if (! ((m1.elem (0,0) != LHS_ZERO) OP (m2.data (i) != RHS_ZERO))) \ r.data (m2.ridx (i) + j * m2_nr) = false; \ r.maybe_compress (true); \ } \ @@ -957,8 +957,8 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < m2_nc; j++) \ { \ - for (octave_idx_type i = m2.cidx(j); i < m2.cidx(j+1); i++) \ - if ((m1.elem(0,0) != LHS_ZERO) OP (m2.data(i) != RHS_ZERO)) \ + for (octave_idx_type i = m2.cidx (j); i < m2.cidx (j+1); i++) \ + if ((m1.elem (0,0) != LHS_ZERO) OP (m2.data (i) != RHS_ZERO)) \ { \ r.ridx (nel) = m2.ridx (i); \ r.data (nel++) = true; \ @@ -973,12 +973,12 @@ { \ if (m1_nr > 0 && m1_nc > 0) \ { \ - if (LHS_ZERO OP (m2.elem(0,0) != RHS_ZERO)) \ + if (LHS_ZERO OP (m2.elem (0,0) != RHS_ZERO)) \ { \ r = SparseBoolMatrix (m1_nr, m1_nc, true); \ for (octave_idx_type j = 0; j < m1_nc; j++) \ - for (octave_idx_type i = m1.cidx(j); i < m1.cidx(j+1); i++) \ - if (! ((m1.data(i) != LHS_ZERO) OP (m2.elem(0,0) != RHS_ZERO))) \ + for (octave_idx_type i = m1.cidx (j); i < m1.cidx (j+1); i++) \ + if (! ((m1.data (i) != LHS_ZERO) OP (m2.elem (0,0) != RHS_ZERO))) \ r.data (m1.ridx (i) + j * m1_nr) = false; \ r.maybe_compress (true); \ } \ @@ -989,8 +989,8 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < m1_nc; j++) \ { \ - for (octave_idx_type i = m1.cidx(j); i < m1.cidx(j+1); i++) \ - if ((m1.data(i) != LHS_ZERO) OP (m2.elem(0,0) != RHS_ZERO)) \ + for (octave_idx_type i = m1.cidx (j); i < m1.cidx (j+1); i++) \ + if ((m1.data (i) != LHS_ZERO) OP (m2.elem (0,0) != RHS_ZERO)) \ { \ r.ridx (nel) = m1.ridx (i); \ r.data (nel++) = true; \ @@ -1016,7 +1016,7 @@ octave_idx_type e2 = m2.cidx (j+1); \ while (i1 < e1 || i2 < e2) \ { \ - if (i1 == e1 || (i2 < e2 && m1.ridx(i1) > m2.ridx(i2))) \ + if (i1 == e1 || (i2 < e2 && m1.ridx (i1) > m2.ridx (i2))) \ { \ if (LHS_ZERO OP m2.data (i2) != RHS_ZERO) \ { \ @@ -1025,7 +1025,7 @@ } \ i2++; \ } \ - else if (i2 == e2 || m1.ridx(i1) < m2.ridx(i2)) \ + else if (i2 == e2 || m1.ridx (i1) < m2.ridx (i2)) \ { \ if (m1.data (i1) != LHS_ZERO OP RHS_ZERO) \ { \ @@ -1036,7 +1036,7 @@ } \ else \ { \ - if (m1.data (i1) != LHS_ZERO OP m2.data(i2) != RHS_ZERO) \ + if (m1.data (i1) != LHS_ZERO OP m2.data (i2) != RHS_ZERO) \ { \ r.ridx (nel) = m1.ridx (i1); \ r.data (nel++) = true; \ @@ -1091,7 +1091,7 @@ octave_idx_type m2_nc = m2.cols (); \ \ if (m2_nr == 1 && m2_nc == 1) \ - r = R (m1 OP m2.elem(0,0)); \ + r = R (m1 OP m2.elem (0,0)); \ else if (m1_nr != m2_nr || m1_nc != m2_nc) \ gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ else \ @@ -1114,7 +1114,7 @@ octave_idx_type m2_nc = m2.cols (); \ \ if (m2_nr == 1 && m2_nc == 1) \ - r = R (m1 OP m2.elem(0,0)); \ + r = R (m1 OP m2.elem (0,0)); \ else if (m1_nr != m2_nr || m1_nc != m2_nc) \ gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ else \ @@ -1127,18 +1127,18 @@ for (octave_idx_type j = 0, k = 0; j < m2_nc; j++) \ { \ octave_quit (); \ - for (octave_idx_type i = m2.cidx(j); i < m2.cidx(j+1); i++) \ + for (octave_idx_type i = m2.cidx (j); i < m2.cidx (j+1); i++) \ { \ - octave_idx_type mri = m2.ridx(i); \ - R::element_type x = m1(mri, j) OP m2.data(i); \ + octave_idx_type mri = m2.ridx (i); \ + R::element_type x = m1(mri, j) OP m2.data (i); \ if (x != 0.0) \ { \ - r.xdata(k) = x; \ - r.xridx(k) = m2.ridx(i); \ + r.xdata (k) = x; \ + r.xridx (k) = m2.ridx (i); \ k++; \ } \ } \ - r.xcidx(j+1) = k; \ + r.xcidx (j+1) = k; \ } \ r.maybe_compress (false); \ return r; \ @@ -1182,7 +1182,7 @@ octave_idx_type m2_nc = m2.cols (); \ \ if (m2_nr == 1 && m2_nc == 1) \ - r = SparseBoolMatrix (F (m1, m2.elem(0,0))); \ + r = SparseBoolMatrix (F (m1, m2.elem (0,0))); \ else if (m1_nr == m2_nr && m1_nc == m2_nc) \ { \ if (m1_nr != 0 || m1_nc != 0) \ @@ -1191,7 +1191,7 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < m1_nc; j++) \ for (octave_idx_type i = 0; i < m1_nr; i++) \ - if (C1 (m1.elem(i, j)) OP C2 (m2.elem(i, j))) \ + if (C1 (m1.elem (i, j)) OP C2 (m2.elem (i, j))) \ nel++; \ \ r = SparseBoolMatrix (m1_nr, m1_nc, nel); \ @@ -1202,14 +1202,14 @@ { \ for (octave_idx_type i = 0; i < m1_nr; i++) \ { \ - bool el = C1 (m1.elem(i, j)) OP C2 (m2.elem(i, j)); \ + bool el = C1 (m1.elem (i, j)) OP C2 (m2.elem (i, j)); \ if (el) \ { \ - r.data(ii) = el; \ - r.ridx(ii++) = i; \ + r.data (ii) = el; \ + r.ridx (ii++) = i; \ } \ } \ - r.cidx(j+1) = ii; \ + r.cidx (j+1) = ii; \ } \ } \ } \ @@ -1250,7 +1250,7 @@ octave_idx_type m2_nc = m2.cols (); \ \ if (m2_nr == 1 && m2_nc == 1) \ - r = SparseBoolMatrix (F (m1, m2.elem(0,0))); \ + r = SparseBoolMatrix (F (m1, m2.elem (0,0))); \ else if (m1_nr == m2_nr && m1_nc == m2_nc) \ { \ if (m1_nr != 0 || m1_nc != 0) \ @@ -1259,8 +1259,8 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < m1_nc; j++) \ for (octave_idx_type i = 0; i < m1_nr; i++) \ - if ((m1.elem(i, j) != LHS_ZERO) \ - OP (m2.elem(i, j) != RHS_ZERO)) \ + if ((m1.elem (i, j) != LHS_ZERO) \ + OP (m2.elem (i, j) != RHS_ZERO)) \ nel++; \ \ r = SparseBoolMatrix (m1_nr, m1_nc, nel); \ @@ -1271,15 +1271,15 @@ { \ for (octave_idx_type i = 0; i < m1_nr; i++) \ { \ - bool el = (m1.elem(i, j) != LHS_ZERO) \ - OP (m2.elem(i, j) != RHS_ZERO); \ + bool el = (m1.elem (i, j) != LHS_ZERO) \ + OP (m2.elem (i, j) != RHS_ZERO); \ if (el) \ { \ - r.data(ii) = el; \ - r.ridx(ii++) = i; \ + r.data (ii) = el; \ + r.ridx (ii++) = i; \ } \ } \ - r.cidx(j+1) = ii; \ + r.cidx (j+1) = ii; \ } \ } \ } \ @@ -1324,7 +1324,7 @@ octave_idx_type m2_nc = m2.cols (); \ \ if (m1_nr == 1 && m1_nc == 1) \ - r = R (m1.elem(0,0) OP m2); \ + r = R (m1.elem (0,0) OP m2); \ else if (m1_nr != m2_nr || m1_nc != m2_nc) \ gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ else \ @@ -1355,7 +1355,7 @@ octave_idx_type m2_nc = m2.cols (); \ \ if (m1_nr == 1 && m1_nc == 1) \ - r = R (m1.elem(0,0) OP m2); \ + r = R (m1.elem (0,0) OP m2); \ else if (m1_nr != m2_nr || m1_nc != m2_nc) \ gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ else \ @@ -1368,18 +1368,18 @@ for (octave_idx_type j = 0, k = 0; j < m1_nc; j++) \ { \ octave_quit (); \ - for (octave_idx_type i = m1.cidx(j); i < m1.cidx(j+1); i++) \ + for (octave_idx_type i = m1.cidx (j); i < m1.cidx (j+1); i++) \ { \ - octave_idx_type mri = m1.ridx(i); \ - R::element_type x = m1.data(i) OP m2(mri, j); \ + octave_idx_type mri = m1.ridx (i); \ + R::element_type x = m1.data (i) OP m2 (mri, j); \ if (x != 0.0) \ { \ - r.xdata(k) = x; \ - r.xridx(k) = m1.ridx(i); \ + r.xdata (k) = x; \ + r.xridx (k) = m1.ridx (i); \ k++; \ } \ } \ - r.xcidx(j+1) = k; \ + r.xcidx (j+1) = k; \ } \ r.maybe_compress (false); \ return r; \ @@ -1422,7 +1422,7 @@ octave_idx_type m2_nc = m2.cols (); \ \ if (m1_nr == 1 && m1_nc == 1) \ - r = SparseBoolMatrix (F (m1.elem(0,0), m2)); \ + r = SparseBoolMatrix (F (m1.elem (0,0), m2)); \ else if (m1_nr == m2_nr && m1_nc == m2_nc) \ { \ if (m1_nr != 0 || m1_nc != 0) \ @@ -1431,7 +1431,7 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < m1_nc; j++) \ for (octave_idx_type i = 0; i < m1_nr; i++) \ - if (C1 (m1.elem(i, j)) OP C2 (m2.elem(i, j))) \ + if (C1 (m1.elem (i, j)) OP C2 (m2.elem (i, j))) \ nel++; \ \ r = SparseBoolMatrix (m1_nr, m1_nc, nel); \ @@ -1442,14 +1442,14 @@ { \ for (octave_idx_type i = 0; i < m1_nr; i++) \ { \ - bool el = C1 (m1.elem(i, j)) OP C2 (m2.elem(i, j)); \ + bool el = C1 (m1.elem (i, j)) OP C2 (m2.elem (i, j)); \ if (el) \ { \ - r.data(ii) = el; \ - r.ridx(ii++) = i; \ + r.data (ii) = el; \ + r.ridx (ii++) = i; \ } \ } \ - r.cidx(j+1) = ii; \ + r.cidx (j+1) = ii; \ } \ } \ } \ @@ -1490,7 +1490,7 @@ octave_idx_type m2_nc = m2.cols (); \ \ if (m1_nr == 1 && m1_nc == 1) \ - r = SparseBoolMatrix (F (m1.elem(0,0), m2)); \ + r = SparseBoolMatrix (F (m1.elem (0,0), m2)); \ else if (m1_nr == m2_nr && m1_nc == m2_nc) \ { \ if (m1_nr != 0 || m1_nc != 0) \ @@ -1499,8 +1499,8 @@ octave_idx_type nel = 0; \ for (octave_idx_type j = 0; j < m1_nc; j++) \ for (octave_idx_type i = 0; i < m1_nr; i++) \ - if ((m1.elem(i, j) != LHS_ZERO) \ - OP (m2.elem(i, j) != RHS_ZERO)) \ + if ((m1.elem (i, j) != LHS_ZERO) \ + OP (m2.elem (i, j) != RHS_ZERO)) \ nel++; \ \ r = SparseBoolMatrix (m1_nr, m1_nc, nel); \ @@ -1511,15 +1511,15 @@ { \ for (octave_idx_type i = 0; i < m1_nr; i++) \ { \ - bool el = (m1.elem(i, j) != LHS_ZERO) \ - OP (m2.elem(i, j) != RHS_ZERO); \ + bool el = (m1.elem (i, j) != LHS_ZERO) \ + OP (m2.elem (i, j) != RHS_ZERO); \ if (el) \ { \ - r.data(ii) = el; \ - r.ridx(ii++) = i; \ + r.data (ii) = el; \ + r.ridx (ii++) = i; \ } \ } \ - r.cidx(j+1) = ii; \ + r.cidx (j+1) = ii; \ } \ } \ } \ @@ -1565,30 +1565,30 @@ ELT_TYPE t = ELT_TYPE (); \ for (octave_idx_type j = cidx (i); j < cidx (i+1); j++) \ { \ - t += data(j); \ + t += data (j); \ if (t != ELT_TYPE ()) \ { \ - if (j == cidx(i+1) - 1) \ - nel += nr - ridx(j); \ + if (j == cidx (i+1) - 1) \ + nel += nr - ridx (j); \ else \ - nel += ridx(j+1) - ridx(j); \ + nel += ridx (j+1) - ridx (j); \ } \ } \ } \ retval = RET_TYPE (nr, nc, nel); \ - retval.cidx(0) = 0; \ + retval.cidx (0) = 0; \ octave_idx_type ii = 0; \ for (octave_idx_type i = 0; i < nc; i++) \ { \ ELT_TYPE t = ELT_TYPE (); \ for (octave_idx_type j = cidx (i); j < cidx (i+1); j++) \ { \ - t += data(j); \ + t += data (j); \ if (t != ELT_TYPE ()) \ { \ - if (j == cidx(i+1) - 1) \ + if (j == cidx (i+1) - 1) \ { \ - for (octave_idx_type k = ridx(j); k < nr; k++) \ + for (octave_idx_type k = ridx (j); k < nr; k++) \ { \ retval.data (ii) = t; \ retval.ridx (ii++) = k; \ @@ -1596,7 +1596,7 @@ } \ else \ { \ - for (octave_idx_type k = ridx(j); k < ridx(j+1); k++) \ + for (octave_idx_type k = ridx (j); k < ridx (j+1); k++) \ { \ retval.data (ii) = t; \ retval.ridx (ii++) = k; \ @@ -1604,7 +1604,7 @@ } \ } \ } \ - retval.cidx(i+1) = ii; \ + retval.cidx (i+1) = ii; \ } \ } \ } \ @@ -1634,7 +1634,7 @@ octave_idx_type jj = 0; \ for (octave_idx_type j = cidx (i); j < cidx (i+1); j++) \ { \ - if (jj == ridx(j)) \ + if (jj == ridx (j)) \ { \ nel++; \ jj++; \ @@ -1644,7 +1644,7 @@ } \ } \ retval = RET_TYPE (nr, nc, nel); \ - retval.cidx(0) = 0; \ + retval.cidx (0) = 0; \ octave_idx_type ii = 0; \ for (octave_idx_type i = 0; i < nc; i++) \ { \ @@ -1652,16 +1652,16 @@ octave_idx_type jj = 0; \ for (octave_idx_type j = cidx (i); j < cidx (i+1); j++) \ { \ - if (jj == ridx(j)) \ + if (jj == ridx (j)) \ { \ - t *= data(j); \ - retval.data(ii) = t; \ - retval.ridx(ii++) = jj++; \ + t *= data (j); \ + retval.data (ii) = t; \ + retval.ridx (ii++) = jj++; \ } \ else \ break; \ } \ - retval.cidx(i+1) = ii; \ + retval.cidx (i+1) = ii; \ } \ } \ } \ @@ -1690,7 +1690,7 @@ tmp[i] = INIT_VAL; \ for (j = 0; j < nc; j++) \ { \ - for (octave_idx_type i = cidx(j); i < cidx(j + 1); i++) \ + for (octave_idx_type i = cidx (j); i < cidx (j + 1); i++) \ { \ ROW_EXPR; \ } \ @@ -1700,14 +1700,14 @@ if (tmp[i] != EL_TYPE ()) \ nel++ ; \ retval = RET_TYPE (nr, static_cast<octave_idx_type> (1), nel); \ - retval.cidx(0) = 0; \ - retval.cidx(1) = nel; \ + retval.cidx (0) = 0; \ + retval.cidx (1) = nel; \ nel = 0; \ for (octave_idx_type i = 0; i < nr; i++) \ if (tmp[i] != EL_TYPE ()) \ { \ - retval.data(nel) = tmp[i]; \ - retval.ridx(nel++) = i; \ + retval.data (nel) = tmp[i]; \ + retval.ridx (nel++) = i; \ } \ } \ else \ @@ -1717,7 +1717,7 @@ for (octave_idx_type j = 0; j < nc; j++) \ { \ tmp[j] = INIT_VAL; \ - for (octave_idx_type i = cidx(j); i < cidx(j + 1); i++) \ + for (octave_idx_type i = cidx (j); i < cidx (j + 1); i++) \ { \ COL_EXPR; \ } \ @@ -1727,17 +1727,17 @@ if (tmp[i] != EL_TYPE ()) \ nel++ ; \ retval = RET_TYPE (static_cast<octave_idx_type> (1), nc, nel); \ - retval.cidx(0) = 0; \ + retval.cidx (0) = 0; \ nel = 0; \ for (octave_idx_type i = 0; i < nc; i++) \ if (tmp[i] != EL_TYPE ()) \ { \ - retval.data(nel) = tmp[i]; \ - retval.ridx(nel++) = 0; \ - retval.cidx(i+1) = retval.cidx(i) + 1; \ + retval.data (nel) = tmp[i]; \ + retval.ridx (nel++) = 0; \ + retval.cidx (i+1) = retval.cidx (i) + 1; \ } \ else \ - retval.cidx(i+1) = retval.cidx(i); \ + retval.cidx (i+1) = retval.cidx (i); \ } \ } \ else if (nc == 0 && (nr == 0 || (nr == 1 && dim == -1))) \ @@ -1747,10 +1747,10 @@ retval = RET_TYPE (static_cast<octave_idx_type> (1), \ static_cast<octave_idx_type> (1), \ static_cast<octave_idx_type> (1)); \ - retval.cidx(0) = 0; \ - retval.cidx(1) = 1; \ - retval.ridx(0) = 0; \ - retval.data(0) = MT_RESULT; \ + retval.cidx (0) = 0; \ + retval.cidx (1) = 1; \ + retval.ridx (0) = 0; \ + retval.data (0) = MT_RESULT; \ } \ else \ retval = RET_TYPE (static_cast<octave_idx_type> (1), \ @@ -1779,12 +1779,12 @@ if (MT_RESULT) \ { \ retval = RET_TYPE (nr, static_cast<octave_idx_type> (1), nr); \ - retval.cidx(0) = 0; \ - retval.cidx(1) = nr; \ + retval.cidx (0) = 0; \ + retval.cidx (1) = nr; \ for (octave_idx_type i = 0; i < nr; i++) \ { \ - retval.ridx(i) = i; \ - retval.data(i) = MT_RESULT; \ + retval.ridx (i) = i; \ + retval.data (i) = MT_RESULT; \ } \ } \ else \ @@ -1797,7 +1797,7 @@ return retval #define SPARSE_REDUCTION_OP_ROW_EXPR(OP) \ - tmp[ridx(i)] OP data (i) + tmp[ridx (i)] OP data (i) #define SPARSE_REDUCTION_OP_COL_EXPR(OP) \ tmp[j] OP data (i) @@ -1814,7 +1814,7 @@ // loop. #define SPARSE_ANY_ALL_OP_ROW_CODE(TEST_OP, TEST_TRUE_VAL) \ if (data (i) TEST_OP 0.0) \ - tmp[ridx(i)] = TEST_TRUE_VAL; \ + tmp[ridx (i)] = TEST_TRUE_VAL; \ #define SPARSE_ANY_ALL_OP_COL_CODE(TEST_OP, TEST_TRUE_VAL) \ if (data (i) TEST_OP 0.0) \ @@ -1834,7 +1834,7 @@ return transpose (). all (0). transpose (); \ else \ { \ - SPARSE_ANY_ALL_OP (DIM, (cidx(j+1) - cidx(j) < nr ? false : true), \ + SPARSE_ANY_ALL_OP (DIM, (cidx (j+1) - cidx (j) < nr ? false : true), \ true, ==, false); \ } @@ -1849,20 +1849,20 @@ \ if (nr == 1 && nc == 1) \ { \ - RET_EL_TYPE s = m.elem(0,0); \ + RET_EL_TYPE s = m.elem (0,0); \ octave_idx_type nz = a.nnz (); \ RET_TYPE r (a_nr, a_nc, nz); \ \ for (octave_idx_type i = 0; i < nz; i++) \ { \ octave_quit (); \ - r.data(i) = s * a.data(i); \ - r.ridx(i) = a.ridx(i); \ + r.data (i) = s * a.data (i); \ + r.ridx (i) = a.ridx (i); \ } \ for (octave_idx_type i = 0; i < a_nc + 1; i++) \ { \ octave_quit (); \ - r.cidx(i) = a.cidx(i); \ + r.cidx (i) = a.cidx (i); \ } \ \ r.maybe_compress (true); \ @@ -1870,20 +1870,20 @@ } \ else if (a_nr == 1 && a_nc == 1) \ { \ - RET_EL_TYPE s = a.elem(0,0); \ + RET_EL_TYPE s = a.elem (0,0); \ octave_idx_type nz = m.nnz (); \ RET_TYPE r (nr, nc, nz); \ \ for (octave_idx_type i = 0; i < nz; i++) \ { \ octave_quit (); \ - r.data(i) = m.data(i) * s; \ - r.ridx(i) = m.ridx(i); \ + r.data (i) = m.data (i) * s; \ + r.ridx (i) = m.ridx (i); \ } \ for (octave_idx_type i = 0; i < nc + 1; i++) \ { \ octave_quit (); \ - r.cidx(i) = m.cidx(i); \ + r.cidx (i) = m.cidx (i); \ } \ \ r.maybe_compress (true); \ @@ -1900,26 +1900,26 @@ RET_TYPE retval (nr, a_nc, static_cast<octave_idx_type> (0)); \ for (octave_idx_type i = 0; i < nr; i++) \ w[i] = 0; \ - retval.xcidx(0) = 0; \ + retval.xcidx (0) = 0; \ \ octave_idx_type nel = 0; \ \ for (octave_idx_type i = 0; i < a_nc; i++) \ { \ - for (octave_idx_type j = a.cidx(i); j < a.cidx(i+1); j++) \ + for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \ { \ - octave_idx_type col = a.ridx(j); \ - for (octave_idx_type k = m.cidx(col) ; k < m.cidx(col+1); k++) \ + octave_idx_type col = a.ridx (j); \ + for (octave_idx_type k = m.cidx (col) ; k < m.cidx (col+1); k++) \ { \ - if (w[m.ridx(k)] < i + 1) \ + if (w[m.ridx (k)] < i + 1) \ { \ - w[m.ridx(k)] = i + 1; \ + w[m.ridx (k)] = i + 1; \ nel++; \ } \ octave_quit (); \ } \ } \ - retval.xcidx(i+1) = nel; \ + retval.xcidx (i+1) = nel; \ } \ \ if (nel == 0) \ @@ -1951,57 +1951,57 @@ \ for (octave_idx_type i = 0; i < a_nc ; i++) \ { \ - if (retval.xcidx(i+1) - retval.xcidx(i) > n_per_col) \ + if (retval.xcidx (i+1) - retval.xcidx (i) > n_per_col) \ { \ - for (octave_idx_type j = a.cidx(i); j < a.cidx(i+1); j++) \ + for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \ { \ - octave_idx_type col = a.ridx(j); \ - EL_TYPE tmpval = a.data(j); \ - for (octave_idx_type k = m.cidx(col) ; \ - k < m.cidx(col+1); k++) \ + octave_idx_type col = a.ridx (j); \ + EL_TYPE tmpval = a.data (j); \ + for (octave_idx_type k = m.cidx (col) ; \ + k < m.cidx (col+1); k++) \ { \ octave_quit (); \ - octave_idx_type row = m.ridx(k); \ + octave_idx_type row = m.ridx (k); \ if (w[row] < i + 1) \ { \ w[row] = i + 1; \ - Xcol[row] = tmpval * m.data(k); \ + Xcol[row] = tmpval * m.data (k); \ } \ else \ - Xcol[row] += tmpval * m.data(k); \ + Xcol[row] += tmpval * m.data (k); \ } \ } \ for (octave_idx_type k = 0; k < nr; k++) \ if (w[k] == i + 1) \ { \ - retval.xdata(ii) = Xcol[k]; \ - retval.xridx(ii++) = k; \ + retval.xdata (ii) = Xcol[k]; \ + retval.xridx (ii++) = k; \ } \ } \ else \ { \ - for (octave_idx_type j = a.cidx(i); j < a.cidx(i+1); j++) \ + for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \ { \ - octave_idx_type col = a.ridx(j); \ - EL_TYPE tmpval = a.data(j); \ - for (octave_idx_type k = m.cidx(col) ; \ - k < m.cidx(col+1); k++) \ + octave_idx_type col = a.ridx (j); \ + EL_TYPE tmpval = a.data (j); \ + for (octave_idx_type k = m.cidx (col) ; \ + k < m.cidx (col+1); k++) \ { \ octave_quit (); \ - octave_idx_type row = m.ridx(k); \ + octave_idx_type row = m.ridx (k); \ if (w[row] < i + 1) \ { \ w[row] = i + 1; \ - retval.xridx(ii++) = row;\ - Xcol[row] = tmpval * m.data(k); \ + retval.xridx (ii++) = row;\ + Xcol[row] = tmpval * m.data (k); \ } \ else \ - Xcol[row] += tmpval * m.data(k); \ + Xcol[row] += tmpval * m.data (k); \ } \ } \ - sort.sort (ri + retval.xcidx(i), ii - retval.xcidx(i)); \ - for (octave_idx_type k = retval.xcidx(i); k < ii; k++) \ - retval.xdata(k) = Xcol[retval.xridx(k)]; \ + sort.sort (ri + retval.xcidx (i), ii - retval.xcidx (i)); \ + for (octave_idx_type k = retval.xcidx (i); k < ii; k++) \ + retval.xdata (k) = Xcol[retval.xridx (k)]; \ } \ } \ retval.maybe_compress (true);\ @@ -2036,9 +2036,9 @@ { \ octave_quit (); \ \ - EL_TYPE tmpval = a.elem(j,i); \ - for (octave_idx_type k = m.cidx(j) ; k < m.cidx(j+1); k++) \ - retval.elem (m.ridx(k),i) += tmpval * m.data(k); \ + EL_TYPE tmpval = a.elem (j,i); \ + for (octave_idx_type k = m.cidx (j) ; k < m.cidx (j+1); k++) \ + retval.elem (m.ridx (k),i) += tmpval * m.data (k); \ } \ } \ return retval; \ @@ -2053,7 +2053,7 @@ \ if (nr == 1 && nc == 1) \ { \ - RET_TYPE retval = CONJ_OP (m.elem(0,0)) * a; \ + RET_TYPE retval = CONJ_OP (m.elem (0,0)) * a; \ return retval; \ } \ else if (nr != a_nr) \ @@ -2072,8 +2072,8 @@ octave_quit (); \ \ EL_TYPE acc = ZERO; \ - for (octave_idx_type k = m.cidx(j) ; k < m.cidx(j+1); k++) \ - acc += a.elem (m.ridx(k),i) * CONJ_OP (m.data(k)); \ + for (octave_idx_type k = m.cidx (j) ; k < m.cidx (j+1); k++) \ + acc += a.elem (m.ridx (k),i) * CONJ_OP (m.data (k)); \ retval.xelem (j,i) = acc; \ } \ } \ @@ -2104,13 +2104,13 @@ for (octave_idx_type i = 0; i < a_nc ; i++) \ { \ octave_quit (); \ - for (octave_idx_type j = a.cidx(i); j < a.cidx(i+1); j++) \ + for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \ { \ - octave_idx_type col = a.ridx(j); \ - EL_TYPE tmpval = a.data(j); \ + octave_idx_type col = a.ridx (j); \ + EL_TYPE tmpval = a.data (j); \ \ for (octave_idx_type k = 0 ; k < nr; k++) \ - retval.xelem (k,i) += tmpval * m.elem(k,col); \ + retval.xelem (k,i) += tmpval * m.elem (k,col); \ } \ } \ return retval; \ @@ -2125,7 +2125,7 @@ \ if (a_nr == 1 && a_nc == 1) \ { \ - RET_TYPE retval = m * CONJ_OP (a.elem(0,0)); \ + RET_TYPE retval = m * CONJ_OP (a.elem (0,0)); \ return retval; \ } \ else if (nc != a_nc) \ @@ -2140,12 +2140,12 @@ for (octave_idx_type i = 0; i < a_nc ; i++) \ { \ octave_quit (); \ - for (octave_idx_type j = a.cidx(i); j < a.cidx(i+1); j++) \ + for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \ { \ - octave_idx_type col = a.ridx(j); \ - EL_TYPE tmpval = CONJ_OP (a.data(j)); \ + octave_idx_type col = a.ridx (j); \ + EL_TYPE tmpval = CONJ_OP (a.data (j)); \ for (octave_idx_type k = 0 ; k < nr; k++) \ - retval.xelem (k,col) += tmpval * m.elem(k,i); \ + retval.xelem (k,col) += tmpval * m.elem (k,i); \ } \ } \ return retval; \
--- a/liboctave/Sparse-perm-op-defs.h Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/Sparse-perm-op-defs.h Thu Jul 26 08:13:22 2012 -0700 @@ -43,15 +43,15 @@ { octave_quit (); - OCTAVE_LOCAL_BUFFER (octave_idx_type, sidx, r.xcidx(j+1) - r.xcidx(j)); - for (octave_idx_type i = r.xcidx(j), ii = 0; i < r.xcidx(j+1); i++) + OCTAVE_LOCAL_BUFFER (octave_idx_type, sidx, r.xcidx (j+1) - r.xcidx (j)); + for (octave_idx_type i = r.xcidx (j), ii = 0; i < r.xcidx (j+1); i++) { sidx[ii++]=i; r.xridx (i) = pcol[a.ridx (i)]; } - sort.sort (r.xridx () + r.xcidx(j), sidx, r.xcidx(j+1) - r.xcidx(j)); - for (octave_idx_type i = r.xcidx(j), ii = 0; i < r.xcidx(j+1); i++) - r.xdata(i) = a.data (sidx[ii++]); + sort.sort (r.xridx () + r.xcidx (j), sidx, r.xcidx (j+1) - r.xcidx (j)); + for (octave_idx_type i = r.xcidx (j), ii = 0; i < r.xcidx (j+1); i++) + r.xdata (i) = a.data (sidx[ii++]); } return r;
--- a/liboctave/Sparse.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/Sparse.cc Thu Jul 26 08:13:22 2012 -0700 @@ -66,12 +66,12 @@ if (a.is_row_perm ()) { for (octave_idx_type i = 0; i < n; i++) - ridx (pv (i)) = i; + ridx (pv(i)) = i; } else { for (octave_idx_type i = 0; i < n; i++) - ridx (i) = pv (i); + ridx (i) = pv(i); } for (octave_idx_type i = 0; i < n; i++) @@ -176,13 +176,13 @@ // Reallocate. octave_idx_type min_nzmx = std::min (nz, nzmx); - octave_idx_type * new_ridx = new octave_idx_type [nz]; + octave_idx_type * new_ridx = new octave_idx_type[nz]; copy_or_memcpy (min_nzmx, r, new_ridx); delete [] r; r = new_ridx; - T * new_data = new T [nz]; + T * new_data = new T[nz]; copy_or_memcpy (min_nzmx, d, new_data); delete [] d; @@ -223,7 +223,7 @@ { rep = new typename Sparse<T>::SparseRep (nr, nc, 0); for (octave_idx_type j = 0; j < nc+1; j++) - xcidx(j) = 0; + xcidx (j) = 0; } } @@ -264,21 +264,21 @@ rep = new typename Sparse<T>::SparseRep (new_nr, new_nc, new_nzmx); octave_idx_type kk = 0; - xcidx(0) = 0; + xcidx (0) = 0; for (octave_idx_type i = 0; i < old_nc; i++) - for (octave_idx_type j = a.cidx(i); j < a.cidx(i+1); j++) + for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) { - octave_idx_type tmp = i * old_nr + a.ridx(j); + octave_idx_type tmp = i * old_nr + a.ridx (j); octave_idx_type ii = tmp % new_nr; octave_idx_type jj = (tmp - ii) / new_nr; for (octave_idx_type k = kk; k < jj; k++) - xcidx(k+1) = j; + xcidx (k+1) = j; kk = jj; - xdata(j) = a.data(j); - xridx(j) = ii; + xdata (j) = a.data (j); + xridx (j) = ii; } for (octave_idx_type k = kk; k < new_nc; k++) - xcidx(k+1) = new_nzmx; + xcidx (k+1) = new_nzmx; } } @@ -323,11 +323,11 @@ if (n == 1 && a(0) != T ()) { change_capacity (nzm > 1 ? nzm : 1); - xcidx(0) = 0; - xridx(0) = r(0); - xdata(0) = a(0); + xcidx (0) = 0; + xridx (0) = r(0); + xdata (0) = a(0); for (octave_idx_type j = 0; j < nc; j++) - xcidx(j+1) = j >= c(0); + xcidx (j+1) = j >= c(0); } } else if (a_scalar) @@ -419,7 +419,7 @@ sidx[ci[cd[i]+1]++] = rd[i]; // Subsorts. We don't need a stable sort, all values are equal. - xcidx(0) = 0; + xcidx (0) = 0; for (octave_idx_type j = 0; j < nc; j++) { std::sort (sidx + ci[j], sidx + ci[j+1]); @@ -435,7 +435,7 @@ } } // Set column pointer. - xcidx(j+1) = xcidx(j) + nzj; + xcidx (j+1) = xcidx (j) + nzj; } change_capacity (nzm > xcidx (nc) ? nzm : xcidx (nc)); @@ -495,8 +495,8 @@ new_nz += rd[i-1] != rd[i]; // Allocate result. change_capacity (nzm > new_nz ? nzm : new_nz); - xcidx(0) = 0; - xcidx(1) = new_nz; + xcidx (0) = 0; + xcidx (1) = new_nz; octave_idx_type *rri = ridx (); T *rrd = data (); @@ -566,7 +566,7 @@ } // Subsorts. We don't need a stable sort, the second index stabilizes it. - xcidx(0) = 0; + xcidx (0) = 0; for (octave_idx_type j = 0; j < nc; j++) { std::sort (spairs + ci[j], spairs + ci[j+1]); @@ -582,7 +582,7 @@ } } // Set column pointer. - xcidx(j+1) = xcidx(j) + nzj; + xcidx (j+1) = xcidx (j) + nzj; } change_capacity (nzm > xcidx (nc) ? nzm : xcidx (nc)); @@ -652,16 +652,16 @@ rep = new typename Sparse<T>::SparseRep (nr, nc, new_nzmx); octave_idx_type ii = 0; - xcidx(0) = 0; + xcidx (0) = 0; for (octave_idx_type j = 0; j < nc; j++) { for (octave_idx_type i = 0; i < nr; i++) if (a.elem (i,j) != T ()) { - xdata(ii) = a.elem (i,j); - xridx(ii++) = i; + xdata (ii) = a.elem (i,j); + xridx (ii++) = i; } - xcidx(j+1) = ii; + xcidx (j+1) = ii; } } } @@ -833,21 +833,21 @@ retval = Sparse<T> (new_nr, new_nc, new_nnz); octave_idx_type kk = 0; - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (octave_idx_type i = 0; i < old_nc; i++) - for (octave_idx_type j = cidx(i); j < cidx(i+1); j++) + for (octave_idx_type j = cidx (i); j < cidx (i+1); j++) { - octave_idx_type tmp = i * old_nr + ridx(j); + octave_idx_type tmp = i * old_nr + ridx (j); octave_idx_type ii = tmp % new_nr; octave_idx_type jj = (tmp - ii) / new_nr; for (octave_idx_type k = kk; k < jj; k++) - retval.xcidx(k+1) = j; + retval.xcidx (k+1) = j; kk = jj; - retval.xdata(j) = data(j); - retval.xridx(j) = ii; + retval.xdata (j) = data (j); + retval.xridx (j) = ii; } for (octave_idx_type k = kk; k < new_nc; k++) - retval.xcidx(k+1) = new_nnz; + retval.xcidx (k+1) = new_nnz; } else { @@ -949,14 +949,14 @@ octave_idx_type i = 0, k = 0; for (octave_idx_type j = 1; j <= rep->ncols; j++) { - octave_idx_type u = xcidx(j); + octave_idx_type u = xcidx (j); for (i = i; i < u; i++) - if (xridx(i) < r) + if (xridx (i) < r) { - xdata(k) = xdata(i); - xridx(k++) = xridx(i); + xdata (k) = xdata (i); + xridx (k++) = xridx (i); } - xcidx(j) = k; + xcidx (j) = k; } } @@ -994,69 +994,69 @@ } // First count the number of elements in the final array - octave_idx_type nel = cidx(c) + a.nnz (); + octave_idx_type nel = cidx (c) + a.nnz (); if (c + a_cols < nc) - nel += cidx(nc) - cidx(c + a_cols); + nel += cidx (nc) - cidx (c + a_cols); for (octave_idx_type i = c; i < c + a_cols; i++) - for (octave_idx_type j = cidx(i); j < cidx(i+1); j++) - if (ridx(j) < r || ridx(j) >= r + a_rows) + for (octave_idx_type j = cidx (i); j < cidx (i+1); j++) + if (ridx (j) < r || ridx (j) >= r + a_rows) nel++; Sparse<T> tmp (*this); --rep->count; rep = new typename Sparse<T>::SparseRep (nr, nc, nel); - for (octave_idx_type i = 0; i < tmp.cidx(c); i++) + for (octave_idx_type i = 0; i < tmp.cidx (c); i++) { - data(i) = tmp.data(i); - ridx(i) = tmp.ridx(i); + data (i) = tmp.data (i); + ridx (i) = tmp.ridx (i); } for (octave_idx_type i = 0; i < c + 1; i++) - cidx(i) = tmp.cidx(i); + cidx (i) = tmp.cidx (i); - octave_idx_type ii = cidx(c); + octave_idx_type ii = cidx (c); for (octave_idx_type i = c; i < c + a_cols; i++) { octave_quit (); - for (octave_idx_type j = tmp.cidx(i); j < tmp.cidx(i+1); j++) - if (tmp.ridx(j) < r) + for (octave_idx_type j = tmp.cidx (i); j < tmp.cidx (i+1); j++) + if (tmp.ridx (j) < r) { - data(ii) = tmp.data(j); - ridx(ii++) = tmp.ridx(j); + data (ii) = tmp.data (j); + ridx (ii++) = tmp.ridx (j); } octave_quit (); - for (octave_idx_type j = a.cidx(i-c); j < a.cidx(i-c+1); j++) + for (octave_idx_type j = a.cidx (i-c); j < a.cidx (i-c+1); j++) { - data(ii) = a.data(j); - ridx(ii++) = r + a.ridx(j); + data (ii) = a.data (j); + ridx (ii++) = r + a.ridx (j); } octave_quit (); - for (octave_idx_type j = tmp.cidx(i); j < tmp.cidx(i+1); j++) - if (tmp.ridx(j) >= r + a_rows) + for (octave_idx_type j = tmp.cidx (i); j < tmp.cidx (i+1); j++) + if (tmp.ridx (j) >= r + a_rows) { - data(ii) = tmp.data(j); - ridx(ii++) = tmp.ridx(j); + data (ii) = tmp.data (j); + ridx (ii++) = tmp.ridx (j); } - cidx(i+1) = ii; + cidx (i+1) = ii; } for (octave_idx_type i = c + a_cols; i < nc; i++) { - for (octave_idx_type j = tmp.cidx(i); j < tmp.cidx(i+1); j++) + for (octave_idx_type j = tmp.cidx (i); j < tmp.cidx (i+1); j++) { - data(ii) = tmp.data(j); - ridx(ii++) = tmp.ridx(j); + data (ii) = tmp.data (j); + ridx (ii++) = tmp.ridx (j); } - cidx(i+1) = ii; + cidx (i+1) = ii; } return *this; @@ -1100,7 +1100,7 @@ // retval.xcidx[1:nr] holds row entry *start* offsets for rows 0:(nr-1) for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type k = cidx(j); k < cidx(j+1); k++) + for (octave_idx_type k = cidx (j); k < cidx (j+1); k++) { octave_idx_type q = retval.xcidx (ridx (k) + 1)++; retval.xridx (q) = j; @@ -1170,7 +1170,7 @@ copy_or_memcpy (li, tmp.ridx (), xridx ()); copy_or_memcpy (nz - ui, tmp.data () + ui, xdata () + li); mx_inline_sub (nz - ui, xridx () + li, tmp.ridx () + ui, ub - lb); - xcidx(1) = nz_new; + xcidx (1) = nz_new; } else { @@ -1181,11 +1181,11 @@ octave_idx_type sl = sidx.length (nel), nz_new = 0, j = 0; for (octave_idx_type i = 0; i < nz; i++) { - octave_idx_type r = tmp.ridx(i); + octave_idx_type r = tmp.ridx (i); for (;j < sl && sj[j] < r; j++) ; if (j == sl || sj[j] > r) { - data_new[nz_new] = tmp.data(i); + data_new[nz_new] = tmp.data (i); ridx_new[nz_new++] = r - j; } } @@ -1193,7 +1193,7 @@ *this = Sparse<T> (nr - sl, 1, nz_new); copy_or_memcpy (nz_new, ridx_new, ridx ()); copy_or_memcpy (nz_new, data_new, xdata ()); - xcidx(1) = nz_new; + xcidx (1) = nz_new; } } else if (nr == 1) @@ -1203,7 +1203,7 @@ if (idx.is_cont_range (nc, lb, ub)) { const Sparse<T> tmp = *this; - octave_idx_type lbi = tmp.cidx(lb), ubi = tmp.cidx(ub), new_nz = nz - (ubi - lbi); + octave_idx_type lbi = tmp.cidx (lb), ubi = tmp.cidx (ub), new_nz = nz - (ubi - lbi); *this = Sparse<T> (1, nc - (ub - lb), new_nz); copy_or_memcpy (lbi, tmp.data (), data ()); copy_or_memcpy (nz - ubi, tmp.data () + ubi, xdata () + lbi); @@ -1253,7 +1253,7 @@ else { const Sparse<T> tmp = *this; - octave_idx_type lbi = tmp.cidx(lb), ubi = tmp.cidx(ub), + octave_idx_type lbi = tmp.cidx (lb), ubi = tmp.cidx (ub), new_nz = nz - (ubi - lbi); *this = Sparse<T> (nr, nc - (ub - lb), new_nz); @@ -1296,20 +1296,20 @@ tmpl.nnz () + tmpu.nnz ()); for (octave_idx_type j = 0, k = 0; j < nc; j++) { - for (octave_idx_type i = tmpl.cidx(j); i < tmpl.cidx(j+1); + for (octave_idx_type i = tmpl.cidx (j); i < tmpl.cidx (j+1); i++) { - xdata(k) = tmpl.data(i); - xridx(k++) = tmpl.ridx(i); + xdata (k) = tmpl.data (i); + xridx (k++) = tmpl.ridx (i); } - for (octave_idx_type i = tmpu.cidx(j); i < tmpu.cidx(j+1); + for (octave_idx_type i = tmpu.cidx (j); i < tmpu.cidx (j+1); i++) { - xdata(k) = tmpu.data(i); - xridx(k++) = tmpu.ridx(i) + lb; + xdata (k) = tmpu.data (i); + xridx (k++) = tmpu.ridx (i) + lb; } - xcidx(j+1) = k; + xcidx (j+1) = k; } } } @@ -1373,15 +1373,15 @@ for (octave_idx_type i = 0; i < nc; i++) { - for (octave_idx_type j = cidx(i); j < cidx(i+1); j++) + for (octave_idx_type j = cidx (i); j < cidx (i+1); j++) { - retval.xdata(j) = data(j); - retval.xridx(j) = ridx(j) + i * nr; + retval.xdata (j) = data (j); + retval.xridx (j) = ridx (j) + i * nr; } } - retval.xcidx(0) = 0; - retval.xcidx(1) = nz; + retval.xcidx (0) = 0; + retval.xcidx (1) = nz; } } else if (idx.extent (nel) > nel) @@ -1404,7 +1404,7 @@ // then want to make a dense matrix with sparse // representation. Ok, we'll do it, but you deserve what // you get!! - retval = Sparse<T> (idx_dims(0), idx_dims(1), nz ? data(0) : T ()); + retval = Sparse<T> (idx_dims(0), idx_dims(1), nz ? data (0) : T ()); } else if (nc == 1) { @@ -1415,8 +1415,8 @@ { // Scalar index - just a binary lookup. octave_idx_type i = lblookup (ridx (), nz, idx(0)); - if (i < nz && ridx(i) == idx(0)) - retval = Sparse (1, 1, data(i)); + if (i < nz && ridx (i) == idx(0)) + retval = Sparse (1, 1, data (i)); else retval = Sparse (1, 1); } @@ -1431,7 +1431,7 @@ retval = Sparse<T> (ub - lb, 1, nz_new); copy_or_memcpy (nz_new, data () + li, retval.data ()); mx_inline_sub (nz_new, retval.xridx (), ridx () + li, lb); - retval.xcidx(1) = nz_new; + retval.xcidx (1) = nz_new; } else if (idx.is_permutation (nel) && idx.is_vector ()) { @@ -1477,15 +1477,15 @@ for (octave_idx_type i = 0; i < new_nr; i++) { octave_idx_type l = lidx(i, j); - if (l < nz && ridx(l) == idxa(i, j)) + if (l < nz && ridx (l) == idxa(i, j)) nzj++; else lidx(i, j) = nz; } - retval.xcidx(j+1) = retval.xcidx(j) + nzj; + retval.xcidx (j+1) = retval.xcidx (j) + nzj; } - retval.change_capacity (retval.xcidx(new_nc)); + retval.change_capacity (retval.xcidx (new_nc)); // Copy data and set row indices. octave_idx_type k = 0; @@ -1495,8 +1495,8 @@ octave_idx_type l = lidx(i, j); if (l < nz) { - retval.data(k) = data(l); - retval.xridx(k++) = i; + retval.data (k) = data (l); + retval.xridx (k++) = i; } } } @@ -1505,11 +1505,11 @@ { octave_idx_type lb, ub; if (idx.is_scalar ()) - retval = Sparse<T> (1, 1, elem(0, idx(0))); + retval = Sparse<T> (1, 1, elem (0, idx(0))); else if (idx.is_cont_range (nel, lb, ub)) { // Special-case a contiguous range. - octave_idx_type lbi = cidx(lb), ubi = cidx(ub), new_nz = ubi - lbi; + octave_idx_type lbi = cidx (lb), ubi = cidx (ub), new_nz = ubi - lbi; retval = Sparse<T> (1, ub - lb, new_nz); copy_or_memcpy (new_nz, data () + lbi, retval.data ()); fill_or_memset (new_nz, static_cast<octave_idx_type> (0), retval.ridx ()); @@ -1583,7 +1583,7 @@ else if (idx_j.is_cont_range (nc, lb, ub)) { // Special-case a contiguous range. - octave_idx_type lbi = cidx(lb), ubi = cidx(ub), new_nz = ubi - lbi; + octave_idx_type lbi = cidx (lb), ubi = cidx (ub), new_nz = ubi - lbi; retval = Sparse<T> (nr, ub - lb, new_nz); copy_or_memcpy (new_nz, data () + lbi, retval.data ()); copy_or_memcpy (new_nz, ridx () + lbi, retval.ridx ()); @@ -1596,7 +1596,7 @@ for (octave_idx_type j = 0; j < m; j++) { octave_idx_type jj = idx_j(j); - retval.xcidx(j+1) = retval.xcidx(j) + (cidx(jj+1) - cidx(jj)); + retval.xcidx (j+1) = retval.xcidx (j) + (cidx (jj+1) - cidx (jj)); } retval.change_capacity (retval.xcidx (m)); @@ -1604,8 +1604,8 @@ // Copy data & indices. for (octave_idx_type j = 0; j < m; j++) { - octave_idx_type ljj = cidx(idx_j(j)); - octave_idx_type lj = retval.xcidx(j), nzj = retval.xcidx(j+1) - lj; + octave_idx_type ljj = cidx (idx_j(j)); + octave_idx_type lj = retval.xcidx (j), nzj = retval.xcidx (j+1) - lj; copy_or_memcpy (nzj, data () + ljj, retval.data () + lj); copy_or_memcpy (nzj, ridx () + ljj, retval.ridx () + lj); } @@ -1628,28 +1628,28 @@ for (octave_idx_type j = 0; j < m; j++) { octave_quit (); - octave_idx_type jj = idx_j(j), lj = cidx(jj), nzj = cidx(jj+1) - cidx(jj); + octave_idx_type jj = idx_j(j), lj = cidx (jj), nzj = cidx (jj+1) - cidx (jj); // Scalar index - just a binary lookup. octave_idx_type i = lblookup (ridx () + lj, nzj, ii); - if (i < nzj && ridx(i+lj) == ii) + if (i < nzj && ridx (i+lj) == ii) { ij[j] = i + lj; - retval.xcidx(j+1) = retval.xcidx(j) + 1; + retval.xcidx (j+1) = retval.xcidx (j) + 1; } else - retval.xcidx(j+1) = retval.xcidx(j); + retval.xcidx (j+1) = retval.xcidx (j); } - retval.change_capacity (retval.xcidx(m)); + retval.change_capacity (retval.xcidx (m)); // Copy data, adjust row indices. for (octave_idx_type j = 0; j < m; j++) { - octave_idx_type i = retval.xcidx(j); - if (retval.xcidx(j+1) > i) + octave_idx_type i = retval.xcidx (j); + if (retval.xcidx (j+1) > i) { - retval.xridx(i) = 0; - retval.xdata(i) = data(ij[j]); + retval.xridx (i) = 0; + retval.xdata (i) = data (ij[j]); } } } @@ -1661,15 +1661,15 @@ for (octave_idx_type j = 0; j < m; j++) { octave_quit (); - octave_idx_type jj = idx_j(j), lj = cidx(jj), nzj = cidx(jj+1) - cidx(jj); + octave_idx_type jj = idx_j(j), lj = cidx (jj), nzj = cidx (jj+1) - cidx (jj); octave_idx_type lij, uij; // Lookup indices. li[j] = lij = lblookup (ridx () + lj, nzj, lb) + lj; ui[j] = uij = lblookup (ridx () + lj, nzj, ub) + lj; - retval.xcidx(j+1) = retval.xcidx(j) + ui[j] - li[j]; + retval.xcidx (j+1) = retval.xcidx (j) + ui[j] - li[j]; } - retval.change_capacity (retval.xcidx(m)); + retval.change_capacity (retval.xcidx (m)); // Copy data, adjust row indices. for (octave_idx_type j = 0, k = 0; j < m; j++) @@ -1677,8 +1677,8 @@ octave_quit (); for (octave_idx_type i = li[j]; i < ui[j]; i++) { - retval.xdata(k) = data(i); - retval.xridx(k++) = ridx(i) - lb; + retval.xdata (k) = data (i); + retval.xridx (k++) = ridx (i) - lb; } } } @@ -1690,7 +1690,7 @@ for (octave_idx_type j = 0; j < m; j++) { octave_idx_type jj = idx_j(j); - retval.xcidx(j+1) = retval.xcidx(j) + (cidx(jj+1) - cidx(jj)); + retval.xcidx (j+1) = retval.xcidx (j) + (cidx (jj+1) - cidx (jj)); } retval.change_capacity (retval.xcidx (m)); @@ -1703,12 +1703,12 @@ for (octave_idx_type j = 0; j < m; j++) { octave_quit (); - octave_idx_type jj = idx_j(j), lj = cidx(jj), nzj = cidx(jj+1) - cidx(jj); - octave_idx_type li = retval.xcidx(j), uj = lj + nzj - 1; + octave_idx_type jj = idx_j(j), lj = cidx (jj), nzj = cidx (jj+1) - cidx (jj); + octave_idx_type li = retval.xcidx (j), uj = lj + nzj - 1; for (octave_idx_type i = 0; i < nzj; i++) { - retval.xdata(li + i) = data(uj - i); // Copy in reverse order. - retval.xridx(li + i) = nr - 1 - ridx(uj - i); // Ditto with transform. + retval.xdata (li + i) = data (uj - i); // Copy in reverse order. + retval.xridx (li + i) = nr - 1 - ridx (uj - i); // Ditto with transform. } } } @@ -1725,11 +1725,11 @@ for (octave_idx_type j = 0; j < m; j++) { octave_quit (); - octave_idx_type jj = idx_j(j), lj = cidx(jj), nzj = cidx(jj+1) - cidx(jj); - octave_idx_type li = retval.xcidx(j); + octave_idx_type jj = idx_j(j), lj = cidx (jj), nzj = cidx (jj+1) - cidx (jj); + octave_idx_type li = retval.xcidx (j); // Scatter the column, transform indices. for (octave_idx_type i = 0; i < nzj; i++) - scb[rri[li + i] = iinv[ridx(lj + i)]] = data(lj + i); + scb[rri[li + i] = iinv[ridx (lj + i)]] = data (lj + i); octave_quit (); @@ -1738,7 +1738,7 @@ // Gather. for (octave_idx_type i = 0; i < nzj; i++) - retval.xdata(li + i) = scb[rri[li + i]]; + retval.xdata (li + i) = scb[rri[li + i]]; } } @@ -1846,7 +1846,7 @@ copy_or_memcpy (nz - ui, tmp.ridx () + ui, ridx () + li + rnz); } - cidx(1) = new_nz; + cidx (1) = new_nz; } else if (idx.is_range () && idx.increment () == -1) { @@ -1866,7 +1866,7 @@ octave_idx_type iidx = idx(i); octave_idx_type li = lblookup (ri, nz, iidx); if (li != nz && ri[li] == iidx) - xdata(li) = T (); + xdata (li) = T (); } maybe_compress (true); @@ -1985,7 +1985,7 @@ else if (idx_j.is_cont_range (nc, lb, ub)) { // Special-case a contiguous range. - octave_idx_type li = cidx(lb), ui = cidx(ub); + octave_idx_type li = cidx (lb), ui = cidx (ub); octave_idx_type rnz = rhs.nnz (), new_nz = nz - (ui - li) + rnz; if (new_nz >= nz && new_nz <= capacity ()) @@ -2051,36 +2051,36 @@ // Assemble column lengths. for (octave_idx_type i = 0; i < nc; i++) - xcidx(i+1) = tmp.cidx(i+1) - tmp.cidx(i); + xcidx (i+1) = tmp.cidx (i+1) - tmp.cidx (i); for (octave_idx_type i = 0; i < m; i++) { octave_idx_type j =idx_j(i); jsav[j] = i; - xcidx(j+1) = rhs.cidx(i+1) - rhs.cidx(i); + xcidx (j+1) = rhs.cidx (i+1) - rhs.cidx (i); } // Make cumulative. for (octave_idx_type i = 0; i < nc; i++) - xcidx(i+1) += xcidx(i); + xcidx (i+1) += xcidx (i); change_capacity (nnz ()); // Merge columns. for (octave_idx_type i = 0; i < nc; i++) { - octave_idx_type l = xcidx(i), u = xcidx(i+1), j = jsav[i]; + octave_idx_type l = xcidx (i), u = xcidx (i+1), j = jsav[i]; if (j >= 0) { // from rhs - octave_idx_type k = rhs.cidx(j); + octave_idx_type k = rhs.cidx (j); copy_or_memcpy (u - l, rhs.data () + k, xdata () + l); copy_or_memcpy (u - l, rhs.ridx () + k, xridx () + l); } else { // original - octave_idx_type k = tmp.cidx(i); + octave_idx_type k = tmp.cidx (i); copy_or_memcpy (u - l, tmp.data () + k, xdata () + l); copy_or_memcpy (u - l, tmp.ridx () + k, xridx () + l); } @@ -2183,26 +2183,26 @@ for (octave_idx_type j = 0; j < nc; j++) { - octave_idx_type ns = mcidx [j + 1] - mcidx [j]; + octave_idx_type ns = mcidx[j + 1] - mcidx[j]; lsort.sort (v, ns); octave_idx_type i; if (mode == ASCENDING) { for (i = 0; i < ns; i++) - if (sparse_ascending_compare<T> (static_cast<T> (0), v [i])) + if (sparse_ascending_compare<T> (static_cast<T> (0), v[i])) break; } else { for (i = 0; i < ns; i++) - if (sparse_descending_compare<T> (static_cast<T> (0), v [i])) + if (sparse_descending_compare<T> (static_cast<T> (0), v[i])) break; } for (octave_idx_type k = 0; k < i; k++) - mridx [k] = k; + mridx[k] = k; for (octave_idx_type k = i; k < ns; k++) - mridx [k] = k - ns + nr; + mridx[k] = k - ns + nr; v += ns; mridx += ns; @@ -2255,7 +2255,7 @@ for (octave_idx_type j = 0; j < nc; j++) { - octave_idx_type ns = mcidx [j + 1] - mcidx [j]; + octave_idx_type ns = mcidx[j + 1] - mcidx[j]; octave_idx_type offset = j * nr; if (ns == 0) @@ -2296,14 +2296,14 @@ for (octave_idx_type k = 0; k < i; k++) { - sidx (k + offset) = vi [k]; - mridx [k] = k; + sidx (k + offset) = vi[k]; + mridx[k] = k; } for (octave_idx_type k = i; k < ns; k++) { - sidx (k - ns + nr + offset) = vi [k]; - mridx [k] = k - ns + nr; + sidx (k - ns + nr + offset) = vi[k]; + mridx[k] = k - ns + nr; } v += ns; @@ -2437,12 +2437,12 @@ for (octave_idx_type j = 0; j < nnc; j++) { - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { d.xdata (i) = data (i); d.xridx (i) = j + roff; } - d.xcidx (j + coff + 1) = cidx(j+1); + d.xcidx (j + coff + 1) = cidx (j+1); } for (octave_idx_type i = nnc + coff + 1; i < n + 1; i++) @@ -2459,7 +2459,7 @@ if (nnz () > 0) { octave_idx_type ii = 0; - octave_idx_type ir = ridx(0); + octave_idx_type ir = ridx (0); for (octave_idx_type i = 0; i < coff+1; i++) d.xcidx (i) = 0; @@ -2545,17 +2545,17 @@ if (spi.is_empty ()) continue; - octave_idx_type kl = spi.cidx(j), ku = spi.cidx(j+1); + octave_idx_type kl = spi.cidx (j), ku = spi.cidx (j+1); for (octave_idx_type k = kl; k < ku; k++, l++) { - retval.xridx(l) = spi.ridx(k) + rcum; - retval.xdata(l) = spi.data(k); + retval.xridx (l) = spi.ridx (k) + rcum; + retval.xdata (l) = spi.data (k); } rcum += spi.rows (); } - retval.xcidx(j+1) = l; + retval.xcidx (j+1) = l; } break; @@ -2595,15 +2595,15 @@ octave_idx_type i = 0; for (octave_idx_type j = 0, nc = cols (); j < nc; j++) { - if (cidx(j+1) > i) + if (cidx (j+1) > i) retval(j) = data (i++); } } else { for (octave_idx_type j = 0, nc = cols (); j < nc; j++) - for (octave_idx_type i = cidx(j), iu = cidx(j+1); i < iu; i++) - retval(ridx(i), j) = data (i); + for (octave_idx_type i = cidx (j), iu = cidx (j+1); i < iu; i++) + retval(ridx (i), j) = data (i); } return retval; @@ -2643,12 +2643,12 @@ %! x = ones (size); %! s = set_slice (sparse (x), dim, slice); %! f = set_slice (x, dim, slice); -%! assert (nnz(s), nnz(f)); -%! assert (full(s), f); -%! s = set_slice2 (sparse(x), dim, slice); +%! assert (nnz (s), nnz (f)); +%! assert (full (s), f); +%! s = set_slice2 (sparse (x), dim, slice); %! f = set_slice2 (x, dim, slice); -%! assert (nnz(s), nnz(f)); -%! assert (full(s), f); +%! assert (nnz (s), nnz (f)); +%! assert (full (s), f); %!endfunction #### 1d indexing @@ -2780,7 +2780,7 @@ %! assert (s, sparse (magic (5)(:, [1,5]))); %!test -%! s = sparse([], [], [], 1, 1); +%! s = sparse ([], [], [], 1, 1); %! s(1,:) = []; %! assert (s, sparse ([], [], [], 0, 1));
--- a/liboctave/Sparse.h Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/Sparse.h Thu Jul 26 08:13:22 2012 -0700 @@ -72,7 +72,7 @@ octave_refcount<int> count; SparseRep (void) - : d (0), r (0), c (new octave_idx_type [1]), nzmx (0), nrows (0), + : d (0), r (0), c (new octave_idx_type[1]), nzmx (0), nrows (0), ncols (0), count (1) { c[0] = 0; @@ -87,7 +87,7 @@ } SparseRep (octave_idx_type nr, octave_idx_type nc, octave_idx_type nz = 0) - : d (new T [nz]), r (new octave_idx_type [nz]), + : d (new T[nz]), r (new octave_idx_type[nz]), c (new octave_idx_type [nc+1]), nzmx (nz), nrows (nr), ncols (nc), count (1) { @@ -111,7 +111,7 @@ octave_idx_type length (void) const { return nzmx; } - octave_idx_type nnz (void) const { return c [ncols]; } + octave_idx_type nnz (void) const { return c[ncols]; } T& elem (octave_idx_type _r, octave_idx_type _c); @@ -268,7 +268,7 @@ octave_idx_type get_col_index (octave_idx_type k) { octave_idx_type ret = 0; - while (cidx(ret+1) < k) + while (cidx (ret+1) < k) ret++; return ret; } @@ -599,11 +599,11 @@ result = Sparse<U> (nr, nc, f_zero); for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx (j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_quit (); /* Use data instead of elem for better performance. */ - result.data (ridx (i) + j * nr) = fcn (data(i)); + result.data (ridx (i) + j * nr) = fcn (data (i)); } result.maybe_compress (true); @@ -620,7 +620,7 @@ for (octave_idx_type j = 0; j < nc; j++) { - for (octave_idx_type i = cidx(j); i < cidx (j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { U val = fcn (data (i)); if (val != 0.0) @@ -709,7 +709,7 @@ else if (jtmp > jold) { for (octave_idx_type j = jold; j < jtmp; j++) - a.cidx(j+1) = ii; + a.cidx (j+1) = ii; } else if (itmp < iold) { @@ -734,7 +734,7 @@ } for (octave_idx_type j = jold; j < nc; j++) - a.cidx(j+1) = ii; + a.cidx (j+1) = ii; } done:
--- a/liboctave/SparseCmplxCHOL.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/SparseCmplxCHOL.cc Thu Jul 26 08:13:22 2012 -0700 @@ -51,12 +51,12 @@ if (typ == MatrixType::Upper) { - rinv = r.inverse(mattype, info, rcond, true, false); + rinv = r.inverse (mattype, info, rcond, true, false); retval = rinv.transpose () * rinv; } else if (typ == MatrixType::Lower) { - rinv = r.transpose ().inverse(mattype, info, rcond, true, false); + rinv = r.transpose ().inverse (mattype, info, rcond, true, false); retval = rinv.transpose () * rinv; } else
--- a/liboctave/SparseCmplxLU.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/SparseCmplxLU.cc Thu Jul 26 08:13:22 2012 -0700 @@ -326,7 +326,7 @@ OCTAVE_LOCAL_BUFFER (octave_idx_type, qinit, nc); for (octave_idx_type i = 0; i < nc; i++) - qinit [i] = static_cast<octave_idx_type> (Qinit (i)); + qinit[i] = static_cast<octave_idx_type> (Qinit (i)); status = UMFPACK_ZNAME (qsymbolic) (nr, nc, Ap, Ai, reinterpret_cast<const double *> (Ax),
--- a/liboctave/SparseCmplxQR.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/SparseCmplxQR.cc Thu Jul 26 08:13:22 2012 -0700 @@ -69,7 +69,7 @@ (a.data ())); A.nz = -1; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) S = CXSPARSE_ZNAME (_sqr) (order, &A, 1); #else S = CXSPARSE_ZNAME (_sqr) (&A, order - 1, 1); @@ -130,10 +130,10 @@ #ifdef HAVE_CXSPARSE ColumnVector ret(N->L->m); for (octave_idx_type i = 0; i < N->L->m; i++) -#if defined(CS_VER) && (CS_VER >= 2) - ret.xelem(i) = S->pinv[i]; +#if defined (CS_VER) && (CS_VER >= 2) + ret.xelem (i) = S->pinv[i]; #else - ret.xelem(i) = S->Pinv[i]; + ret.xelem (i) = S->Pinv[i]; #endif return ret; #else @@ -147,10 +147,10 @@ #ifdef HAVE_CXSPARSE ColumnVector ret(N->L->m); for (octave_idx_type i = 0; i < N->L->m; i++) -#if defined(CS_VER) && (CS_VER >= 2) - ret.xelem(S->pinv[i]) = i; +#if defined (CS_VER) && (CS_VER >= 2) + ret.xelem (S->pinv[i]) = i; #else - ret.xelem(S->Pinv[i]) = i; + ret.xelem (S->Pinv[i]) = i; #endif return ret; #else @@ -212,7 +212,7 @@ octave_quit (); volatile octave_idx_type nm = (nr < nc ? nr : nc); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_ipvec) (S->pinv, bvec + idx, reinterpret_cast<cs_complex_t *>(buf), b_nr); #else @@ -262,7 +262,7 @@ bvec[j] = OCTAVE_C99_ONE; volatile octave_idx_type nm = (nr < nc ? nr : nc); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_ipvec) (S->pinv, bvec, reinterpret_cast<cs_complex_t *>(buf), nr); #else @@ -290,7 +290,7 @@ } ComplexMatrix -qrsolve(const SparseComplexMatrix&a, const Matrix &b, octave_idx_type &info) +qrsolve (const SparseComplexMatrix&a, const Matrix &b, octave_idx_type &info) { info = -1; #ifdef HAVE_CXSPARSE @@ -310,7 +310,7 @@ SparseComplexQR q (a, 2); if (! q.ok ()) return ComplexMatrix (); - x.resize(nc, b_nc); + x.resize (nc, b_nc); cs_complex_t *vec = reinterpret_cast<cs_complex_t *> (x.fortran_vec ()); OCTAVE_C99_COMPLEX (buf, q.S ()->m2); @@ -319,11 +319,11 @@ { octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) - Xx[j] = b.xelem(j,i); + Xx[j] = b.xelem (j,i); for (octave_idx_type j = nr; j < q.S ()->m2; j++) buf[j] = OCTAVE_C99_ZERO; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_ipvec) (q.S ()->pinv, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); #else @@ -340,7 +340,7 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_usolve) (q.N ()->U, buf); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_ipvec) (q.S ()->q, buf, vec + idx, nc); #else CXSPARSE_ZNAME (_ipvec) (nc, q.S ()->Q, buf, vec + idx); @@ -355,30 +355,30 @@ SparseComplexQR q (at, 2); if (! q.ok ()) return ComplexMatrix (); - x.resize(nc, b_nc); + x.resize (nc, b_nc); cs_complex_t *vec = reinterpret_cast<cs_complex_t *> (x.fortran_vec ()); volatile octave_idx_type nbuf = (nc > q.S ()->m2 ? nc : q.S ()->m2); OCTAVE_C99_COMPLEX (buf, nbuf); OCTAVE_LOCAL_BUFFER (Complex, Xx, b_nr); -#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) +#if defined (CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) OCTAVE_LOCAL_BUFFER (double, B, nr); for (octave_idx_type i = 0; i < nr; i++) - B[i] = q.N ()->B [i]; + B[i] = q.N ()->B[i]; #else OCTAVE_LOCAL_BUFFER (Complex, B, nr); for (octave_idx_type i = 0; i < nr; i++) - B[i] = conj (reinterpret_cast<Complex *>(q.N ()->B) [i]); + B[i] = conj (reinterpret_cast<Complex *>(q.N ()->B)[i]); #endif for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) - Xx[j] = b.xelem(j,i); + Xx[j] = b.xelem (j,i); for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = OCTAVE_C99_ZERO; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_pvec) (q.S ()->q, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); #else @@ -392,7 +392,7 @@ octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) +#if defined (CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) CXSPARSE_ZNAME (_happly) (q.N ()->L, j, B[j], buf); #else CXSPARSE_ZNAME (_happly) @@ -401,7 +401,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_pvec) (q.S ()->pinv, buf, vec + idx, nc); #else CXSPARSE_ZNAME (_pvec) (nc, q.S ()->Pinv, buf, vec + idx); @@ -418,7 +418,7 @@ } SparseComplexMatrix -qrsolve(const SparseComplexMatrix&a, const SparseMatrix &b, octave_idx_type &info) +qrsolve (const SparseComplexMatrix&a, const SparseMatrix &b, octave_idx_type &info) { info = -1; #ifdef HAVE_CXSPARSE @@ -440,7 +440,7 @@ if (! q.ok ()) return SparseComplexMatrix (); x = SparseComplexMatrix (nc, b_nc, b.nnz ()); - x.xcidx(0) = 0; + x.xcidx (0) = 0; x_nz = b.nnz (); ii = 0; OCTAVE_LOCAL_BUFFER (Complex, Xx, (b_nr > nc ? b_nr : nc)); @@ -449,11 +449,11 @@ { octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) - Xx[j] = b.xelem(j,i); + Xx[j] = b.xelem (j,i); for (octave_idx_type j = nr; j < q.S ()->m2; j++) buf[j] = OCTAVE_C99_ZERO; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_ipvec) (q.S ()->pinv, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); #else @@ -470,7 +470,7 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_usolve) (q.N ()->U, buf); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_ipvec) (q.S ()->q, buf, reinterpret_cast<cs_complex_t *>(Xx), nc); #else @@ -492,11 +492,11 @@ x.change_capacity (sz); x_nz = sz; } - x.xdata(ii) = tmp; - x.xridx(ii++) = j; + x.xdata (ii) = tmp; + x.xridx (ii++) = j; } } - x.xcidx(i+1) = ii; + x.xcidx (i+1) = ii; } info = 0; } @@ -507,31 +507,31 @@ if (! q.ok ()) return SparseComplexMatrix (); x = SparseComplexMatrix (nc, b_nc, b.nnz ()); - x.xcidx(0) = 0; + x.xcidx (0) = 0; x_nz = b.nnz (); ii = 0; volatile octave_idx_type nbuf = (nc > q.S ()->m2 ? nc : q.S ()->m2); OCTAVE_LOCAL_BUFFER (Complex, Xx, (b_nr > nc ? b_nr : nc)); OCTAVE_C99_COMPLEX (buf, nbuf); -#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) +#if defined (CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) OCTAVE_LOCAL_BUFFER (double, B, nr); for (octave_idx_type i = 0; i < nr; i++) - B[i] = q.N ()->B [i]; + B[i] = q.N ()->B[i]; #else OCTAVE_LOCAL_BUFFER (Complex, B, nr); for (octave_idx_type i = 0; i < nr; i++) - B[i] = conj (reinterpret_cast<Complex *>(q.N ()->B) [i]); + B[i] = conj (reinterpret_cast<Complex *>(q.N ()->B)[i]); #endif for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) - Xx[j] = b.xelem(j,i); + Xx[j] = b.xelem (j,i); for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = OCTAVE_C99_ZERO; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_pvec) (q.S ()->q, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); #else @@ -544,7 +544,7 @@ { octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) +#if defined (CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) CXSPARSE_ZNAME (_happly) (q.N ()->L, j, B[j], buf); #else CXSPARSE_ZNAME (_happly) @@ -553,7 +553,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_pvec) (q.S ()->pinv, buf, reinterpret_cast<cs_complex_t *>(Xx), nc); #else @@ -575,11 +575,11 @@ x.change_capacity (sz); x_nz = sz; } - x.xdata(ii) = tmp; - x.xridx(ii++) = j; + x.xdata (ii) = tmp; + x.xridx (ii++) = j; } } - x.xcidx(i+1) = ii; + x.xcidx (i+1) = ii; } info = 0; } @@ -592,7 +592,7 @@ } ComplexMatrix -qrsolve(const SparseComplexMatrix&a, const ComplexMatrix &b, octave_idx_type &info) +qrsolve (const SparseComplexMatrix&a, const ComplexMatrix &b, octave_idx_type &info) { info = -1; #ifdef HAVE_CXSPARSE @@ -614,7 +614,7 @@ SparseComplexQR q (a, 2); if (! q.ok ()) return ComplexMatrix (); - x.resize(nc, b_nc); + x.resize (nc, b_nc); cs_complex_t *vec = reinterpret_cast<cs_complex_t *> (x.fortran_vec ()); OCTAVE_C99_COMPLEX (buf, q.S ()->m2); @@ -625,7 +625,7 @@ for (octave_idx_type j = nr; j < q.S ()->m2; j++) buf[j] = OCTAVE_C99_ZERO; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_ipvec) (q.S ()->pinv, bvec + bidx, buf, nr); #else CXSPARSE_ZNAME (_ipvec) (nr, q.S ()->Pinv, bvec + bidx, buf); @@ -640,7 +640,7 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_usolve) (q.N ()->U, buf); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_ipvec) (q.S ()->q, buf, vec + idx, nc); #else CXSPARSE_ZNAME (_ipvec) (nc, q.S ()->Q, buf, vec + idx); @@ -655,19 +655,19 @@ SparseComplexQR q (at, 2); if (! q.ok ()) return ComplexMatrix (); - x.resize(nc, b_nc); + x.resize (nc, b_nc); cs_complex_t *vec = reinterpret_cast<cs_complex_t *> (x.fortran_vec ()); volatile octave_idx_type nbuf = (nc > q.S ()->m2 ? nc : q.S ()->m2); OCTAVE_C99_COMPLEX (buf, nbuf); -#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) +#if defined (CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) OCTAVE_LOCAL_BUFFER (double, B, nr); for (octave_idx_type i = 0; i < nr; i++) - B[i] = q.N ()->B [i]; + B[i] = q.N ()->B[i]; #else OCTAVE_LOCAL_BUFFER (Complex, B, nr); for (octave_idx_type i = 0; i < nr; i++) - B[i] = conj (reinterpret_cast<Complex *>(q.N ()->B) [i]); + B[i] = conj (reinterpret_cast<Complex *>(q.N ()->B)[i]); #endif for (volatile octave_idx_type i = 0, idx = 0, bidx = 0; i < b_nc; i++, idx+=nc, bidx+=b_nr) @@ -676,7 +676,7 @@ for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = OCTAVE_C99_ZERO; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_pvec) (q.S ()->q, bvec + bidx, buf, nr); #else CXSPARSE_ZNAME (_pvec) (nr, q.S ()->Q, bvec + bidx, buf); @@ -687,7 +687,7 @@ { octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) +#if defined (CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) CXSPARSE_ZNAME (_happly) (q.N ()->L, j, B[j], buf); #else CXSPARSE_ZNAME (_happly) @@ -696,7 +696,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_pvec) (q.S ()->pinv, buf, vec + idx, nc); #else CXSPARSE_ZNAME (_pvec) (nc, q.S ()->Pinv, buf, vec + idx); @@ -713,7 +713,7 @@ } SparseComplexMatrix -qrsolve(const SparseComplexMatrix&a, const SparseComplexMatrix &b, octave_idx_type &info) +qrsolve (const SparseComplexMatrix&a, const SparseComplexMatrix &b, octave_idx_type &info) { info = -1; #ifdef HAVE_CXSPARSE @@ -735,7 +735,7 @@ if (! q.ok ()) return SparseComplexMatrix (); x = SparseComplexMatrix (nc, b_nc, b.nnz ()); - x.xcidx(0) = 0; + x.xcidx (0) = 0; x_nz = b.nnz (); ii = 0; OCTAVE_LOCAL_BUFFER (Complex, Xx, (b_nr > nc ? b_nr : nc)); @@ -744,11 +744,11 @@ { octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) - Xx[j] = b.xelem(j,i); + Xx[j] = b.xelem (j,i); for (octave_idx_type j = nr; j < q.S ()->m2; j++) buf[j] = OCTAVE_C99_ZERO; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_ipvec) (q.S ()->pinv, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); #else @@ -765,7 +765,7 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_usolve) (q.N ()->U, buf); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_ipvec) (q.S ()->q, buf, reinterpret_cast<cs_complex_t *>(Xx), nc); #else @@ -787,11 +787,11 @@ x.change_capacity (sz); x_nz = sz; } - x.xdata(ii) = tmp; - x.xridx(ii++) = j; + x.xdata (ii) = tmp; + x.xridx (ii++) = j; } } - x.xcidx(i+1) = ii; + x.xcidx (i+1) = ii; } info = 0; } @@ -802,30 +802,30 @@ if (! q.ok ()) return SparseComplexMatrix (); x = SparseComplexMatrix (nc, b_nc, b.nnz ()); - x.xcidx(0) = 0; + x.xcidx (0) = 0; x_nz = b.nnz (); ii = 0; volatile octave_idx_type nbuf = (nc > q.S ()->m2 ? nc : q.S ()->m2); OCTAVE_LOCAL_BUFFER (Complex, Xx, (b_nr > nc ? b_nr : nc)); OCTAVE_C99_COMPLEX (buf, nbuf); -#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) +#if defined (CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) OCTAVE_LOCAL_BUFFER (double, B, nr); for (octave_idx_type i = 0; i < nr; i++) - B[i] = q.N ()->B [i]; + B[i] = q.N ()->B[i]; #else OCTAVE_LOCAL_BUFFER (Complex, B, nr); for (octave_idx_type i = 0; i < nr; i++) - B[i] = conj (reinterpret_cast<Complex *>(q.N ()->B) [i]); + B[i] = conj (reinterpret_cast<Complex *>(q.N ()->B)[i]); #endif for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) - Xx[j] = b.xelem(j,i); + Xx[j] = b.xelem (j,i); for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = OCTAVE_C99_ZERO; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_pvec) (q.S ()->q, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); #else @@ -838,7 +838,7 @@ { octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) +#if defined (CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) CXSPARSE_ZNAME (_happly) (q.N ()->L, j, B[j], buf); #else CXSPARSE_ZNAME (_happly) @@ -847,7 +847,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_ZNAME (_pvec) (q.S ()->pinv, buf, reinterpret_cast<cs_complex_t *>(Xx), nc); #else @@ -869,11 +869,11 @@ x.change_capacity (sz); x_nz = sz; } - x.xdata(ii) = tmp; - x.xridx(ii++) = j; + x.xdata (ii) = tmp; + x.xridx (ii++) = j; } } - x.xcidx(i+1) = ii; + x.xcidx (i+1) = ii; } info = 0; }
--- a/liboctave/SparseQR.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/SparseQR.cc Thu Jul 26 08:13:22 2012 -0700 @@ -48,7 +48,7 @@ A.x = const_cast<double *>(a.data ()); A.nz = -1; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) S = CXSPARSE_DNAME (_sqr) (order, &A, 1); #else S = CXSPARSE_DNAME (_sqr) (&A, order - 1, 1); @@ -110,10 +110,10 @@ #ifdef HAVE_CXSPARSE ColumnVector ret(N->L->m); for (octave_idx_type i = 0; i < N->L->m; i++) -#if defined(CS_VER) && (CS_VER >= 2) - ret.xelem(i) = S->pinv[i]; +#if defined (CS_VER) && (CS_VER >= 2) + ret.xelem (i) = S->pinv[i]; #else - ret.xelem(i) = S->Pinv[i]; + ret.xelem (i) = S->Pinv[i]; #endif return ret; #else @@ -127,10 +127,10 @@ #ifdef HAVE_CXSPARSE ColumnVector ret(N->L->m); for (octave_idx_type i = 0; i < N->L->m; i++) -#if defined(CS_VER) && (CS_VER >= 2) - ret.xelem(S->pinv[i]) = i; +#if defined (CS_VER) && (CS_VER >= 2) + ret.xelem (S->pinv[i]) = i; #else - ret.xelem(S->Pinv[i]) = i; + ret.xelem (S->Pinv[i]) = i; #endif return ret; #else @@ -195,7 +195,7 @@ buf[i] = 0.; volatile octave_idx_type nm = (nr < nc ? nr : nc); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (S->pinv, bvec + idx, buf, b_nr); #else CXSPARSE_DNAME (_ipvec) (b_nr, S->Pinv, bvec + idx, buf); @@ -245,7 +245,7 @@ buf[i] = 0.; volatile octave_idx_type nm = (nr < nc ? nr : nc); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (S->pinv, bvec, buf, nr); #else CXSPARSE_DNAME (_ipvec) (nr, S->Pinv, bvec, buf); @@ -271,7 +271,7 @@ } Matrix -qrsolve(const SparseMatrix&a, const Matrix &b, octave_idx_type& info) +qrsolve (const SparseMatrix&a, const Matrix &b, octave_idx_type& info) { info = -1; #ifdef HAVE_CXSPARSE @@ -292,7 +292,7 @@ SparseQR q (a, 3); if (! q.ok ()) return Matrix (); - x.resize(nc, b_nc); + x.resize (nc, b_nc); double *vec = x.fortran_vec (); OCTAVE_LOCAL_BUFFER (double, buf, q.S ()->m2); for (volatile octave_idx_type i = 0, idx = 0, bidx = 0; i < b_nc; @@ -302,7 +302,7 @@ for (octave_idx_type j = nr; j < q.S ()->m2; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->pinv, bvec + bidx, buf, nr); #else CXSPARSE_DNAME (_ipvec) (nr, q.S ()->Pinv, bvec + bidx, buf); @@ -317,7 +317,7 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_usolve) (q.N ()->U, buf); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->q, buf, vec + idx, nc); #else CXSPARSE_DNAME (_ipvec) (nc, q.S ()->Q, buf, vec + idx); @@ -332,7 +332,7 @@ SparseQR q (at, 3); if (! q.ok ()) return Matrix (); - x.resize(nc, b_nc); + x.resize (nc, b_nc); double *vec = x.fortran_vec (); volatile octave_idx_type nbuf = (nc > q.S ()->m2 ? nc : q.S ()->m2); OCTAVE_LOCAL_BUFFER (double, buf, nbuf); @@ -343,7 +343,7 @@ for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->q, bvec + bidx, buf, nr); #else CXSPARSE_DNAME (_pvec) (nr, q.S ()->Q, bvec + bidx, buf); @@ -358,7 +358,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->pinv, buf, vec + idx, nc); #else CXSPARSE_DNAME (_pvec) (nc, q.S ()->Pinv, buf, vec + idx); @@ -375,7 +375,7 @@ } SparseMatrix -qrsolve(const SparseMatrix&a, const SparseMatrix &b, octave_idx_type &info) +qrsolve (const SparseMatrix&a, const SparseMatrix &b, octave_idx_type &info) { info = -1; #ifdef HAVE_CXSPARSE @@ -397,7 +397,7 @@ if (! q.ok ()) return SparseMatrix (); x = SparseMatrix (nc, b_nc, b.nnz ()); - x.xcidx(0) = 0; + x.xcidx (0) = 0; x_nz = b.nnz (); ii = 0; OCTAVE_LOCAL_BUFFER (double, Xx, (b_nr > nc ? b_nr : nc)); @@ -406,11 +406,11 @@ { octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) - Xx[j] = b.xelem(j,i); + Xx[j] = b.xelem (j,i); for (octave_idx_type j = nr; j < q.S ()->m2; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->pinv, Xx, buf, nr); #else CXSPARSE_DNAME (_ipvec) (nr, q.S ()->Pinv, Xx, buf); @@ -425,7 +425,7 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_usolve) (q.N ()->U, buf); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->q, buf, Xx, nc); #else CXSPARSE_DNAME (_ipvec) (nc, q.S ()->Q, buf, Xx); @@ -445,11 +445,11 @@ x.change_capacity (sz); x_nz = sz; } - x.xdata(ii) = tmp; - x.xridx(ii++) = j; + x.xdata (ii) = tmp; + x.xridx (ii++) = j; } } - x.xcidx(i+1) = ii; + x.xcidx (i+1) = ii; } info = 0; } @@ -460,7 +460,7 @@ if (! q.ok ()) return SparseMatrix (); x = SparseMatrix (nc, b_nc, b.nnz ()); - x.xcidx(0) = 0; + x.xcidx (0) = 0; x_nz = b.nnz (); ii = 0; volatile octave_idx_type nbuf = (nc > q.S ()->m2 ? nc : q.S ()->m2); @@ -470,11 +470,11 @@ { octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) - Xx[j] = b.xelem(j,i); + Xx[j] = b.xelem (j,i); for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->q, Xx, buf, nr); #else CXSPARSE_DNAME (_pvec) (nr, q.S ()->Q, Xx, buf); @@ -489,7 +489,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->pinv, buf, Xx, nc); #else CXSPARSE_DNAME (_pvec) (nc, q.S ()->Pinv, buf, Xx); @@ -509,11 +509,11 @@ x.change_capacity (sz); x_nz = sz; } - x.xdata(ii) = tmp; - x.xridx(ii++) = j; + x.xdata (ii) = tmp; + x.xridx (ii++) = j; } } - x.xcidx(i+1) = ii; + x.xcidx (i+1) = ii; } info = 0; } @@ -526,7 +526,7 @@ } ComplexMatrix -qrsolve(const SparseMatrix&a, const ComplexMatrix &b, octave_idx_type &info) +qrsolve (const SparseMatrix&a, const ComplexMatrix &b, octave_idx_type &info) { info = -1; #ifdef HAVE_CXSPARSE @@ -546,7 +546,7 @@ SparseQR q (a, 3); if (! q.ok ()) return ComplexMatrix (); - x.resize(nc, b_nc); + x.resize (nc, b_nc); Complex *vec = x.fortran_vec (); OCTAVE_LOCAL_BUFFER (double, Xx, (b_nr > nc ? b_nr : nc)); OCTAVE_LOCAL_BUFFER (double, Xz, (b_nr > nc ? b_nr : nc)); @@ -563,7 +563,7 @@ for (octave_idx_type j = nr; j < q.S ()->m2; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->pinv, Xx, buf, nr); #else CXSPARSE_DNAME (_ipvec) (nr, q.S ()->Pinv, Xx, buf); @@ -578,14 +578,14 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_usolve) (q.N ()->U, buf); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->q, buf, Xx, nc); #else CXSPARSE_DNAME (_ipvec) (nc, q.S ()->Q, buf, Xx); #endif for (octave_idx_type j = nr; j < q.S ()->m2; j++) buf[j] = 0.; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->pinv, Xz, buf, nr); #else CXSPARSE_DNAME (_ipvec) (nr, q.S ()->Pinv, Xz, buf); @@ -600,7 +600,7 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_usolve) (q.N ()->U, buf); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->q, buf, Xz, nc); #else CXSPARSE_DNAME (_ipvec) (nc, q.S ()->Q, buf, Xz); @@ -617,7 +617,7 @@ SparseQR q (at, 3); if (! q.ok ()) return ComplexMatrix (); - x.resize(nc, b_nc); + x.resize (nc, b_nc); Complex *vec = x.fortran_vec (); volatile octave_idx_type nbuf = (nc > q.S ()->m2 ? nc : q.S ()->m2); OCTAVE_LOCAL_BUFFER (double, Xx, (b_nr > nc ? b_nr : nc)); @@ -635,7 +635,7 @@ for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->q, Xx, buf, nr); #else CXSPARSE_DNAME (_pvec) (nr, q.S ()->Q, Xx, buf); @@ -650,7 +650,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->pinv, buf, Xx, nc); #else CXSPARSE_DNAME (_pvec) (nc, q.S ()->Pinv, buf, Xx); @@ -659,7 +659,7 @@ for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->q, Xz, buf, nr); #else CXSPARSE_DNAME (_pvec) (nr, q.S ()->Q, Xz, buf); @@ -674,7 +674,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->pinv, buf, Xz, nc); #else CXSPARSE_DNAME (_pvec) (nc, q.S ()->Pinv, buf, Xz); @@ -693,7 +693,7 @@ } SparseComplexMatrix -qrsolve(const SparseMatrix&a, const SparseComplexMatrix &b, octave_idx_type &info) +qrsolve (const SparseMatrix&a, const SparseComplexMatrix &b, octave_idx_type &info) { info = -1; #ifdef HAVE_CXSPARSE @@ -715,7 +715,7 @@ if (! q.ok ()) return SparseComplexMatrix (); x = SparseComplexMatrix (nc, b_nc, b.nnz ()); - x.xcidx(0) = 0; + x.xcidx (0) = 0; x_nz = b.nnz (); ii = 0; OCTAVE_LOCAL_BUFFER (double, Xx, (b_nr > nc ? b_nr : nc)); @@ -733,7 +733,7 @@ for (octave_idx_type j = nr; j < q.S ()->m2; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->pinv, Xx, buf, nr); #else CXSPARSE_DNAME (_ipvec) (nr, q.S ()->Pinv, Xx, buf); @@ -748,7 +748,7 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_usolve) (q.N ()->U, buf); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->q, buf, Xx, nc); #else CXSPARSE_DNAME (_ipvec) (nc, q.S ()->Q, buf, Xx); @@ -757,7 +757,7 @@ for (octave_idx_type j = nr; j < q.S ()->m2; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->pinv, Xz, buf, nr); #else CXSPARSE_DNAME (_ipvec) (nr, q.S ()->Pinv, Xz, buf); @@ -772,7 +772,7 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_usolve) (q.N ()->U, buf); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_ipvec) (q.S ()->q, buf, Xz, nc); #else CXSPARSE_DNAME (_ipvec) (nc, q.S ()->Q, buf, Xz); @@ -792,11 +792,11 @@ x.change_capacity (sz); x_nz = sz; } - x.xdata(ii) = tmp; - x.xridx(ii++) = j; + x.xdata (ii) = tmp; + x.xridx (ii++) = j; } } - x.xcidx(i+1) = ii; + x.xcidx (i+1) = ii; } info = 0; } @@ -807,7 +807,7 @@ if (! q.ok ()) return SparseComplexMatrix (); x = SparseComplexMatrix (nc, b_nc, b.nnz ()); - x.xcidx(0) = 0; + x.xcidx (0) = 0; x_nz = b.nnz (); ii = 0; volatile octave_idx_type nbuf = (nc > q.S ()->m2 ? nc : q.S ()->m2); @@ -826,7 +826,7 @@ for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->q, Xx, buf, nr); #else CXSPARSE_DNAME (_pvec) (nr, q.S ()->Q, Xx, buf); @@ -841,7 +841,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->pinv, buf, Xx, nc); #else CXSPARSE_DNAME (_pvec) (nc, q.S ()->Pinv, buf, Xx); @@ -850,7 +850,7 @@ for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->q, Xz, buf, nr); #else CXSPARSE_DNAME (_pvec) (nr, q.S ()->Q, Xz, buf); @@ -865,7 +865,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (_pvec) (q.S ()->pinv, buf, Xz, nc); #else CXSPARSE_DNAME (_pvec) (nc, q.S ()->Pinv, buf, Xz); @@ -885,11 +885,11 @@ x.change_capacity (sz); x_nz = sz; } - x.xdata(ii) = tmp; - x.xridx(ii++) = j; + x.xdata (ii) = tmp; + x.xridx (ii++) = j; } } - x.xcidx(i+1) = ii; + x.xcidx (i+1) = ii; } info = 0; } @@ -902,15 +902,15 @@ } Matrix -qrsolve(const SparseMatrix &a, const MArray<double> &b, - octave_idx_type &info) +qrsolve (const SparseMatrix &a, const MArray<double> &b, + octave_idx_type &info) { return qrsolve (a, Matrix (b), info); } ComplexMatrix -qrsolve(const SparseMatrix &a, const MArray<Complex> &b, - octave_idx_type &info) +qrsolve (const SparseMatrix &a, const MArray<Complex> &b, + octave_idx_type &info) { return qrsolve (a, ComplexMatrix (b), info); }
--- a/liboctave/SparsedbleCHOL.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/SparsedbleCHOL.cc Thu Jul 26 08:13:22 2012 -0700 @@ -51,12 +51,12 @@ if (typ == MatrixType::Upper) { - rinv = r.inverse(mattype, info, rcond, true, false); + rinv = r.inverse (mattype, info, rcond, true, false); retval = rinv.transpose () * rinv; } else if (typ == MatrixType::Lower) { - rinv = r.transpose ().inverse(mattype, info, rcond, true, false); + rinv = r.transpose ().inverse (mattype, info, rcond, true, false); retval = rinv.transpose () * rinv; } else
--- a/liboctave/SparsedbleLU.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/SparsedbleLU.cc Thu Jul 26 08:13:22 2012 -0700 @@ -311,7 +311,7 @@ OCTAVE_LOCAL_BUFFER (octave_idx_type, qinit, nc); for (octave_idx_type i = 0; i < nc; i++) - qinit [i] = static_cast<octave_idx_type> (Qinit (i)); + qinit[i] = static_cast<octave_idx_type> (Qinit (i)); status = UMFPACK_DNAME (qsymbolic) (nr, nc, Ap, Ai, Ax, qinit, &Symbolic, control, info);
--- a/liboctave/boolSparse.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/boolSparse.cc Thu Jul 26 08:13:22 2012 -0700 @@ -55,11 +55,11 @@ return false; for (octave_idx_type i = 0; i < nc + 1; i++) - if (cidx(i) != a.cidx(i)) + if (cidx (i) != a.cidx (i)) return false; for (octave_idx_type i = 0; i < nz; i++) - if (data(i) != a.data(i) || ridx(i) != a.ridx(i)) + if (data (i) != a.data (i) || ridx (i) != a.ridx (i)) return false; return true; @@ -113,12 +113,12 @@ { for (octave_idx_type j = 0; j < nr; j++) { - if (jj < cidx(i+1) && ridx(jj) == j) + if (jj < cidx (i+1) && ridx (jj) == j) jj++; else { - r.data(ii) = true; - r.ridx(ii++) = j; + r.data (ii) = true; + r.ridx (ii++) = j; } } r.cidx (i+1) = ii; @@ -150,10 +150,10 @@ { // Result is a row vector. retval = Sparse<bool> (1, nc); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (octave_idx_type i = 0; i < nc; i++) - retval.xcidx(i+1) = retval.xcidx(i) + (cidx(i+1) > cidx(i)); - octave_idx_type new_nz = retval.xcidx(nc); + retval.xcidx (i+1) = retval.xcidx (i) + (cidx (i+1) > cidx (i)); + octave_idx_type new_nz = retval.xcidx (nc); retval.change_capacity (new_nz); fill_or_memset (new_nz, static_cast<octave_idx_type> (0), retval.ridx ()); fill_or_memset (new_nz, true, retval.data ()); @@ -166,7 +166,7 @@ // We can use O(nr) memory. Array<bool> tmp (dim_vector (nr, 1), false); for (octave_idx_type i = 0; i < nz; i++) - tmp.xelem(ridx(i)) = true; + tmp.xelem (ridx (i)) = true; retval = tmp; } else @@ -195,16 +195,16 @@ { // Result is a row vector. retval = Sparse<double> (1, nc); - for(octave_idx_type i = 0; i < nc; i++) - retval.xcidx(i+1) = retval.xcidx(i) + (cidx(i+1) > cidx(i)); - octave_idx_type new_nz = retval.xcidx(nc); + for (octave_idx_type i = 0; i < nc; i++) + retval.xcidx (i+1) = retval.xcidx (i) + (cidx (i+1) > cidx (i)); + octave_idx_type new_nz = retval.xcidx (nc); retval.change_capacity (new_nz); fill_or_memset (new_nz, static_cast<octave_idx_type> (0), retval.ridx ()); - for(octave_idx_type i = 0, k = 0; i < nc; i++) + for (octave_idx_type i = 0, k = 0; i < nc; i++) { - octave_idx_type c = cidx(i+1) - cidx(i); + octave_idx_type c = cidx (i+1) - cidx (i); if (c > 0) - retval.xdata(k++) = c; + retval.xdata (k++) = c; } } else if (dim == 1) @@ -215,7 +215,7 @@ // We can use O(nr) memory. Array<double> tmp (dim_vector (nr, 1), 0); for (octave_idx_type i = 0; i < nz; i++) - tmp.xelem(ridx(i)) += 1.0; + tmp.xelem (ridx (i)) += 1.0; retval = tmp; } else @@ -246,8 +246,8 @@ boolMatrix retval (nr, nc, false); for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - retval.elem (ridx(i), j) = data (i); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + retval.elem (ridx (i), j) = data (i); return retval; } @@ -262,8 +262,8 @@ for (octave_idx_type j = 0; j < nc; j++) { octave_quit (); - for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) - os << a.ridx(i) + 1 << " " << j + 1 << " " << a.data(i) << "\n"; + for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) + os << a.ridx (i) + 1 << " " << j + 1 << " " << a.data (i) << "\n"; } return os;
--- a/liboctave/cmd-hist.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/cmd-hist.cc Thu Jul 26 08:13:22 2012 -0700 @@ -535,7 +535,7 @@ command_history::process_histcontrol (const std::string& control_arg) { if (instance_ok ()) - instance->do_process_histcontrol(control_arg); + instance->do_process_histcontrol (control_arg); } std::string
--- a/liboctave/dDiagMatrix.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/dDiagMatrix.cc Thu Jul 26 08:13:22 2012 -0700 @@ -362,7 +362,7 @@ double DiagMatrix::rcond (void) const { - ColumnVector av = diag (0).map<double> (fabs); + ColumnVector av = diag (0).map<double> (fabs); double amx = av.max (), amn = av.min (); return amx == 0 ? 0.0 : amn / amx; }
--- a/liboctave/dMatrix.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/dMatrix.cc Thu Jul 26 08:13:22 2012 -0700 @@ -763,7 +763,7 @@ // Calculate the norm of the matrix, for later use. double anorm = 0; if (calc_cond) - anorm = retval.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + anorm = retval.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); F77_XFCN (dgetrf, DGETRF, (nc, nc, tmp_data, nr, pipvt, info)); @@ -838,7 +838,7 @@ } if (!mattype.is_hermitian ()) - ret = finverse(mattype, info, rcon, force, calc_cond); + ret = finverse (mattype, info, rcon, force, calc_cond); if ((mattype.is_hermitian () || calc_cond) && rcon == 0.) ret = Matrix (rows (), columns (), octave_Inf); @@ -1498,7 +1498,7 @@ Array<octave_idx_type> ipvt (dim_vector (nr, 1)); octave_idx_type *pipvt = ipvt.fortran_vec (); - if(anorm < 0.) + if (anorm < 0.) anorm = atmp.abs ().sum (). row(static_cast<octave_idx_type>(0)).max (); @@ -1762,7 +1762,7 @@ char job = 'L'; Matrix atmp = *this; double *tmp_data = atmp.fortran_vec (); - anorm = atmp.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + anorm = atmp.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); F77_XFCN (dpotrf, DPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, tmp_data, nr, info @@ -1838,8 +1838,8 @@ Matrix atmp = *this; double *tmp_data = atmp.fortran_vec (); - if(anorm < 0.) - anorm = atmp.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + if (anorm < 0.) + anorm = atmp.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); Array<double> z (dim_vector (4 * nc, 1)); double *pz = z.fortran_vec (); @@ -2062,7 +2062,7 @@ { Matrix tmp (b); tmp = solve (typ, tmp, info, rcon, sing_handler, true, transt); - return tmp.column(static_cast<octave_idx_type> (0)); + return tmp.column (static_cast<octave_idx_type> (0)); } ComplexColumnVector @@ -2094,7 +2094,7 @@ solve_singularity_handler sing_handler, blas_trans_type transt) const { ComplexMatrix tmp (*this); - return tmp.solve(typ, b, info, rcon, sing_handler, transt); + return tmp.solve (typ, b, info, rcon, sing_handler, transt); } Matrix
--- a/liboctave/dNDArray.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/dNDArray.cc Thu Jul 26 08:13:22 2012 -0700 @@ -281,7 +281,7 @@ octave_quit (); for (octave_idx_type i = 0; i < npts; i++) - tmp[i] = elem((i + k*npts)*stride + j*dist); + tmp[i] = elem ((i + k*npts)*stride + j*dist); F77_FUNC (zfftf, ZFFTF) (npts, tmp, pwsave); @@ -328,7 +328,7 @@ octave_quit (); for (octave_idx_type i = 0; i < npts; i++) - tmp[i] = elem((i + k*npts)*stride + j*dist); + tmp[i] = elem ((i + k*npts)*stride + j*dist); F77_FUNC (zfftb, ZFFTB) (npts, tmp, pwsave);
--- a/liboctave/dSparse.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/dSparse.cc Thu Jul 26 08:13:22 2012 -0700 @@ -177,7 +177,7 @@ } } for (octave_idx_type i = l; i <= a.cols (); i++) - cidx(i) = j; + cidx (i) = j; } bool @@ -194,11 +194,11 @@ return false; for (octave_idx_type i = 0; i < nc + 1; i++) - if (cidx(i) != a.cidx(i)) + if (cidx (i) != a.cidx (i)) return false; for (octave_idx_type i = 0; i < nz; i++) - if (data(i) != a.data(i) || ridx(i) != a.ridx(i)) + if (data (i) != a.data (i) || ridx (i) != a.ridx (i)) return false; return true; @@ -220,19 +220,19 @@ { for (octave_idx_type j = 0; j < nc; j++) { - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - { - octave_idx_type ri = ridx(i); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + { + octave_idx_type ri = ridx (i); if (ri != j) { bool found = false; - for (octave_idx_type k = cidx(ri); k < cidx(ri+1); k++) + for (octave_idx_type k = cidx (ri); k < cidx (ri+1); k++) { - if (ridx(k) == j) + if (ridx (k) == j) { - if (data(i) == data(k)) + if (data (i) == data (k)) found = true; break; } @@ -294,9 +294,9 @@ { double tmp_max = octave_NaN; octave_idx_type idx_j = 0; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - { - if (ridx(i) != idx_j) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + { + if (ridx (i) != idx_j) break; else idx_j++; @@ -305,7 +305,7 @@ if (idx_j != nr) tmp_max = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { double tmp = data (i); @@ -344,30 +344,30 @@ { idx_arg.resize (dim_vector (nr, 1), 0); - for (octave_idx_type i = cidx(0); i < cidx(1); i++) - idx_arg.elem(ridx(i)) = -1; + for (octave_idx_type i = cidx (0); i < cidx (1); i++) + idx_arg.elem (ridx (i)) = -1; for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - if (idx_arg.elem(i) != -1) + if (idx_arg.elem (i) != -1) continue; bool found = false; - for (octave_idx_type k = cidx(j); k < cidx(j+1); k++) - if (ridx(k) == i) + for (octave_idx_type k = cidx (j); k < cidx (j+1); k++) + if (ridx (k) == i) { found = true; break; } if (!found) - idx_arg.elem(i) = j; + idx_arg.elem (i) = j; } for (octave_idx_type j = 0; j < nc; j++) { - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ir = ridx (i); octave_idx_type ix = idx_arg.elem (ir); @@ -382,7 +382,7 @@ octave_idx_type nel = 0; for (octave_idx_type j = 0; j < nr; j++) - if (idx_arg.elem(j) == -1 || elem (j, idx_arg.elem (j)) != 0.) + if (idx_arg.elem (j) == -1 || elem (j, idx_arg.elem (j)) != 0.) nel++; result = SparseMatrix (nr, 1, nel); @@ -443,9 +443,9 @@ { double tmp_min = octave_NaN; octave_idx_type idx_j = 0; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - { - if (ridx(i) != idx_j) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + { + if (ridx (i) != idx_j) break; else idx_j++; @@ -454,7 +454,7 @@ if (idx_j != nr) tmp_min = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { double tmp = data (i); @@ -493,30 +493,30 @@ { idx_arg.resize (dim_vector (nr, 1), 0); - for (octave_idx_type i = cidx(0); i < cidx(1); i++) - idx_arg.elem(ridx(i)) = -1; + for (octave_idx_type i = cidx (0); i < cidx (1); i++) + idx_arg.elem (ridx (i)) = -1; for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - if (idx_arg.elem(i) != -1) + if (idx_arg.elem (i) != -1) continue; bool found = false; - for (octave_idx_type k = cidx(j); k < cidx(j+1); k++) - if (ridx(k) == i) + for (octave_idx_type k = cidx (j); k < cidx (j+1); k++) + if (ridx (k) == i) { found = true; break; } if (!found) - idx_arg.elem(i) = j; + idx_arg.elem (i) = j; } for (octave_idx_type j = 0; j < nc; j++) { - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ir = ridx (i); octave_idx_type ix = idx_arg.elem (ir); @@ -531,7 +531,7 @@ octave_idx_type nel = 0; for (octave_idx_type j = 0; j < nr; j++) - if (idx_arg.elem(j) == -1 || elem (j, idx_arg.elem (j)) != 0.) + if (idx_arg.elem (j) == -1 || elem (j, idx_arg.elem (j)) != 0.) nel++; result = SparseMatrix (nr, 1, nel); @@ -620,12 +620,12 @@ SparseMatrix r (nr, nc, nz); for (octave_idx_type i = 0; i < nc +1; i++) - r.cidx(i) = a.cidx(i); + r.cidx (i) = a.cidx (i); for (octave_idx_type i = 0; i < nz; i++) { - r.data(i) = std::real (a.data(i)); - r.ridx(i) = a.ridx(i); + r.data (i) = std::real (a.data (i)); + r.ridx (i) = a.ridx (i); } return r; @@ -640,12 +640,12 @@ SparseMatrix r (nr, nc, nz); for (octave_idx_type i = 0; i < nc +1; i++) - r.cidx(i) = a.cidx(i); + r.cidx (i) = a.cidx (i); for (octave_idx_type i = 0; i < nz; i++) { - r.data(i) = std::imag (a.data(i)); - r.ridx(i) = a.ridx(i); + r.data (i) = std::imag (a.data (i)); + r.ridx (i) = a.ridx (i); } return r; @@ -667,7 +667,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = y.cidx (j); i < y.cidx (j+1); i++) - tmp.elem (y.ridx(i), j) = atan2 (x, y.data(i)); + tmp.elem (y.ridx (i), j) = atan2 (x, y.data (i)); return SparseMatrix (tmp); } @@ -683,12 +683,12 @@ SparseMatrix retval (nr, nc, nz); octave_idx_type ii = 0; - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (octave_idx_type i = 0; i < nc; i++) { - for (octave_idx_type j = x.cidx(i); j < x.cidx(i+1); j++) + for (octave_idx_type j = x.cidx (i); j < x.cidx (i+1); j++) { - double tmp = atan2 (x.data(j), y); + double tmp = atan2 (x.data (j), y); if (tmp != 0.) { retval.xdata (ii) = tmp; @@ -737,39 +737,39 @@ r.cidx (0) = 0; for (octave_idx_type i = 0 ; i < x_nc ; i++) { - octave_idx_type ja = x.cidx(i); - octave_idx_type ja_max = x.cidx(i+1); + octave_idx_type ja = x.cidx (i); + octave_idx_type ja_max = x.cidx (i+1); bool ja_lt_max= ja < ja_max; - octave_idx_type jb = y.cidx(i); - octave_idx_type jb_max = y.cidx(i+1); + octave_idx_type jb = y.cidx (i); + octave_idx_type jb_max = y.cidx (i+1); bool jb_lt_max = jb < jb_max; while (ja_lt_max || jb_lt_max ) { octave_quit (); if ((! jb_lt_max) || - (ja_lt_max && (x.ridx(ja) < y.ridx(jb)))) + (ja_lt_max && (x.ridx (ja) < y.ridx (jb)))) { - r.ridx(jx) = x.ridx(ja); - r.data(jx) = atan2 (x.data(ja), 0.); + r.ridx (jx) = x.ridx (ja); + r.data (jx) = atan2 (x.data (ja), 0.); jx++; ja++; ja_lt_max= ja < ja_max; } else if (( !ja_lt_max ) || - (jb_lt_max && (y.ridx(jb) < x.ridx(ja)) ) ) + (jb_lt_max && (y.ridx (jb) < x.ridx (ja)) ) ) { jb++; jb_lt_max= jb < jb_max; } else { - double tmp = atan2 (x.data(ja), y.data(jb)); + double tmp = atan2 (x.data (ja), y.data (jb)); if (tmp != 0.) { - r.data(jx) = tmp; - r.ridx(jx) = x.ridx(ja); + r.data (jx) = tmp; + r.ridx (jx) = x.ridx (ja); jx++; } ja++; @@ -778,7 +778,7 @@ jb_lt_max= jb < jb_max; } } - r.cidx(i+1) = jx; + r.cidx (i+1) = jx; } r.maybe_compress (); @@ -849,7 +849,7 @@ double dmax = 0., dmin = octave_Inf; for (octave_idx_type i = 0; i < nr; i++) { - double tmp = fabs(v[i]); + double tmp = fabs (v[i]); if (tmp > dmax) dmax = tmp; if (tmp < dmin) @@ -899,8 +899,8 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -925,9 +925,9 @@ retval.change_capacity (nz2); } - retval.xcidx(i) = cx; - retval.xridx(cx) = i; - retval.xdata(cx) = 1.0; + retval.xcidx (i) = cx; + retval.xridx (cx) = i; + retval.xdata (cx) = 1.0; cx++; // iterate accross columns of input matrix @@ -935,11 +935,11 @@ { double v = 0.; // iterate to calculate sum - octave_idx_type colXp = retval.xcidx(i); - octave_idx_type colUp = cidx(j); + octave_idx_type colXp = retval.xcidx (i); + octave_idx_type colUp = cidx (j); octave_idx_type rpX, rpU; - if (cidx(j) == cidx(j+1)) + if (cidx (j) == cidx (j+1)) { (*current_liboctave_error_handler) ("division by zero"); @@ -949,8 +949,8 @@ do { octave_quit (); - rpX = retval.xridx(colXp); - rpU = ridx(colUp); + rpX = retval.xridx (colXp); + rpU = ridx (colUp); if (rpX < rpU) colXp++; @@ -958,7 +958,7 @@ colUp++; else { - v -= retval.xdata(colXp) * data(colUp); + v -= retval.xdata (colXp) * data (colUp); colXp++; colUp++; } @@ -967,11 +967,11 @@ // get A(m,m) if (typ == MatrixType::Upper) - colUp = cidx(j+1) - 1; + colUp = cidx (j+1) - 1; else - colUp = cidx(j); - double pivot = data(colUp); - if (pivot == 0. || ridx(colUp) != j) + colUp = cidx (j); + double pivot = data (colUp); + if (pivot == 0. || ridx (colUp) != j) { (*current_liboctave_error_handler) ("division by zero"); @@ -986,8 +986,8 @@ retval.change_capacity (nz2); } - retval.xridx(cx) = j; - retval.xdata(cx) = v / pivot; + retval.xridx (cx) = j; + retval.xdata (cx) = v / pivot; cx++; } } @@ -995,11 +995,11 @@ // get A(m,m) octave_idx_type colUp; if (typ == MatrixType::Upper) - colUp = cidx(i+1) - 1; + colUp = cidx (i+1) - 1; else - colUp = cidx(i); - double pivot = data(colUp); - if (pivot == 0. || ridx(colUp) != i) + colUp = cidx (i); + double pivot = data (colUp); + if (pivot == 0. || ridx (colUp) != i) { (*current_liboctave_error_handler) ("division by zero"); goto inverse_singular; @@ -1007,9 +1007,9 @@ if (pivot != 1.0) for (octave_idx_type j = cx_colstart; j < cx; j++) - retval.xdata(j) /= pivot; - } - retval.xcidx(nr) = cx; + retval.xdata (j) /= pivot; + } + retval.xcidx (nr) = cx; retval.maybe_compress (); } else @@ -1053,19 +1053,19 @@ double v = 0.; octave_idx_type jidx = perm[j]; // iterate to calculate sum - for (octave_idx_type k = cidx(jidx); - k < cidx(jidx+1); k++) + for (octave_idx_type k = cidx (jidx); + k < cidx (jidx+1); k++) { octave_quit (); - v -= work[ridx(k)] * data(k); + v -= work[ridx (k)] * data (k); } // get A(m,m) double pivot; if (typ == MatrixType::Permuted_Upper) - pivot = data(cidx(jidx+1) - 1); + pivot = data (cidx (jidx+1) - 1); else - pivot = data(cidx(jidx)); + pivot = data (cidx (jidx)); if (pivot == 0.) { (*current_liboctave_error_handler) @@ -1079,11 +1079,11 @@ // get A(m,m) octave_idx_type colUp; if (typ == MatrixType::Permuted_Upper) - colUp = cidx(perm[iidx]+1) - 1; + colUp = cidx (perm[iidx]+1) - 1; else - colUp = cidx(perm[iidx]); - - double pivot = data(colUp); + colUp = cidx (perm[iidx]); + + double pivot = data (colUp); if (pivot == 0.) { (*current_liboctave_error_handler) @@ -1106,16 +1106,16 @@ retval.change_capacity (nz2); } - retval.xcidx(i) = cx; + retval.xcidx (i) = cx; for (octave_idx_type j = iidx; j < nr; j++) if (work[j] != 0.) { - retval.xridx(cx) = j; - retval.xdata(cx++) = work[j]; + retval.xridx (cx) = j; + retval.xdata (cx++) = work[j]; } } - retval.xcidx(nr) = cx; + retval.xcidx (nr) = cx; retval.maybe_compress (); } @@ -1125,9 +1125,9 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = retval.cidx(j); - i < retval.cidx(j+1); i++) - atmp += fabs(retval.data(i)); + for (octave_idx_type i = retval.cidx (j); + i < retval.cidx (j+1); i++) + atmp += fabs (retval.data (i)); if (atmp > ainvnorm) ainvnorm = atmp; } @@ -1175,7 +1175,7 @@ { double rcond2; SparseMatrix Q = fact.Q (); - SparseMatrix InvL = fact.L ().transpose ().tinverse(tmp_typ, + SparseMatrix InvL = fact.L ().transpose ().tinverse (tmp_typ, info, rcond2, true, false); ret = Q * InvL.transpose () * InvL * Q.transpose (); } @@ -1198,9 +1198,9 @@ SparseLU fact (*this, Qinit, Matrix (), false, false); rcond = fact.rcond (); double rcond2; - SparseMatrix InvL = fact.L ().transpose ().tinverse(tmp_typ, + SparseMatrix InvL = fact.L ().transpose ().tinverse (tmp_typ, info, rcond2, true, false); - SparseMatrix InvU = fact.U ().tinverse(tmp_typ, info, rcond2, + SparseMatrix InvU = fact.U ().tinverse (tmp_typ, info, rcond2, true, false).transpose (); ret = fact.Pc ().transpose () * InvU * InvL * fact.Pr (); } @@ -1374,15 +1374,15 @@ else for (octave_idx_type j = 0; j < b.cols (); j++) for (octave_idx_type k = 0; k < nc; k++) - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - retval(k,j) = b(ridx(i),j) / data (i); + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + retval(k,j) = b(ridx (i),j) / data (i); if (calc_cond) { double dmax = 0., dmin = octave_Inf; for (octave_idx_type i = 0; i < nm; i++) { - double tmp = fabs(data(i)); + double tmp = fabs (data (i)); if (tmp > dmax) dmax = tmp; if (tmp < dmin) @@ -1430,30 +1430,30 @@ octave_idx_type b_nz = b.nnz (); retval = SparseMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; if (typ == MatrixType::Diagonal) for (octave_idx_type j = 0; j < b_nc; j++) { - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) { - if (b.ridx(i) >= nm) + if (b.ridx (i) >= nm) break; - retval.xridx (ii) = b.ridx(i); - retval.xdata (ii++) = b.data(i) / data (b.ridx (i)); + retval.xridx (ii) = b.ridx (i); + retval.xdata (ii++) = b.data (i) / data (b.ridx (i)); } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } else for (octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type l = 0; l < nc; l++) - for (octave_idx_type i = cidx(l); i < cidx(l+1); i++) + for (octave_idx_type i = cidx (l); i < cidx (l+1); i++) { bool found = false; octave_idx_type k; - for (k = b.cidx(j); k < b.cidx(j+1); k++) - if (ridx(i) == b.ridx(k)) + for (k = b.cidx (j); k < b.cidx (j+1); k++) + if (ridx (i) == b.ridx (k)) { found = true; break; @@ -1461,10 +1461,10 @@ if (found) { retval.xridx (ii) = l; - retval.xdata (ii++) = b.data(k) / data (i); + retval.xdata (ii++) = b.data (k) / data (i); } } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } if (calc_cond) @@ -1472,7 +1472,7 @@ double dmax = 0., dmin = octave_Inf; for (octave_idx_type i = 0; i < nm; i++) { - double tmp = fabs(data(i)); + double tmp = fabs (data (i)); if (tmp > dmax) dmax = tmp; if (tmp < dmin) @@ -1524,15 +1524,15 @@ else for (octave_idx_type j = 0; j < b.cols (); j++) for (octave_idx_type k = 0; k < nc; k++) - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - retval(k,j) = b(ridx(i),j) / data (i); + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + retval(k,j) = b(ridx (i),j) / data (i); if (calc_cond) { double dmax = 0., dmin = octave_Inf; for (octave_idx_type i = 0; i < nm; i++) { - double tmp = fabs(data(i)); + double tmp = fabs (data (i)); if (tmp > dmax) dmax = tmp; if (tmp < dmin) @@ -1580,30 +1580,30 @@ octave_idx_type b_nz = b.nnz (); retval = SparseComplexMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; if (typ == MatrixType::Diagonal) for (octave_idx_type j = 0; j < b.cols (); j++) { - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) { - if (b.ridx(i) >= nm) + if (b.ridx (i) >= nm) break; - retval.xridx (ii) = b.ridx(i); - retval.xdata (ii++) = b.data(i) / data (b.ridx (i)); + retval.xridx (ii) = b.ridx (i); + retval.xdata (ii++) = b.data (i) / data (b.ridx (i)); } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } else for (octave_idx_type j = 0; j < b.cols (); j++) { for (octave_idx_type l = 0; l < nc; l++) - for (octave_idx_type i = cidx(l); i < cidx(l+1); i++) + for (octave_idx_type i = cidx (l); i < cidx (l+1); i++) { bool found = false; octave_idx_type k; - for (k = b.cidx(j); k < b.cidx(j+1); k++) - if (ridx(i) == b.ridx(k)) + for (k = b.cidx (j); k < b.cidx (j+1); k++) + if (ridx (i) == b.ridx (k)) { found = true; break; @@ -1611,10 +1611,10 @@ if (found) { retval.xridx (ii) = l; - retval.xdata (ii++) = b.data(k) / data (i); + retval.xdata (ii++) = b.data (k) / data (i); } } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } if (calc_cond) @@ -1622,7 +1622,7 @@ double dmax = 0., dmin = octave_Inf; for (octave_idx_type i = 0; i < nm; i++) { - double tmp = fabs(data(i)); + double tmp = fabs (data (i)); if (tmp > dmax) dmax = tmp; if (tmp < dmin) @@ -1678,8 +1678,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -1704,20 +1704,20 @@ if (work[k] != 0.) { - if (ridx(cidx(kidx+1)-1) != k || - data(cidx(kidx+1)-1) == 0.) + if (ridx (cidx (kidx+1)-1) != k || + data (cidx (kidx+1)-1) == 0.) { err = -2; goto triangular_error; } - double tmp = work[k] / data(cidx(kidx+1)-1); + double tmp = work[k] / data (cidx (kidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(kidx); - i < cidx(kidx+1)-1; i++) + for (octave_idx_type i = cidx (kidx); + i < cidx (kidx+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -1742,20 +1742,20 @@ if (work[k] != 0.) { - double tmp = work[k] / data(cidx(iidx+1)-1); + double tmp = work[k] / data (cidx (iidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(iidx); - i < cidx(iidx+1)-1; i++) + for (octave_idx_type i = cidx (iidx); + i < cidx (iidx+1)-1; i++) { - octave_idx_type idx2 = ridx(i); - work[idx2] = work[idx2] - tmp * data(i); + octave_idx_type idx2 = ridx (i); + work[idx2] = work[idx2] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -1780,19 +1780,19 @@ { if (work[k] != 0.) { - if (ridx(cidx(k+1)-1) != k || - data(cidx(k+1)-1) == 0.) + if (ridx (cidx (k+1)-1) != k || + data (cidx (k+1)-1) == 0.) { err = -2; goto triangular_error; } - double tmp = work[k] / data(cidx(k+1)-1); + double tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -1815,19 +1815,19 @@ { if (work[k] != 0.) { - double tmp = work[k] / data(cidx(k+1)-1); + double tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -1912,8 +1912,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -1922,7 +1922,7 @@ octave_idx_type b_nc = b.cols (); octave_idx_type b_nz = b.nnz (); retval = SparseMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; octave_idx_type x_nz = b_nz; @@ -1939,8 +1939,8 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); for (octave_idx_type k = nc-1; k >= 0; k--) { @@ -1948,20 +1948,20 @@ if (work[k] != 0.) { - if (ridx(cidx(kidx+1)-1) != k || - data(cidx(kidx+1)-1) == 0.) + if (ridx (cidx (kidx+1)-1) != k || + data (cidx (kidx+1)-1) == 0.) { err = -2; goto triangular_error; } - double tmp = work[k] / data(cidx(kidx+1)-1); + double tmp = work[k] / data (cidx (kidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(kidx); - i < cidx(kidx+1)-1; i++) + for (octave_idx_type i = cidx (kidx); + i < cidx (kidx+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -1984,10 +1984,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[rperm[i]] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[rperm[i]]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[rperm[i]]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -2008,20 +2008,20 @@ if (work[k] != 0.) { - double tmp = work[k] / data(cidx(iidx+1)-1); + double tmp = work[k] / data (cidx (iidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(iidx); - i < cidx(iidx+1)-1; i++) + for (octave_idx_type i = cidx (iidx); + i < cidx (iidx+1)-1; i++) { - octave_idx_type idx2 = ridx(i); - work[idx2] = work[idx2] - tmp * data(i); + octave_idx_type idx2 = ridx (i); + work[idx2] = work[idx2] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2038,26 +2038,26 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); for (octave_idx_type k = nc-1; k >= 0; k--) { if (work[k] != 0.) { - if (ridx(cidx(k+1)-1) != k || - data(cidx(k+1)-1) == 0.) + if (ridx (cidx (k+1)-1) != k || + data (cidx (k+1)-1) == 0.) { err = -2; goto triangular_error; } - double tmp = work[k] / data(cidx(k+1)-1); + double tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2080,10 +2080,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -2102,20 +2102,20 @@ { if (work[k] != 0.) { - double tmp = work[k] / data(cidx(k+1)-1); + double tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2200,8 +2200,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -2226,20 +2226,20 @@ if (cwork[k] != 0.) { - if (ridx(cidx(kidx+1)-1) != k || - data(cidx(kidx+1)-1) == 0.) + if (ridx (cidx (kidx+1)-1) != k || + data (cidx (kidx+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = cwork[k] / data(cidx(kidx+1)-1); + Complex tmp = cwork[k] / data (cidx (kidx+1)-1); cwork[k] = tmp; - for (octave_idx_type i = cidx(kidx); - i < cidx(kidx+1)-1; i++) + for (octave_idx_type i = cidx (kidx); + i < cidx (kidx+1)-1; i++) { - octave_idx_type iidx = ridx(i); - cwork[iidx] = cwork[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + cwork[iidx] = cwork[iidx] - tmp * data (i); } } } @@ -2265,20 +2265,20 @@ if (work[k] != 0.) { - double tmp = work[k] / data(cidx(iidx+1)-1); + double tmp = work[k] / data (cidx (iidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(iidx); - i < cidx(iidx+1)-1; i++) + for (octave_idx_type i = cidx (iidx); + i < cidx (iidx+1)-1; i++) { - octave_idx_type idx2 = ridx(i); - work[idx2] = work[idx2] - tmp * data(i); + octave_idx_type idx2 = ridx (i); + work[idx2] = work[idx2] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2303,19 +2303,19 @@ { if (cwork[k] != 0.) { - if (ridx(cidx(k+1)-1) != k || - data(cidx(k+1)-1) == 0.) + if (ridx (cidx (k+1)-1) != k || + data (cidx (k+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = cwork[k] / data(cidx(k+1)-1); + Complex tmp = cwork[k] / data (cidx (k+1)-1); cwork[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - cwork[iidx] = cwork[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + cwork[iidx] = cwork[iidx] - tmp * data (i); } } } @@ -2339,20 +2339,20 @@ { if (work[k] != 0.) { - double tmp = work[k] / data(cidx(k+1)-1); + double tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2437,8 +2437,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -2447,7 +2447,7 @@ octave_idx_type b_nc = b.cols (); octave_idx_type b_nz = b.nnz (); retval = SparseComplexMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; octave_idx_type x_nz = b_nz; @@ -2464,8 +2464,8 @@ { for (octave_idx_type i = 0; i < nm; i++) cwork[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - cwork[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + cwork[b.ridx (i)] = b.data (i); for (octave_idx_type k = nc-1; k >= 0; k--) { @@ -2473,20 +2473,20 @@ if (cwork[k] != 0.) { - if (ridx(cidx(kidx+1)-1) != k || - data(cidx(kidx+1)-1) == 0.) + if (ridx (cidx (kidx+1)-1) != k || + data (cidx (kidx+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = cwork[k] / data(cidx(kidx+1)-1); + Complex tmp = cwork[k] / data (cidx (kidx+1)-1); cwork[k] = tmp; - for (octave_idx_type i = cidx(kidx); - i < cidx(kidx+1)-1; i++) + for (octave_idx_type i = cidx (kidx); + i < cidx (kidx+1)-1; i++) { - octave_idx_type iidx = ridx(i); - cwork[iidx] = cwork[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + cwork[iidx] = cwork[iidx] - tmp * data (i); } } } @@ -2509,10 +2509,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (cwork[rperm[i]] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = cwork[rperm[i]]; + retval.xridx (ii) = i; + retval.xdata (ii++) = cwork[rperm[i]]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -2534,20 +2534,20 @@ if (work[k] != 0.) { - double tmp = work[k] / data(cidx(iidx+1)-1); + double tmp = work[k] / data (cidx (iidx+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(iidx); - i < cidx(iidx+1)-1; i++) + for (octave_idx_type i = cidx (iidx); + i < cidx (iidx+1)-1; i++) { - octave_idx_type idx2 = ridx(i); - work[idx2] = work[idx2] - tmp * data(i); + octave_idx_type idx2 = ridx (i); + work[idx2] = work[idx2] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2564,26 +2564,26 @@ { for (octave_idx_type i = 0; i < nm; i++) cwork[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - cwork[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + cwork[b.ridx (i)] = b.data (i); for (octave_idx_type k = nc-1; k >= 0; k--) { if (cwork[k] != 0.) { - if (ridx(cidx(k+1)-1) != k || - data(cidx(k+1)-1) == 0.) + if (ridx (cidx (k+1)-1) != k || + data (cidx (k+1)-1) == 0.) { err = -2; goto triangular_error; } - Complex tmp = cwork[k] / data(cidx(k+1)-1); + Complex tmp = cwork[k] / data (cidx (k+1)-1); cwork[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - cwork[iidx] = cwork[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + cwork[iidx] = cwork[iidx] - tmp * data (i); } } } @@ -2606,10 +2606,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (cwork[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = cwork[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = cwork[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -2629,20 +2629,20 @@ { if (work[k] != 0.) { - double tmp = work[k] / data(cidx(k+1)-1); + double tmp = work[k] / data (cidx (k+1)-1); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1)-1; i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1)-1; i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = 0; i < j+1; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2728,8 +2728,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -2756,28 +2756,28 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - if (minr != k || data(mini) == 0) + if (minr != k || data (mini) == 0) { err = -2; goto triangular_error; } - double tmp = work[k] / data(mini); + double tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2803,24 +2803,24 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - double tmp = work[k] / data(mini); + double tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2828,7 +2828,7 @@ double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2852,20 +2852,20 @@ { if (work[k] != 0.) { - if (ridx(cidx(k)) != k || - data(cidx(k)) == 0.) + if (ridx (cidx (k)) != k || + data (cidx (k)) == 0.) { err = -2; goto triangular_error; } - double tmp = work[k] / data(cidx(k)); + double tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; + i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -2889,20 +2889,20 @@ if (work[k] != 0.) { - double tmp = work[k] / data(cidx(k)); + double tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; + i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -2987,8 +2987,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -2997,7 +2997,7 @@ octave_idx_type b_nc = b.cols (); octave_idx_type b_nz = b.nnz (); retval = SparseMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; octave_idx_type x_nz = b_nz; @@ -3010,8 +3010,8 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[perm[b.ridx(i)]] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[perm[b.ridx (i)]] = b.data (i); for (octave_idx_type k = 0; k < nc; k++) { @@ -3020,28 +3020,28 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - if (minr != k || data(mini) == 0) + if (minr != k || data (mini) == 0) { err = -2; goto triangular_error; } - double tmp = work[k] / data(mini); + double tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3064,10 +3064,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -3089,24 +3089,24 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - double tmp = work[k] / data(mini); + double tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3114,7 +3114,7 @@ double atmp = 0; for (octave_idx_type i = j; i < nr; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3131,26 +3131,26 @@ { for (octave_idx_type i = 0; i < nm; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); for (octave_idx_type k = 0; k < nc; k++) { if (work[k] != 0.) { - if (ridx(cidx(k)) != k || - data(cidx(k)) == 0.) + if (ridx (cidx (k)) != k || + data (cidx (k)) == 0.) { err = -2; goto triangular_error; } - double tmp = work[k] / data(cidx(k)); + double tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3173,10 +3173,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -3196,20 +3196,20 @@ if (work[k] != 0.) { - double tmp = work[k] / data(cidx(k)); + double tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; + i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3295,8 +3295,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -3322,28 +3322,28 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - if (minr != k || data(mini) == 0) + if (minr != k || data (mini) == 0) { err = -2; goto triangular_error; } - Complex tmp = cwork[k] / data(mini); + Complex tmp = cwork[k] / data (mini); cwork[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - cwork[iidx] = cwork[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + cwork[iidx] = cwork[iidx] - tmp * data (i); } } } @@ -3370,24 +3370,24 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - double tmp = work[k] / data(mini); + double tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3395,7 +3395,7 @@ double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3420,19 +3420,19 @@ { if (cwork[k] != 0.) { - if (ridx(cidx(k)) != k || - data(cidx(k)) == 0.) + if (ridx (cidx (k)) != k || + data (cidx (k)) == 0.) { err = -2; goto triangular_error; } - Complex tmp = cwork[k] / data(cidx(k)); + Complex tmp = cwork[k] / data (cidx (k)); cwork[k] = tmp; - for (octave_idx_type i = cidx(k)+1; i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - cwork[iidx] = cwork[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + cwork[iidx] = cwork[iidx] - tmp * data (i); } } } @@ -3457,20 +3457,20 @@ if (work[k] != 0.) { - double tmp = work[k] / data(cidx(k)); + double tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; + i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3555,8 +3555,8 @@ for (octave_idx_type j = 0; j < nc; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -3565,7 +3565,7 @@ octave_idx_type b_nc = b.cols (); octave_idx_type b_nz = b.nnz (); retval = SparseComplexMatrix (nc, b_nc, b_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; octave_idx_type ii = 0; octave_idx_type x_nz = b_nz; @@ -3578,8 +3578,8 @@ { for (octave_idx_type i = 0; i < nm; i++) cwork[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - cwork[perm[b.ridx(i)]] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + cwork[perm[b.ridx (i)]] = b.data (i); for (octave_idx_type k = 0; k < nc; k++) { @@ -3588,28 +3588,28 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - if (minr != k || data(mini) == 0) + if (minr != k || data (mini) == 0) { err = -2; goto triangular_error; } - Complex tmp = cwork[k] / data(mini); + Complex tmp = cwork[k] / data (mini); cwork[k] = tmp; - for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - cwork[iidx] = cwork[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + cwork[iidx] = cwork[iidx] - tmp * data (i); } } } @@ -3632,10 +3632,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (cwork[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = cwork[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = cwork[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -3658,24 +3658,24 @@ octave_idx_type minr = nr; octave_idx_type mini = 0; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) - if (perm[ridx(i)] < minr) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) + if (perm[ridx (i)] < minr) { - minr = perm[ridx(i)]; + minr = perm[ridx (i)]; mini = i; } - double tmp = work[k] / data(mini); + double tmp = work[k] / data (mini); work[k] = tmp; - for (octave_idx_type i = cidx(k); - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k); + i < cidx (k+1); i++) { if (i == mini) continue; - octave_idx_type iidx = perm[ridx(i)]; - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = perm[ridx (i)]; + work[iidx] = work[iidx] - tmp * data (i); } } } @@ -3683,7 +3683,7 @@ double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3700,26 +3700,26 @@ { for (octave_idx_type i = 0; i < nm; i++) cwork[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - cwork[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + cwork[b.ridx (i)] = b.data (i); for (octave_idx_type k = 0; k < nc; k++) { if (cwork[k] != 0.) { - if (ridx(cidx(k)) != k || - data(cidx(k)) == 0.) + if (ridx (cidx (k)) != k || + data (cidx (k)) == 0.) { err = -2; goto triangular_error; } - Complex tmp = cwork[k] / data(cidx(k)); + Complex tmp = cwork[k] / data (cidx (k)); cwork[k] = tmp; - for (octave_idx_type i = cidx(k)+1; i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - cwork[iidx] = cwork[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + cwork[iidx] = cwork[iidx] - tmp * data (i); } } } @@ -3742,10 +3742,10 @@ for (octave_idx_type i = 0; i < nc; i++) if (cwork[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = cwork[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = cwork[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -3766,20 +3766,20 @@ if (work[k] != 0.) { - double tmp = work[k] / data(cidx(k)); + double tmp = work[k] / data (cidx (k)); work[k] = tmp; - for (octave_idx_type i = cidx(k)+1; - i < cidx(k+1); i++) + for (octave_idx_type i = cidx (k)+1; + i < cidx (k+1); i++) { - octave_idx_type iidx = ridx(i); - work[iidx] = work[iidx] - tmp * data(i); + octave_idx_type iidx = ridx (i); + work[iidx] = work[iidx] - tmp * data (i); } } } double atmp = 0; for (octave_idx_type i = j; i < nc; i++) { - atmp += fabs(work[i]); + atmp += fabs (work[i]); work[i] = 0.; } if (atmp > ainvnorm) @@ -3864,11 +3864,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = data(ii++); - DL[j] = data(ii); + D[j] = data (ii++); + DL[j] = data (ii); ii += 2; } - D[nc-1] = data(ii); + D[nc-1] = data (ii); } else { @@ -3880,12 +3880,12 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = data(i); - else if (ridx(i) == j + 1) - DL[j] = data(i); + if (ridx (i) == j) + D[j] = data (i); + else if (ridx (i) == j + 1) + DL[j] = data (i); } } @@ -3918,11 +3918,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = data(ii++); - DL[j] = data(ii++); - DU[j] = data(ii++); - } - D[nc-1] = data(ii); + D[j] = data (ii++); + DL[j] = data (ii++); + DU[j] = data (ii++); + } + D[nc-1] = data (ii); } else { @@ -3935,14 +3935,14 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = data(i); - else if (ridx(i) == j + 1) - DL[j] = data(i); - else if (ridx(i) == j - 1) - DU[j-1] = data(i); + if (ridx (i) == j) + D[j] = data (i); + else if (ridx (i) == j + 1) + DL[j] = data (i); + else if (ridx (i) == j - 1) + DU[j-1] = data (i); } } @@ -4021,11 +4021,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = data(ii++); - DL[j] = data(ii++); - DU[j] = data(ii++); - } - D[nc-1] = data(ii); + D[j] = data (ii++); + DL[j] = data (ii++); + DU[j] = data (ii++); + } + D[nc-1] = data (ii); } else { @@ -4038,14 +4038,14 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = data(i); - else if (ridx(i) == j + 1) - DL[j] = data(i); - else if (ridx(i) == j - 1) - DU[j-1] = data(i); + if (ridx (i) == j) + D[j] = data (i); + else if (ridx (i) == j + 1) + DL[j] = data (i); + else if (ridx (i) == j - 1) + DU[j-1] = data (i); } } @@ -4073,7 +4073,7 @@ volatile octave_idx_type x_nz = b.nnz (); octave_idx_type b_nc = b.cols (); retval = SparseMatrix (nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; volatile octave_idx_type ii = 0; OCTAVE_LOCAL_BUFFER (double, work, nr); @@ -4082,8 +4082,8 @@ { for (octave_idx_type i = 0; i < nr; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); F77_XFCN (dgttrs, DGTTRS, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4109,10 +4109,10 @@ for (octave_idx_type i = 0; i < nr; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -4162,11 +4162,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = data(ii++); - DL[j] = data(ii); + D[j] = data (ii++); + DL[j] = data (ii); ii += 2; } - D[nc-1] = data(ii); + D[nc-1] = data (ii); } else { @@ -4178,12 +4178,12 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = data(i); - else if (ridx(i) == j + 1) - DL[j] = data(i); + if (ridx (i) == j) + D[j] = data (i); + else if (ridx (i) == j + 1) + DL[j] = data (i); } } @@ -4217,11 +4217,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = data(ii++); - DL[j] = data(ii++); - DU[j] = data(ii++); - } - D[nc-1] = data(ii); + D[j] = data (ii++); + DL[j] = data (ii++); + DU[j] = data (ii++); + } + D[nc-1] = data (ii); } else { @@ -4234,14 +4234,14 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = data(i); - else if (ridx(i) == j + 1) - DL[j] = data(i); - else if (ridx(i) == j - 1) - DU[j-1] = data(i); + if (ridx (i) == j) + D[j] = data (i); + else if (ridx (i) == j + 1) + DL[j] = data (i); + else if (ridx (i) == j - 1) + DU[j-1] = data (i); } } @@ -4320,11 +4320,11 @@ for (octave_idx_type j = 0; j < nc-1; j++) { - D[j] = data(ii++); - DL[j] = data(ii++); - DU[j] = data(ii++); - } - D[nc-1] = data(ii); + D[j] = data (ii++); + DL[j] = data (ii++); + DU[j] = data (ii++); + } + D[nc-1] = data (ii); } else { @@ -4337,14 +4337,14 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { - if (ridx(i) == j) - D[j] = data(i); - else if (ridx(i) == j + 1) - DL[j] = data(i); - else if (ridx(i) == j - 1) - DU[j-1] = data(i); + if (ridx (i) == j) + D[j] = data (i); + else if (ridx (i) == j + 1) + DL[j] = data (i); + else if (ridx (i) == j - 1) + DU[j-1] = data (i); } } @@ -4379,7 +4379,7 @@ volatile octave_idx_type ii = 0; retval = SparseComplexMatrix (b_nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (volatile octave_idx_type j = 0; j < b_nc; j++) { @@ -4438,12 +4438,12 @@ for (octave_idx_type i = 0; i < nr; i++) if (Bx[i] != 0. || Bz[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = + retval.xridx (ii) = i; + retval.xdata (ii++) = Complex (Bx[i], Bz[i]); } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -4496,17 +4496,17 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ri = ridx (i); if (ri >= j) - m_band(ri - j, j) = data(i); + m_band(ri - j, j) = data (i); } // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs ().sum ().row(0).max (); + anorm = m_band.abs ().sum ().row (0).max (); char job = 'L'; F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4603,8 +4603,8 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - m_band(ridx(i) - j + n_lower + n_upper, j) = data(i); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + m_band(ridx (i) - j + n_lower + n_upper, j) = data (i); // Calculate the norm of the matrix, for later use. double anorm; @@ -4613,8 +4613,8 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -4746,17 +4746,17 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ri = ridx (i); if (ri >= j) - m_band(ri - j, j) = data(i); + m_band(ri - j, j) = data (i); } // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs ().sum ().row(0).max (); + anorm = m_band.abs ().sum ().row (0).max (); char job = 'L'; F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4820,7 +4820,7 @@ volatile octave_idx_type ii = 0; retval = SparseMatrix (b_nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (volatile octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type i = 0; i < b_nr; i++) @@ -4854,11 +4854,11 @@ retval.change_capacity (sz); x_nz = sz; } - retval.xdata(ii) = tmp; - retval.xridx(ii++) = i; + retval.xdata (ii) = tmp; + retval.xridx (ii++) = i; } } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -4886,8 +4886,8 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - m_band(ridx(i) - j + n_lower + n_upper, j) = data(i); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + m_band(ridx (i) - j + n_lower + n_upper, j) = data (i); // Calculate the norm of the matrix, for later use. double anorm; @@ -4896,8 +4896,8 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -4969,7 +4969,7 @@ volatile octave_idx_type x_nz = b.nnz (); octave_idx_type b_nc = b.cols (); retval = SparseMatrix (nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; volatile octave_idx_type ii = 0; OCTAVE_LOCAL_BUFFER (double, work, nr); @@ -4978,9 +4978,9 @@ { for (octave_idx_type i = 0; i < nr; i++) work[i] = 0.; - for (octave_idx_type i = b.cidx(j); - i < b.cidx(j+1); i++) - work[b.ridx(i)] = b.data(i); + for (octave_idx_type i = b.cidx (j); + i < b.cidx (j+1); i++) + work[b.ridx (i)] = b.data (i); F77_XFCN (dgbtrs, DGBTRS, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5006,10 +5006,10 @@ for (octave_idx_type i = 0; i < nr; i++) if (work[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = work[i]; + retval.xridx (ii) = i; + retval.xdata (ii++) = work[i]; } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -5064,17 +5064,17 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ri = ridx (i); if (ri >= j) - m_band(ri - j, j) = data(i); + m_band(ri - j, j) = data (i); } // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs ().sum ().row(0).max (); + anorm = m_band.abs ().sum ().row (0).max (); char job = 'L'; F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5202,8 +5202,8 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - m_band(ridx(i) - j + n_lower + n_upper, j) = data(i); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + m_band(ridx (i) - j + n_lower + n_upper, j) = data (i); // Calculate the norm of the matrix, for later use. double anorm; @@ -5212,8 +5212,8 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -5363,17 +5363,17 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) { octave_idx_type ri = ridx (i); if (ri >= j) - m_band(ri - j, j) = data(i); + m_band(ri - j, j) = data (i); } // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs ().sum ().row(0).max (); + anorm = m_band.abs ().sum ().row (0).max (); char job = 'L'; F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5441,7 +5441,7 @@ volatile octave_idx_type ii = 0; retval = SparseComplexMatrix (b_nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (volatile octave_idx_type j = 0; j < b_nc; j++) { @@ -5499,12 +5499,12 @@ for (octave_idx_type i = 0; i < nr; i++) if (Bx[i] != 0. || Bz[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = + retval.xridx (ii) = i; + retval.xdata (ii++) = Complex (Bx[i], Bz[i]); } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -5532,8 +5532,8 @@ } for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - m_band(ridx(i) - j + n_lower + n_upper, j) = data(i); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + m_band(ridx (i) - j + n_lower + n_upper, j) = data (i); // Calculate the norm of the matrix, for later use. double anorm; @@ -5542,8 +5542,8 @@ for (octave_idx_type j = 0; j < nr; j++) { double atmp = 0.; - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) - atmp += fabs(data(i)); + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) + atmp += fabs (data (i)); if (atmp > anorm) anorm = atmp; } @@ -5615,7 +5615,7 @@ volatile octave_idx_type x_nz = b.nnz (); octave_idx_type b_nc = b.cols (); retval = SparseComplexMatrix (nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; volatile octave_idx_type ii = 0; OCTAVE_LOCAL_BUFFER (double, Bx, nr); @@ -5628,12 +5628,12 @@ Bx[i] = 0.; Bz[i] = 0.; } - for (octave_idx_type i = b.cidx(j); - i < b.cidx(j+1); i++) + for (octave_idx_type i = b.cidx (j); + i < b.cidx (j+1); i++) { - Complex c = b.data(i); - Bx[b.ridx(i)] = std::real (c); - Bz[b.ridx(i)] = std::imag (c); + Complex c = b.data (i); + Bx[b.ridx (i)] = std::real (c); + Bz[b.ridx (i)] = std::imag (c); } F77_XFCN (dgbtrs, DGBTRS, @@ -5666,11 +5666,11 @@ for (octave_idx_type i = 0; i < nr; i++) if (Bx[i] != 0. || Bz[i] != 0.) { - retval.xridx(ii) = i; - retval.xdata(ii++) = + retval.xridx (ii) = i; + retval.xdata (ii++) = Complex (Bx[i], Bz[i]); } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -5935,7 +5935,7 @@ { octave_idx_type jr = j * b.rows (); for (octave_idx_type i = 0; i < b.rows (); i++) - retval.xelem(i,j) = static_cast<double *>(X->x)[jr + i]; + retval.xelem (i,j) = static_cast<double *>(X->x)[jr + i]; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6160,12 +6160,12 @@ static_cast<octave_idx_type>(X->nzmax)); for (octave_idx_type j = 0; j <= static_cast<octave_idx_type>(X->ncol); j++) - retval.xcidx(j) = static_cast<octave_idx_type *>(X->p)[j]; + retval.xcidx (j) = static_cast<octave_idx_type *>(X->p)[j]; for (octave_idx_type j = 0; j < static_cast<octave_idx_type>(X->nzmax); j++) { - retval.xridx(j) = static_cast<octave_idx_type *>(X->i)[j]; - retval.xdata(j) = static_cast<double *>(X->x)[j]; + retval.xridx (j) = static_cast<octave_idx_type *>(X->i)[j]; + retval.xdata (j) = static_cast<double *>(X->x)[j]; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6212,7 +6212,7 @@ octave_idx_type ii = 0; retval = SparseMatrix (b_nr, b_nc, x_nz); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (octave_idx_type j = 0; j < b_nc; j++) { @@ -6247,11 +6247,11 @@ retval.change_capacity (sz); x_nz = sz; } - retval.xdata(ii) = tmp; - retval.xridx(ii++) = i; + retval.xdata (ii) = tmp; + retval.xridx (ii++) = i; } } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -6412,7 +6412,7 @@ { octave_idx_type jr = j * b.rows (); for (octave_idx_type i = 0; i < b.rows (); i++) - retval.xelem(i,j) = static_cast<Complex *>(X->x)[jr + i]; + retval.xelem (i,j) = static_cast<Complex *>(X->x)[jr + i]; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6657,12 +6657,12 @@ static_cast<octave_idx_type>(X->nzmax)); for (octave_idx_type j = 0; j <= static_cast<octave_idx_type>(X->ncol); j++) - retval.xcidx(j) = static_cast<octave_idx_type *>(X->p)[j]; + retval.xcidx (j) = static_cast<octave_idx_type *>(X->p)[j]; for (octave_idx_type j = 0; j < static_cast<octave_idx_type>(X->nzmax); j++) { - retval.xridx(j) = static_cast<octave_idx_type *>(X->i)[j]; - retval.xdata(j) = static_cast<Complex *>(X->x)[j]; + retval.xridx (j) = static_cast<octave_idx_type *>(X->i)[j]; + retval.xdata (j) = static_cast<Complex *>(X->x)[j]; } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6712,7 +6712,7 @@ OCTAVE_LOCAL_BUFFER (double, Xx, b_nr); OCTAVE_LOCAL_BUFFER (double, Xz, b_nr); - retval.xcidx(0) = 0; + retval.xcidx (0) = 0; for (octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type i = 0; i < b_nr; i++) @@ -6754,11 +6754,11 @@ retval.change_capacity (sz); x_nz = sz; } - retval.xdata(ii) = tmp; - retval.xridx(ii++) = i; + retval.xdata (ii) = tmp; + retval.xridx (ii++) = i; } } - retval.xcidx(j+1) = ii; + retval.xcidx (j+1) = ii; } retval.maybe_compress (); @@ -6970,7 +6970,7 @@ return ComplexMatrix (); } - if (singular_fallback && mattype.type(false) == MatrixType::Rectangular) + if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; #ifdef USE_QRSOLVE @@ -7038,7 +7038,7 @@ return SparseComplexMatrix (); } - if (singular_fallback && mattype.type(false) == MatrixType::Rectangular) + if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; #ifdef USE_QRSOLVE @@ -7451,12 +7451,12 @@ { for (octave_idx_type j = 0; j < nr; j++) { - if (jj < cidx(i+1) && ridx(jj) == j) + if (jj < cidx (i+1) && ridx (jj) == j) jj++; else { - r.data(ii) = true; - r.ridx(ii++) = j; + r.data (ii) = true; + r.ridx (ii++) = j; } } r.cidx (i+1) = ii; @@ -7500,7 +7500,7 @@ else { SPARSE_REDUCTION_OP (SparseMatrix, double, *=, - (cidx(j+1) - cidx(j) < nr ? 0.0 : 1.0), 1.0); + (cidx (j+1) - cidx (j) < nr ? 0.0 : 1.0), 1.0); } } @@ -7515,7 +7515,7 @@ { #define ROW_EXPR \ double d = data (i); \ - tmp[ridx(i)] += d * d + tmp[ridx (i)] += d * d #define COL_EXPR \ double d = data (i); \ @@ -7536,7 +7536,7 @@ SparseMatrix retval (*this); for (octave_idx_type i = 0; i < nz; i++) - retval.data(i) = fabs(retval.data(i)); + retval.data (i) = fabs (retval.data (i)); return retval; } @@ -7563,10 +7563,10 @@ for (octave_idx_type j = 0; j < nc; j++) { octave_quit (); - for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) + for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) { - os << a.ridx(i) + 1 << " " << j + 1 << " "; - octave_write_double (os, a.data(i)); + os << a.ridx (i) + 1 << " " << j + 1 << " "; + octave_write_double (os, a.data (i)); os << "\n"; } } @@ -7712,14 +7712,14 @@ { result = SparseMatrix (nr, nc, d); for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) { double tmp = xmin (d, m.data (i)); if (tmp != 0.) { - octave_idx_type idx = m.ridx(i) + j * nr; - result.xdata(idx) = tmp; - result.xridx(idx) = m.ridx(i); + octave_idx_type idx = m.ridx (i) + j * nr; + result.xdata (idx) = tmp; + result.xridx (idx) = m.ridx (i); } } } @@ -7727,27 +7727,27 @@ { octave_idx_type nel = 0; for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) if (xmin (d, m.data (i)) != 0.) nel++; result = SparseMatrix (nr, nc, nel); octave_idx_type ii = 0; - result.xcidx(0) = 0; + result.xcidx (0) = 0; for (octave_idx_type j = 0; j < nc; j++) { - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) { double tmp = xmin (d, m.data (i)); if (tmp != 0.) { - result.xdata(ii) = tmp; - result.xridx(ii++) = m.ridx(i); - } - } - result.xcidx(j+1) = ii; + result.xdata (ii) = tmp; + result.xridx (ii++) = m.ridx (i); + } + } + result.xcidx (j+1) = ii; } } @@ -7783,38 +7783,38 @@ r.cidx (0) = 0; for (octave_idx_type i = 0 ; i < a_nc ; i++) { - octave_idx_type ja = a.cidx(i); - octave_idx_type ja_max = a.cidx(i+1); + octave_idx_type ja = a.cidx (i); + octave_idx_type ja_max = a.cidx (i+1); bool ja_lt_max= ja < ja_max; - octave_idx_type jb = b.cidx(i); - octave_idx_type jb_max = b.cidx(i+1); + octave_idx_type jb = b.cidx (i); + octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; while (ja_lt_max || jb_lt_max ) { octave_quit (); if ((! jb_lt_max) || - (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) + (ja_lt_max && (a.ridx (ja) < b.ridx (jb)))) { - double tmp = xmin (a.data(ja), 0.); + double tmp = xmin (a.data (ja), 0.); if (tmp != 0.) { - r.ridx(jx) = a.ridx(ja); - r.data(jx) = tmp; + r.ridx (jx) = a.ridx (ja); + r.data (jx) = tmp; jx++; } ja++; ja_lt_max= ja < ja_max; } else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx(jb) < a.ridx(ja)) ) ) + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) { - double tmp = xmin (0., b.data(jb)); + double tmp = xmin (0., b.data (jb)); if (tmp != 0.) { - r.ridx(jx) = b.ridx(jb); - r.data(jx) = tmp; + r.ridx (jx) = b.ridx (jb); + r.data (jx) = tmp; jx++; } jb++; @@ -7822,11 +7822,11 @@ } else { - double tmp = xmin (a.data(ja), b.data(jb)); + double tmp = xmin (a.data (ja), b.data (jb)); if (tmp != 0.) { - r.data(jx) = tmp; - r.ridx(jx) = a.ridx(ja); + r.data (jx) = tmp; + r.ridx (jx) = a.ridx (ja); jx++; } ja++; @@ -7835,7 +7835,7 @@ jb_lt_max= jb < jb_max; } } - r.cidx(i+1) = jx; + r.cidx (i+1) = jx; } r.maybe_compress (); @@ -7862,15 +7862,15 @@ { result = SparseMatrix (nr, nc, d); for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) { double tmp = xmax (d, m.data (i)); if (tmp != 0.) { - octave_idx_type idx = m.ridx(i) + j * nr; - result.xdata(idx) = tmp; - result.xridx(idx) = m.ridx(i); + octave_idx_type idx = m.ridx (i) + j * nr; + result.xdata (idx) = tmp; + result.xridx (idx) = m.ridx (i); } } } @@ -7878,26 +7878,26 @@ { octave_idx_type nel = 0; for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) if (xmax (d, m.data (i)) != 0.) nel++; result = SparseMatrix (nr, nc, nel); octave_idx_type ii = 0; - result.xcidx(0) = 0; + result.xcidx (0) = 0; for (octave_idx_type j = 0; j < nc; j++) { - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) { double tmp = xmax (d, m.data (i)); if (tmp != 0.) { - result.xdata(ii) = tmp; - result.xridx(ii++) = m.ridx(i); - } - } - result.xcidx(j+1) = ii; + result.xdata (ii) = tmp; + result.xridx (ii++) = m.ridx (i); + } + } + result.xcidx (j+1) = ii; } } @@ -7933,38 +7933,38 @@ r.cidx (0) = 0; for (octave_idx_type i = 0 ; i < a_nc ; i++) { - octave_idx_type ja = a.cidx(i); - octave_idx_type ja_max = a.cidx(i+1); + octave_idx_type ja = a.cidx (i); + octave_idx_type ja_max = a.cidx (i+1); bool ja_lt_max= ja < ja_max; - octave_idx_type jb = b.cidx(i); - octave_idx_type jb_max = b.cidx(i+1); + octave_idx_type jb = b.cidx (i); + octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; while (ja_lt_max || jb_lt_max ) { octave_quit (); if ((! jb_lt_max) || - (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) + (ja_lt_max && (a.ridx (ja) < b.ridx (jb)))) { - double tmp = xmax (a.data(ja), 0.); + double tmp = xmax (a.data (ja), 0.); if (tmp != 0.) { - r.ridx(jx) = a.ridx(ja); - r.data(jx) = tmp; + r.ridx (jx) = a.ridx (ja); + r.data (jx) = tmp; jx++; } ja++; ja_lt_max= ja < ja_max; } else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx(jb) < a.ridx(ja)) ) ) + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) { - double tmp = xmax (0., b.data(jb)); + double tmp = xmax (0., b.data (jb)); if (tmp != 0.) { - r.ridx(jx) = b.ridx(jb); - r.data(jx) = tmp; + r.ridx (jx) = b.ridx (jb); + r.data (jx) = tmp; jx++; } jb++; @@ -7972,11 +7972,11 @@ } else { - double tmp = xmax (a.data(ja), b.data(jb)); + double tmp = xmax (a.data (ja), b.data (jb)); if (tmp != 0.) { - r.data(jx) = tmp; - r.ridx(jx) = a.ridx(ja); + r.data (jx) = tmp; + r.ridx (jx) = a.ridx (ja); jx++; } ja++; @@ -7985,7 +7985,7 @@ jb_lt_max= jb < jb_max; } } - r.cidx(i+1) = jx; + r.cidx (i+1) = jx; } r.maybe_compress ();
--- a/liboctave/data-conv.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/data-conv.cc Thu Jul 26 08:13:22 2012 -0700 @@ -496,7 +496,7 @@ while (0) // Have to use copy here to avoid writing over data accessed via -// Matrix::data(). +// Matrix::data (). #define LS_DO_WRITE(TYPE, data, size, len, stream) \ do \
--- a/liboctave/dbleQR.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/dbleQR.cc Thu Jul 26 08:13:22 2012 -0700 @@ -466,7 +466,7 @@ if (u.length () == m && v.length () == n) { - init(q*r + Matrix (u) * Matrix (v).transpose (), get_type ()); + init (q*r + Matrix (u) * Matrix (v).transpose (), get_type ()); } else (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch"); @@ -482,7 +482,7 @@ if (u.rows () == m && v.rows () == n && u.cols () == v.cols ()) { - init(q*r + u * v.transpose (), get_type ()); + init (q*r + u * v.transpose (), get_type ()); } else (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch");
--- a/liboctave/dbleSVD.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/dbleSVD.cc Thu Jul 26 08:13:22 2012 -0700 @@ -135,7 +135,7 @@ double *u = left_sm.fortran_vec (); sigma.resize (nrow_s, ncol_s); - double *s_vec = sigma.fortran_vec (); + double *s_vec = sigma.fortran_vec (); if (! (jobv == 'N' || jobv == 'O')) right_sm.resize (nrow_vt, n);
--- a/liboctave/dim-vector.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/dim-vector.cc Thu Jul 26 08:13:22 2012 -0700 @@ -157,16 +157,16 @@ } } else - new_dims.resize(k); + new_dims.resize (k); } return new_dims; } -// This is the rule for cat(). cat(dim, A, B) works if one +// This is the rule for cat(). cat (dim, A, B) works if one // of the following holds, in this order: // -// 1. size(A, k) == size(B, k) for all k != dim. +// 1. size (A, k) == size (B, k) for all k != dim. // In this case, size (C, dim) = size (A, dim) + size (B, dim) and // other sizes remain intact. // @@ -230,7 +230,7 @@ // horizontally (dim = 2) or vertically (dim = 1) if one of the // following holds, in this order: // -// 1. cat(dim, A, B) works +// 1. cat (dim, A, B) works // // 2. A, B are 2D and one of them is an empty vector, in which // case the result is the other one except if both of them
--- a/liboctave/eigs-base.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/eigs-base.cc Thu Jul 26 08:13:22 2012 -0700 @@ -241,8 +241,8 @@ for (octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type i = 0; i < n; i++) - retval.elem(static_cast<octave_idx_type>(qv[i]), j) = - tmp.elem(i,j); + retval.elem (static_cast<octave_idx_type>(qv[i]), j) = + tmp.elem (i,j); } } @@ -264,7 +264,7 @@ for (octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type i = 0; i < n; i++) - retval.elem(i,j) = m.elem(static_cast<octave_idx_type>(qv[i]), j); + retval.elem (i,j) = m.elem (static_cast<octave_idx_type>(qv[i]), j); } return U.solve (utyp, retval, err, rcond, 0); } @@ -278,8 +278,8 @@ y[j] = 0.; for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) - y[m.ridx(i)] += m.data(i) * x[j]; + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) + y[m.ridx (i)] += m.data (i) * x[j]; return true; } @@ -315,8 +315,8 @@ y[j] = 0.; for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) - y[m.ridx(i)] += m.data(i) * x[j]; + for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) + y[m.ridx (i)] += m.data (i) * x[j]; return true; } @@ -354,8 +354,8 @@ else { bt = fact.chol_matrix (); - b = bt.transpose (); - permB = ColumnVector(n); + b = bt.transpose (); + permB = ColumnVector (n); for (octave_idx_type i = 0; i < n; i++) permB(i) = i; return true; @@ -391,8 +391,8 @@ else { bt = fact.chol_matrix (); - b = bt.hermitian (); - permB = ColumnVector(n); + b = bt.hermitian (); + permB = ColumnVector (n); for (octave_idx_type i = 0; i < n; i++) permB(i) = i; return true; @@ -438,12 +438,12 @@ SparseMatrix tmp(n,n,n); for (octave_idx_type i = 0; i < n; i++) { - tmp.xcidx(i) = i; - tmp.xridx(i) = + tmp.xcidx (i) = i; + tmp.xridx (i) = static_cast<octave_idx_type>(permB(i)); - tmp.xdata(i) = 1; + tmp.xdata (i) = 1; } - tmp.xcidx(n) = n; + tmp.xcidx (n) = n; AminusSigmaB = AminusSigmaB - sigma * tmp * b.transpose () * b * tmp.transpose (); @@ -459,13 +459,13 @@ { SparseMatrix sigmat (n, n, n); - // Create sigma * speye(n,n) + // Create sigma * speye (n,n) sigmat.xcidx (0) = 0; for (octave_idx_type i = 0; i < n; i++) { - sigmat.xdata(i) = sigma; - sigmat.xridx(i) = i; - sigmat.xcidx(i+1) = i + 1; + sigmat.xdata (i) = sigma; + sigmat.xridx (i) = i; + sigmat.xcidx (i+1) = i + 1; } AminusSigmaB = AminusSigmaB - sigmat; @@ -490,9 +490,9 @@ for (octave_idx_type j = 0; j < n; j++) { double d = 0.; - if (U.xcidx(j+1) > U.xcidx(j) && - U.xridx (U.xcidx(j+1)-1) == j) - d = std::abs (U.xdata (U.xcidx(j+1)-1)); + if (U.xcidx (j+1) > U.xcidx (j) && + U.xridx (U.xcidx (j+1)-1) == j) + d = std::abs (U.xdata (U.xcidx (j+1)-1)); if (xisnan (minU) || d < minU) minU = d; @@ -541,8 +541,8 @@ j < b.cols (); j++) for (octave_idx_type i = 0; i < b.rows (); i++) - *p++ -= tmp.xelem (static_cast<octave_idx_type>(pB[i]), - static_cast<octave_idx_type>(pB[j])); + *p++ -= tmp.xelem (static_cast<octave_idx_type>(pB[i]), + static_cast<octave_idx_type>(pB[j])); } else AminusSigmaB = AminusSigmaB - tmp; @@ -570,7 +570,7 @@ double maxU = octave_NaN; for (octave_idx_type j = 0; j < n; j++) { - double d = std::abs (U.xelem(j,j)); + double d = std::abs (U.xelem (j,j)); if (xisnan (minU) || d < minU) minU = d; @@ -613,12 +613,12 @@ SparseMatrix tmp(n,n,n); for (octave_idx_type i = 0; i < n; i++) { - tmp.xcidx(i) = i; - tmp.xridx(i) = + tmp.xcidx (i) = i; + tmp.xridx (i) = static_cast<octave_idx_type>(permB(i)); - tmp.xdata(i) = 1; + tmp.xdata (i) = 1; } - tmp.xcidx(n) = n; + tmp.xcidx (n) = n; AminusSigmaB = AminusSigmaB - tmp * b.hermitian () * b * tmp.transpose () * sigma; @@ -633,13 +633,13 @@ { SparseComplexMatrix sigmat (n, n, n); - // Create sigma * speye(n,n) + // Create sigma * speye (n,n) sigmat.xcidx (0) = 0; for (octave_idx_type i = 0; i < n; i++) { - sigmat.xdata(i) = sigma; - sigmat.xridx(i) = i; - sigmat.xcidx(i+1) = i + 1; + sigmat.xdata (i) = sigma; + sigmat.xridx (i) = i; + sigmat.xcidx (i+1) = i + 1; } AminusSigmaB = AminusSigmaB - sigmat; @@ -664,9 +664,9 @@ for (octave_idx_type j = 0; j < n; j++) { double d = 0.; - if (U.xcidx(j+1) > U.xcidx(j) && - U.xridx (U.xcidx(j+1)-1) == j) - d = std::abs (U.xdata (U.xcidx(j+1)-1)); + if (U.xcidx (j+1) > U.xcidx (j) && + U.xridx (U.xcidx (j+1)-1) == j) + d = std::abs (U.xdata (U.xcidx (j+1)-1)); if (xisnan (minU) || d < minU) minU = d; @@ -715,8 +715,8 @@ j < b.cols (); j++) for (octave_idx_type i = 0; i < b.rows (); i++) - *p++ -= tmp.xelem (static_cast<octave_idx_type>(pB[i]), - static_cast<octave_idx_type>(pB[j])); + *p++ -= tmp.xelem (static_cast<octave_idx_type>(pB[i]), + static_cast<octave_idx_type>(pB[j])); } else AminusSigmaB = AminusSigmaB - tmp; @@ -744,7 +744,7 @@ double maxU = octave_NaN; for (octave_idx_type j = 0; j < n; j++) { - double d = std::abs (U.xelem(j,j)); + double d = std::abs (U.xelem (j,j)); if (xisnan (minU) || d < minU) minU = d; @@ -800,9 +800,9 @@ if (resid.is_empty ()) { std::string rand_dist = octave_rand::distribution (); - octave_rand::distribution("uniform"); - resid = ColumnVector (octave_rand::vector(n)); - octave_rand::distribution(rand_dist); + octave_rand::distribution ("uniform"); + resid = ColumnVector (octave_rand::vector (n)); + octave_rand::distribution (rand_dist); } if (n < 3) @@ -827,7 +827,7 @@ { (*current_liboctave_error_handler) ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1-1).\n" - " Use 'eig(full(A))' instead"); + " Use 'eig (full (A))' instead"); return -1; } @@ -891,14 +891,14 @@ b = b.transpose (); if (permB.length () == 0) { - permB = ColumnVector(n); + permB = ColumnVector (n); for (octave_idx_type i = 0; i < n; i++) permB(i) = i; } } else { - if (! make_cholb(b, bt, permB)) + if (! make_cholb (b, bt, permB)) { (*current_liboctave_error_handler) ("eigs: The matrix B is not positive definite"); @@ -951,7 +951,7 @@ return -1; } - if (disp > 0 && !xisnan(workl[iptr(5)-1])) + if (disp > 0 && !xisnan (workl[iptr (5)-1])) { if (iter++) { @@ -979,7 +979,7 @@ for (octave_idx_type i = 0; i < n; i++) mtmp(i,0) = workd[i + iptr(0) - 1]; - mtmp = utsolve(bt, permB, m * ltsolve(b, permB, mtmp)); + mtmp = utsolve (bt, permB, m * ltsolve (b, permB, mtmp)); for (octave_idx_type i = 0; i < n; i++) workd[i+iptr(1)-1] = mtmp(i,0); @@ -1073,7 +1073,7 @@ } if (note3) - eig_vec = ltsolve(b, permB, eig_vec); + eig_vec = ltsolve (b, permB, eig_vec); } } else @@ -1124,9 +1124,9 @@ if (resid.is_empty ()) { std::string rand_dist = octave_rand::distribution (); - octave_rand::distribution("uniform"); - resid = ColumnVector (octave_rand::vector(n)); - octave_rand::distribution(rand_dist); + octave_rand::distribution ("uniform"); + resid = ColumnVector (octave_rand::vector (n)); + octave_rand::distribution (rand_dist); } if (n < 3) @@ -1140,7 +1140,7 @@ { (*current_liboctave_error_handler) ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1-1).\n" - " Use 'eig(full(A))' instead"); + " Use 'eig (full (A))' instead"); return -1; } @@ -1218,7 +1218,7 @@ OCTAVE_LOCAL_BUFFER (octave_idx_type, P, (have_b ? b.rows () : m.rows ())); OCTAVE_LOCAL_BUFFER (octave_idx_type, Q, (have_b ? b.cols () : m.cols ())); - if (! LuAminusSigmaB(m, b, cholB, permB, sigma, L, U, P, Q)) + if (! LuAminusSigmaB (m, b, cholB, permB, sigma, L, U, P, Q)) return -1; octave_idx_type lwork = p * (p + 8); @@ -1244,7 +1244,7 @@ return -1; } - if (disp > 0 && !xisnan(workl[iptr(5)-1])) + if (disp > 0 && !xisnan (workl[iptr (5)-1])) { if (iter++) { @@ -1433,9 +1433,9 @@ if (resid.is_empty ()) { std::string rand_dist = octave_rand::distribution (); - octave_rand::distribution("uniform"); - resid = ColumnVector (octave_rand::vector(n)); - octave_rand::distribution(rand_dist); + octave_rand::distribution ("uniform"); + resid = ColumnVector (octave_rand::vector (n)); + octave_rand::distribution (rand_dist); } if (n < 3) @@ -1460,7 +1460,7 @@ { (*current_liboctave_error_handler) ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" - " Use 'eig(full(A))' instead"); + " Use 'eig (full (A))' instead"); return -1; } @@ -1545,7 +1545,7 @@ return -1; } - if (disp > 0 && !xisnan(workl[iptr(5)-1])) + if (disp > 0 && !xisnan (workl[iptr (5)-1])) { if (iter++) { @@ -1714,9 +1714,9 @@ if (resid.is_empty ()) { std::string rand_dist = octave_rand::distribution (); - octave_rand::distribution("uniform"); - resid = ColumnVector (octave_rand::vector(n)); - octave_rand::distribution(rand_dist); + octave_rand::distribution ("uniform"); + resid = ColumnVector (octave_rand::vector (n)); + octave_rand::distribution (rand_dist); } if (n < 3) @@ -1741,7 +1741,7 @@ { (*current_liboctave_error_handler) ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" - " Use 'eig(full(A))' instead"); + " Use 'eig (full (A))' instead"); return -1; } @@ -1805,14 +1805,14 @@ b = b.transpose (); if (permB.length () == 0) { - permB = ColumnVector(n); + permB = ColumnVector (n); for (octave_idx_type i = 0; i < n; i++) permB(i) = i; } } else { - if (! make_cholb(b, bt, permB)) + if (! make_cholb (b, bt, permB)) { (*current_liboctave_error_handler) ("eigs: The matrix B is not positive definite"); @@ -1893,7 +1893,7 @@ for (octave_idx_type i = 0; i < n; i++) mtmp(i,0) = workd[i + iptr(0) - 1]; - mtmp = utsolve(bt, permB, m * ltsolve(b, permB, mtmp)); + mtmp = utsolve (bt, permB, m * ltsolve (b, permB, mtmp)); for (octave_idx_type i = 0; i < n; i++) workd[i+iptr(1)-1] = mtmp(i,0); @@ -1982,7 +1982,7 @@ d[i] = d[k - i - 1]; d[k - i - 1] = dtmp; } - eig_val.resize(k); + eig_val.resize (k); if (rvec) { @@ -2012,11 +2012,11 @@ { octave_idx_type off1 = i * n; octave_idx_type off2 = (i+1) * n; - if (std::imag(eig_val(i)) == 0) + if (std::imag (eig_val(i)) == 0) { for (octave_idx_type j = 0; j < n; j++) eig_vec(j,i) = - Complex(z[j+off1],0.); + Complex (z[j+off1],0.); i++; } else @@ -2024,17 +2024,17 @@ for (octave_idx_type j = 0; j < n; j++) { eig_vec(j,i) = - Complex(z[j+off1],z[j+off2]); + Complex (z[j+off1],z[j+off2]); if (i < k - 1) eig_vec(j,i+1) = - Complex(z[j+off1],-z[j+off2]); + Complex (z[j+off1],-z[j+off2]); } i+=2; } } if (note3) - eig_vec = ltsolve(M (b), permB, eig_vec); + eig_vec = ltsolve (M(b), permB, eig_vec); } } else @@ -2087,9 +2087,9 @@ if (resid.is_empty ()) { std::string rand_dist = octave_rand::distribution (); - octave_rand::distribution("uniform"); - resid = ColumnVector (octave_rand::vector(n)); - octave_rand::distribution(rand_dist); + octave_rand::distribution ("uniform"); + resid = ColumnVector (octave_rand::vector (n)); + octave_rand::distribution (rand_dist); } if (n < 3) @@ -2114,7 +2114,7 @@ { (*current_liboctave_error_handler) ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" - " Use 'eig(full(A))' instead"); + " Use 'eig (full (A))' instead"); return -1; } @@ -2181,7 +2181,7 @@ OCTAVE_LOCAL_BUFFER (octave_idx_type, P, (have_b ? b.rows () : m.rows ())); OCTAVE_LOCAL_BUFFER (octave_idx_type, Q, (have_b ? b.cols () : m.cols ())); - if (! LuAminusSigmaB(m, b, cholB, permB, sigmar, L, U, P, Q)) + if (! LuAminusSigmaB (m, b, cholB, permB, sigmar, L, U, P, Q)) return -1; octave_idx_type lwork = 3 * p * (p + 2); @@ -2207,7 +2207,7 @@ return -1; } - if (disp > 0 && !xisnan(workl[iptr(5)-1])) + if (disp > 0 && !xisnan (workl[iptr (5)-1])) { if (iter++) { @@ -2368,7 +2368,7 @@ d[i] = d[k - i - 1]; d[k - i - 1] = dtmp; } - eig_val.resize(k); + eig_val.resize (k); if (rvec) { @@ -2398,11 +2398,11 @@ { octave_idx_type off1 = i * n; octave_idx_type off2 = (i+1) * n; - if (std::imag(eig_val(i)) == 0) + if (std::imag (eig_val(i)) == 0) { for (octave_idx_type j = 0; j < n; j++) eig_vec(j,i) = - Complex(z[j+off1],0.); + Complex (z[j+off1],0.); i++; } else @@ -2410,10 +2410,10 @@ for (octave_idx_type j = 0; j < n; j++) { eig_vec(j,i) = - Complex(z[j+off1],z[j+off2]); + Complex (z[j+off1],z[j+off2]); if (i < k - 1) eig_vec(j,i+1) = - Complex(z[j+off1],-z[j+off2]); + Complex (z[j+off1],-z[j+off2]); } i+=2; } @@ -2450,9 +2450,9 @@ if (resid.is_empty ()) { std::string rand_dist = octave_rand::distribution (); - octave_rand::distribution("uniform"); - resid = ColumnVector (octave_rand::vector(n)); - octave_rand::distribution(rand_dist); + octave_rand::distribution ("uniform"); + resid = ColumnVector (octave_rand::vector (n)); + octave_rand::distribution (rand_dist); } if (n < 3) @@ -2477,7 +2477,7 @@ { (*current_liboctave_error_handler) ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" - " Use 'eig(full(A))' instead"); + " Use 'eig (full (A))' instead"); return -1; } @@ -2680,7 +2680,7 @@ d[i] = d[k - i - 1]; d[k - i - 1] = dtmp; } - eig_val.resize(k); + eig_val.resize (k); if (rvec) { @@ -2710,11 +2710,11 @@ { octave_idx_type off1 = i * n; octave_idx_type off2 = (i+1) * n; - if (std::imag(eig_val(i)) == 0) + if (std::imag (eig_val(i)) == 0) { for (octave_idx_type j = 0; j < n; j++) eig_vec(j,i) = - Complex(z[j+off1],0.); + Complex (z[j+off1],0.); i++; } else @@ -2722,10 +2722,10 @@ for (octave_idx_type j = 0; j < n; j++) { eig_vec(j,i) = - Complex(z[j+off1],z[j+off2]); + Complex (z[j+off1],z[j+off2]); if (i < k - 1) eig_vec(j,i+1) = - Complex(z[j+off1],-z[j+off2]); + Complex (z[j+off1],-z[j+off2]); } i+=2; } @@ -2778,13 +2778,13 @@ if (cresid.is_empty ()) { std::string rand_dist = octave_rand::distribution (); - octave_rand::distribution("uniform"); - Array<double> rr (octave_rand::vector(n)); - Array<double> ri (octave_rand::vector(n)); + octave_rand::distribution ("uniform"); + Array<double> rr (octave_rand::vector (n)); + Array<double> ri (octave_rand::vector (n)); cresid = ComplexColumnVector (n); for (octave_idx_type i = 0; i < n; i++) - cresid(i) = Complex(rr(i),ri(i)); - octave_rand::distribution(rand_dist); + cresid(i) = Complex (rr(i),ri(i)); + octave_rand::distribution (rand_dist); } if (n < 3) @@ -2809,7 +2809,7 @@ { (*current_liboctave_error_handler) ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" - " Use 'eig(full(A))' instead"); + " Use 'eig (full (A))' instead"); return -1; } @@ -2873,14 +2873,14 @@ b = b.hermitian (); if (permB.length () == 0) { - permB = ColumnVector(n); + permB = ColumnVector (n); for (octave_idx_type i = 0; i < n; i++) permB(i) = i; } } else { - if (! make_cholb(b, bt, permB)) + if (! make_cholb (b, bt, permB)) { (*current_liboctave_error_handler) ("eigs: The matrix B is not positive definite"); @@ -2934,7 +2934,7 @@ return -1; } - if (disp > 0 && !xisnan(workl[iptr(5)-1])) + if (disp > 0 && !xisnan (workl[iptr (5)-1])) { if (iter++) { @@ -2961,7 +2961,7 @@ ComplexMatrix mtmp (n,1); for (octave_idx_type i = 0; i < n; i++) mtmp(i,0) = workd[i + iptr(0) - 1]; - mtmp = utsolve(bt, permB, m * ltsolve(b, permB, mtmp)); + mtmp = utsolve (bt, permB, m * ltsolve (b, permB, mtmp)); for (octave_idx_type i = 0; i < n; i++) workd[i+iptr(1)-1] = mtmp(i,0); @@ -3026,7 +3026,7 @@ d[i] = d[k - i - 1]; d[k - i - 1] = ctmp; } - eig_val.resize(k); + eig_val.resize (k); if (rvec) { @@ -3051,7 +3051,7 @@ } if (note3) - eig_vec = ltsolve(b, permB, eig_vec); + eig_vec = ltsolve (b, permB, eig_vec); } } else @@ -3103,13 +3103,13 @@ if (cresid.is_empty ()) { std::string rand_dist = octave_rand::distribution (); - octave_rand::distribution("uniform"); - Array<double> rr (octave_rand::vector(n)); - Array<double> ri (octave_rand::vector(n)); + octave_rand::distribution ("uniform"); + Array<double> rr (octave_rand::vector (n)); + Array<double> ri (octave_rand::vector (n)); cresid = ComplexColumnVector (n); for (octave_idx_type i = 0; i < n; i++) - cresid(i) = Complex(rr(i),ri(i)); - octave_rand::distribution(rand_dist); + cresid(i) = Complex (rr(i),ri(i)); + octave_rand::distribution (rand_dist); } if (n < 3) @@ -3134,7 +3134,7 @@ { (*current_liboctave_error_handler) ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" - " Use 'eig(full(A))' instead"); + " Use 'eig (full (A))' instead"); return -1; } @@ -3201,7 +3201,7 @@ OCTAVE_LOCAL_BUFFER (octave_idx_type, P, (have_b ? b.rows () : m.rows ())); OCTAVE_LOCAL_BUFFER (octave_idx_type, Q, (have_b ? b.cols () : m.cols ())); - if (! LuAminusSigmaB(m, b, cholB, permB, sigma, L, U, P, Q)) + if (! LuAminusSigmaB (m, b, cholB, permB, sigma, L, U, P, Q)) return -1; octave_idx_type lwork = p * (3 * p + 5); @@ -3366,7 +3366,7 @@ d[i] = d[k - i - 1]; d[k - i - 1] = ctmp; } - eig_val.resize(k); + eig_val.resize (k); if (rvec) { @@ -3412,7 +3412,7 @@ int disp, int maxit) { std::string typ (_typ); - bool have_sigma = (std::abs(sigma) ? true : false); + bool have_sigma = (std::abs (sigma) ? true : false); char bmat = 'I'; octave_idx_type mode = 1; int err = 0; @@ -3420,13 +3420,13 @@ if (cresid.is_empty ()) { std::string rand_dist = octave_rand::distribution (); - octave_rand::distribution("uniform"); - Array<double> rr (octave_rand::vector(n)); - Array<double> ri (octave_rand::vector(n)); + octave_rand::distribution ("uniform"); + Array<double> rr (octave_rand::vector (n)); + Array<double> ri (octave_rand::vector (n)); cresid = ComplexColumnVector (n); for (octave_idx_type i = 0; i < n; i++) - cresid(i) = Complex(rr(i),ri(i)); - octave_rand::distribution(rand_dist); + cresid(i) = Complex (rr(i),ri(i)); + octave_rand::distribution (rand_dist); } if (n < 3) @@ -3451,7 +3451,7 @@ { (*current_liboctave_error_handler) ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" - " Use 'eig(full(A))' instead"); + " Use 'eig (full (A))' instead"); return -1; } @@ -3630,7 +3630,7 @@ d[i] = d[k - i - 1]; d[k - i - 1] = ctmp; } - eig_val.resize(k); + eig_val.resize (k); if (rvec) {
--- a/liboctave/f2c-main.c Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/f2c-main.c Thu Jul 26 08:13:22 2012 -0700 @@ -31,5 +31,5 @@ # ifdef __cplusplus extern "C" # endif -int F77_DUMMY_MAIN () { assert(0); return 1; } +int F77_DUMMY_MAIN () { assert (0); return 1; } #endif
--- a/liboctave/fCMatrix.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/fCMatrix.cc Thu Jul 26 08:13:22 2012 -0700 @@ -1081,7 +1081,7 @@ F77_XFCN (cgetri, CGETRI, (nc, tmp_data, nr, pipvt, z.fortran_vec (), lwork, info)); - lwork = static_cast<octave_idx_type> (std::real(z(0))); + lwork = static_cast<octave_idx_type> (std::real (z(0))); lwork = (lwork < 2 *nc ? 2*nc : lwork); z.resize (dim_vector (lwork, 1)); FloatComplex *pz = z.fortran_vec (); @@ -1091,7 +1091,7 @@ // Calculate the norm of the matrix, for later use. float anorm; if (calc_cond) - anorm = retval.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + anorm = retval.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); F77_XFCN (cgetrf, CGETRF, (nc, nc, tmp_data, nr, pipvt, info)); @@ -1165,7 +1165,7 @@ } if (!mattype.is_hermitian ()) - ret = finverse(mattype, info, rcon, force, calc_cond); + ret = finverse (mattype, info, rcon, force, calc_cond); if ((mattype.is_hermitian () || calc_cond) && rcon == 0.) ret = FloatComplexMatrix (rows (), columns (), FloatComplex (octave_Float_Inf, 0.)); @@ -1828,7 +1828,7 @@ Array<octave_idx_type> ipvt (dim_vector (nr, 1)); octave_idx_type *pipvt = ipvt.fortran_vec (); - if(anorm < 0.) + if (anorm < 0.) anorm = atmp.abs ().sum (). row(static_cast<octave_idx_type>(0)).max (); @@ -2096,7 +2096,7 @@ char job = 'L'; FloatComplexMatrix atmp = *this; FloatComplex *tmp_data = atmp.fortran_vec (); - anorm = atmp.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + anorm = atmp.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); F77_XFCN (cpotrf, CPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, tmp_data, nr, info @@ -2180,7 +2180,7 @@ // Calculate the norm of the matrix, for later use. if (anorm < 0.) - anorm = atmp.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + anorm = atmp.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); F77_XFCN (cgetrf, CGETRF, (nr, nr, tmp_data, nr, pipvt, info)); @@ -2406,7 +2406,7 @@ FloatComplexMatrix tmp (b); tmp = solve (typ, tmp, info, rcon, sing_handler, true, transt); - return tmp.column(static_cast<octave_idx_type> (0)); + return tmp.column (static_cast<octave_idx_type> (0)); } FloatComplexMatrix
--- a/liboctave/fCNDArray.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/fCNDArray.cc Thu Jul 26 08:13:22 2012 -0700 @@ -237,7 +237,7 @@ octave_quit (); for (octave_idx_type i = 0; i < npts; i++) - tmp[i] = elem((i + k*npts)*stride + j*dist); + tmp[i] = elem ((i + k*npts)*stride + j*dist); F77_FUNC (cfftf, CFFTF) (npts, tmp, pwsave); @@ -284,7 +284,7 @@ octave_quit (); for (octave_idx_type i = 0; i < npts; i++) - tmp[i] = elem((i + k*npts)*stride + j*dist); + tmp[i] = elem ((i + k*npts)*stride + j*dist); F77_FUNC (cfftb, CFFTB) (npts, tmp, pwsave);
--- a/liboctave/fCmplxQR.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/fCmplxQR.cc Thu Jul 26 08:13:22 2012 -0700 @@ -471,7 +471,7 @@ if (u.length () == m && v.length () == n) { - init(q*r + FloatComplexMatrix (u) * FloatComplexMatrix (v).hermitian (), get_type ()); + init (q*r + FloatComplexMatrix (u) * FloatComplexMatrix (v).hermitian (), get_type ()); } else (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch"); @@ -487,7 +487,7 @@ if (u.rows () == m && v.rows () == n && u.cols () == v.cols ()) { - init(q*r + u * v.hermitian (), get_type ()); + init (q*r + u * v.hermitian (), get_type ()); } else (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch");
--- a/liboctave/fEIG.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/fEIG.cc Thu Jul 26 08:13:22 2012 -0700 @@ -226,8 +226,8 @@ return -1; } - lambda.elem(j) = FloatComplex (wr.elem(j), wi.elem(j)); - lambda.elem(j+1) = FloatComplex (wr.elem(j+1), wi.elem(j+1)); + lambda.elem (j) = FloatComplex (wr.elem (j), wi.elem (j)); + lambda.elem (j+1) = FloatComplex (wr.elem (j+1), wi.elem (j+1)); for (octave_idx_type i = 0; i < nvr; i++) { @@ -576,10 +576,10 @@ return -1; } - lambda.elem(j) = FloatComplex (ar.elem(j) / beta.elem (j), - ai.elem(j) / beta.elem (j)); - lambda.elem(j+1) = FloatComplex (ar.elem(j+1) / beta.elem (j+1), - ai.elem(j+1) / beta.elem (j+1)); + lambda.elem (j) = FloatComplex (ar.elem (j) / beta.elem (j), + ai.elem (j) / beta.elem (j)); + lambda.elem (j+1) = FloatComplex (ar.elem (j+1) / beta.elem (j+1), + ai.elem (j+1) / beta.elem (j+1)); for (octave_idx_type i = 0; i < nvr; i++) { @@ -775,7 +775,7 @@ lambda.resize (n); for (octave_idx_type j = 0; j < n; j++) - lambda.elem (j) = alpha.elem (j) / beta.elem(j); + lambda.elem (j) = alpha.elem (j) / beta.elem (j); v = vtmp; }
--- a/liboctave/fMatrix.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/fMatrix.cc Thu Jul 26 08:13:22 2012 -0700 @@ -763,7 +763,7 @@ // Calculate the norm of the matrix, for later use. float anorm = 0; if (calc_cond) - anorm = retval.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + anorm = retval.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); F77_XFCN (sgetrf, SGETRF, (nc, nc, tmp_data, nr, pipvt, info)); @@ -838,7 +838,7 @@ } if (!mattype.is_hermitian ()) - ret = finverse(mattype, info, rcon, force, calc_cond); + ret = finverse (mattype, info, rcon, force, calc_cond); if ((mattype.is_hermitian () || calc_cond) && rcon == 0.) ret = FloatMatrix (rows (), columns (), octave_Float_Inf); @@ -1462,7 +1462,7 @@ octave_idx_type info = 0; char job = 'L'; anorm = atmp.abs ().sum (). - row(static_cast<octave_idx_type>(0)).max (); + row (static_cast<octave_idx_type>(0)).max (); F77_XFCN (spotrf, SPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, tmp_data, nr, info @@ -1498,7 +1498,7 @@ Array<octave_idx_type> ipvt (dim_vector (nr, 1)); octave_idx_type *pipvt = ipvt.fortran_vec (); - if(anorm < 0.) + if (anorm < 0.) anorm = atmp.abs ().sum (). row(static_cast<octave_idx_type>(0)).max (); @@ -1762,7 +1762,7 @@ char job = 'L'; FloatMatrix atmp = *this; float *tmp_data = atmp.fortran_vec (); - anorm = atmp.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + anorm = atmp.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); F77_XFCN (spotrf, SPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, tmp_data, nr, info @@ -1838,8 +1838,8 @@ FloatMatrix atmp = *this; float *tmp_data = atmp.fortran_vec (); - if(anorm < 0.) - anorm = atmp.abs ().sum ().row(static_cast<octave_idx_type>(0)).max (); + if (anorm < 0.) + anorm = atmp.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); Array<float> z (dim_vector (4 * nc, 1)); float *pz = z.fortran_vec (); @@ -2062,7 +2062,7 @@ { FloatMatrix tmp (b); tmp = solve (typ, tmp, info, rcon, sing_handler, true, transt); - return tmp.column(static_cast<octave_idx_type> (0)); + return tmp.column (static_cast<octave_idx_type> (0)); } FloatComplexColumnVector @@ -2094,7 +2094,7 @@ solve_singularity_handler sing_handler, blas_trans_type transt) const { FloatComplexMatrix tmp (*this); - return tmp.solve(typ, b, info, rcon, sing_handler, transt); + return tmp.solve (typ, b, info, rcon, sing_handler, transt); } FloatMatrix
--- a/liboctave/fNDArray.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/fNDArray.cc Thu Jul 26 08:13:22 2012 -0700 @@ -241,7 +241,7 @@ octave_quit (); for (octave_idx_type i = 0; i < npts; i++) - tmp[i] = elem((i + k*npts)*stride + j*dist); + tmp[i] = elem ((i + k*npts)*stride + j*dist); F77_FUNC (cfftf, CFFTF) (npts, tmp, pwsave); @@ -288,7 +288,7 @@ octave_quit (); for (octave_idx_type i = 0; i < npts; i++) - tmp[i] = elem((i + k*npts)*stride + j*dist); + tmp[i] = elem ((i + k*npts)*stride + j*dist); F77_FUNC (cfftb, CFFTB) (npts, tmp, pwsave);
--- a/liboctave/floatQR.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/floatQR.cc Thu Jul 26 08:13:22 2012 -0700 @@ -464,7 +464,7 @@ if (u.length () == m && v.length () == n) { - init(q*r + FloatMatrix (u) * FloatMatrix (v).transpose (), get_type ()); + init (q*r + FloatMatrix (u) * FloatMatrix (v).transpose (), get_type ()); } else (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch"); @@ -480,7 +480,7 @@ if (u.rows () == m && v.rows () == n && u.cols () == v.cols ()) { - init(q*r + u * v.transpose (), get_type ()); + init (q*r + u * v.transpose (), get_type ()); } else (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch");
--- a/liboctave/floatSVD.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/floatSVD.cc Thu Jul 26 08:13:22 2012 -0700 @@ -135,7 +135,7 @@ float *u = left_sm.fortran_vec (); sigma.resize (nrow_s, ncol_s); - float *s_vec = sigma.fortran_vec (); + float *s_vec = sigma.fortran_vec (); if (! (jobv == 'N' || jobv == 'O')) right_sm.resize (nrow_vt, n);
--- a/liboctave/idx-vector.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/idx-vector.cc Thu Jul 26 08:13:22 2012 -0700 @@ -108,7 +108,7 @@ idx_vector::idx_range_rep::idx_range_rep (octave_idx_type _start, octave_idx_type _limit, octave_idx_type _step) - : start(_start), len (_step ? std::max((_limit - _start) / _step, static_cast<octave_idx_type> (0)) : -1), step (_step) + : start(_start), len (_step ? std::max ((_limit - _start) / _step, static_cast<octave_idx_type> (0)) : -1), step (_step) { if (len < 0) { @@ -385,7 +385,7 @@ { if (len != 0) { - octave_idx_type *d = new octave_idx_type [1]; + octave_idx_type *d = new octave_idx_type[1]; d[0] = 0; data = d; ext = 1; @@ -407,7 +407,7 @@ if (len != 0) { - octave_idx_type *d = new octave_idx_type [len]; + octave_idx_type *d = new octave_idx_type[len]; octave_idx_type ntot = bnda.length (); @@ -435,7 +435,7 @@ if (len != 0) { - octave_idx_type *d = new octave_idx_type [len]; + octave_idx_type *d = new octave_idx_type[len]; octave_idx_type nnz = bnda.nnz (); @@ -566,7 +566,7 @@ for (octave_idx_type i = 0; i < len; i++) idx_data[i] = i; - octave_idx_type *new_data = new octave_idx_type [len]; + octave_idx_type *new_data = new octave_idx_type[len]; new_rep->data = new_data; std::copy (data, data + len, new_data); @@ -585,7 +585,7 @@ idx.clear (orig_dims); octave_idx_type *idx_data = idx.fortran_vec (); - octave_idx_type *new_data = new octave_idx_type [len]; + octave_idx_type *new_data = new octave_idx_type[len]; new_rep->data = new_data; for (octave_idx_type i = 0, k = 0; i < ext; i++) @@ -654,7 +654,7 @@ { if (len != 0) { - bool *d = new bool [1]; + bool *d = new bool[1]; d[0] = true; data = d; ext = 1; @@ -1145,7 +1145,7 @@ if (is_colon_equiv (n)) retval = true; - else if (length (n) == n && extent(n) == n) + else if (length(n) == n && extent(n) == n) { OCTAVE_LOCAL_BUFFER_INIT (bool, left, n, true); @@ -1190,7 +1190,7 @@ const octave_idx_type *ri = r->get_data (); Array<octave_idx_type> idx (orig_dimensions ()); for (octave_idx_type i = 0; i < n; i++) - idx.xelem(ri[i]) = i; + idx.xelem (ri[i]) = i; retval = new idx_vector_rep (idx, r->extent (0), DIRECT); break; } @@ -1210,7 +1210,7 @@ idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); const bool *data = r->get_data (); octave_idx_type ext = r->extent (0), len = r->length (0); - octave_idx_type *idata = new octave_idx_type [len]; + octave_idx_type *idata = new octave_idx_type[len]; for (octave_idx_type i = 0, j = 0; i < ext; i++) if (data[i]) @@ -1330,7 +1330,7 @@ /* -%!error id=Octave:index-out-of-bounds 1(find([1,1] != 0)) -%!assert ((1:3)(find([1,0,1] != 0)), [1,3]) +%!error id=Octave:index-out-of-bounds 1(find ([1,1] != 0)) +%!assert ((1:3)(find ([1,0,1] != 0)), [1,3]) */
--- a/liboctave/kpse.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/kpse.cc Thu Jul 26 08:13:22 2012 -0700 @@ -35,7 +35,7 @@ myself; if you do, I'd be grateful for any changes. --kb@mail.tug.org */ /* If we have either DOS or OS2, we are DOSISH. */ -#if defined (DOS) || defined (OS2) || defined (WIN32) || defined(__MSDOS__) +#if defined (DOS) || defined (OS2) || defined (WIN32) || defined (__MSDOS__) #define DOSISH #endif @@ -44,11 +44,11 @@ #endif extern "C" { -#if defined(__MINGW32__) +#if defined (__MINGW32__) #include <windows.h> #include <fcntl.h> #include <dirent.h> -#elif defined(WIN32) +#elif defined (WIN32) #ifndef _MSC_VER #define __STDC__ 1 #include "win32lib.h" @@ -76,7 +76,7 @@ /* If you want to find subdirectories in a directory with non-Unix semantics (specifically, if a directory with no subdirectories does not have exactly two links), define this. */ -#if defined(__DJGPP__) || ! defined (DOSISH) +#if defined (__DJGPP__) || ! defined (DOSISH) /* Surprise! DJGPP returns st_nlink exactly like on Unix. */ #define ST_NLINK_TRICK #endif /* either not DOSISH or __DJGPP__ */ @@ -99,7 +99,7 @@ #define DIR_SEP '/' #define DIR_SEP_STRING "/" #define IS_DEVICE_SEP(ch) ((ch) == ':') -#define NAME_BEGINS_WITH_DEVICE(name) ((name.length()>0) && IS_DEVICE_SEP((name)[1])) +#define NAME_BEGINS_WITH_DEVICE(name) ((name.length ()>0) && IS_DEVICE_SEP((name)[1])) /* On DOS, it's good to allow both \ and / between directories. */ #define IS_DIR_SEP(ch) ((ch) == '/' || (ch) == '\\') #else
--- a/liboctave/lo-specfun.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/lo-specfun.cc Thu Jul 26 08:13:22 2012 -0700 @@ -454,7 +454,7 @@ #endif Complex -expm1(const Complex& x) +expm1 (const Complex& x) { Complex retval; @@ -509,7 +509,7 @@ #endif FloatComplex -expm1(const FloatComplex& x) +expm1 (const FloatComplex& x) { FloatComplex retval; @@ -565,7 +565,7 @@ atan2 (1 + r, i)); } else - retval = std::log (Complex(1) + x); + retval = std::log (Complex (1) + x); return retval; } @@ -624,7 +624,7 @@ atan2 (1 + r, i)); } else - retval = std::log (FloatComplex(1) + x); + retval = std::log (FloatComplex (1) + x); return retval; } @@ -873,7 +873,7 @@ if (kode == 2) { // Compensate for different scaling factor of besk. - tmp2 *= exp(-z - std::abs(z.real ())); + tmp2 *= exp (-z - std::abs (z.real ())); } tmp += tmp2; @@ -1483,7 +1483,7 @@ if (kode == 2) { // Compensate for different scaling factor of besk. - tmp2 *= exp(-z - std::abs(z.real ())); + tmp2 *= exp (-z - std::abs (z.real ())); } tmp += tmp2; @@ -1893,7 +1893,7 @@ if (! scaled) { - Complex expz = exp (- 2.0 / 3.0 * z * sqrt(z)); + Complex expz = exp (- 2.0 / 3.0 * z * sqrt (z)); double rexpz = real (expz); double iexpz = imag (expz); @@ -2023,7 +2023,7 @@ if (! scaled) { - FloatComplex expz = exp (- static_cast<float> (2.0 / 3.0) * z * sqrt(z)); + FloatComplex expz = exp (- static_cast<float> (2.0 / 3.0) * z * sqrt (z)); float rexpz = real (expz); float iexpz = imag (expz); @@ -3130,7 +3130,7 @@ if (x < 0) { double y2 = ceil (x / 16.0) * 16.0, del = (x-y2)*(x+y2); - result = 2*(std::exp(y2*y2) * std::exp(del)) - result; + result = 2*(std::exp (y2*y2) * std::exp (del)) - result; } }
--- a/liboctave/mx-inlines.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/mx-inlines.cc Thu Jul 26 08:13:22 2012 -0700 @@ -483,12 +483,12 @@ #define OP_RED_SUMSQ(ac, el) ac += el*el #define OP_RED_SUMSQC(ac, el) ac += cabsq (el) -inline void op_dble_sum(double& ac, float el) +inline void op_dble_sum (double& ac, float el) { ac += el; } -inline void op_dble_sum(Complex& ac, const FloatComplex& el) +inline void op_dble_sum (Complex& ac, const FloatComplex& el) { ac += el; } // FIXME: guaranteed? template <class T> -inline void op_dble_sum(double& ac, const octave_int<T>& el) +inline void op_dble_sum (double& ac, const octave_int<T>& el) { ac += el.double_value (); } // The following two implement a simple short-circuiting. @@ -1177,7 +1177,7 @@ { octave_idx_type l, n, u; dim_vector dims = src.dims (); - // M*b inconsistency: sum([]) = 0 etc. + // M*b inconsistency: sum ([]) = 0 etc. if (dims.length () == 2 && dims(0) == 0 && dims(1) == 0) dims (1) = 1;
--- a/liboctave/mx-op-defs.h Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/mx-op-defs.h Thu Jul 26 08:13:22 2012 -0700 @@ -413,7 +413,7 @@ octave_idx_type len = dm.length (); \ \ for (octave_idx_type i = 0; i < len; i++) \ - r.elem(i, i) OPEQ dm.elem(i, i); \ + r.elem (i, i) OPEQ dm.elem (i, i); \ } \ } \ \ @@ -483,7 +483,7 @@ octave_idx_type len = dm.length (); \ \ for (octave_idx_type i = 0; i < len; i++) \ - r.elem(i, i) OPEQ dm.elem(i, i); \ + r.elem (i, i) OPEQ dm.elem (i, i); \ } \ else \ r.resize (m_nr, m_nc); \
--- a/liboctave/oct-alloc.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/oct-alloc.cc Thu Jul 26 08:13:22 2012 -0700 @@ -32,7 +32,7 @@ octave_allocator::alloc (size_t size) { if (size != item_size) - return ::new char [size]; + return ::new char[size]; if (! head) {
--- a/liboctave/oct-binmap.h Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/oct-binmap.h Thu Jul 26 08:13:22 2012 -0700 @@ -30,7 +30,7 @@ #include "bsxfun.h" // This source file implements a general binary maping function for -// arrays. The syntax is binmap<type> (a, b, f, [name]). type denotes +// arrays. The syntax is binmap<type> (a, b, f,[name]). type denotes // the expected return type of the operation. a, b, should be one of // the 6 combinations: // @@ -223,7 +223,7 @@ for (octave_idx_type i = 0; i < nz; i++) { octave_quit (); - retval.xdata(i) = fcn (x, ys.data(i)); + retval.xdata (i) = fcn (x, ys.data (i)); } octave_quit (); @@ -241,7 +241,7 @@ for (octave_idx_type i = 0; i < nz; i++) { octave_quit (); - retval.xdata(i) = fcn (xs.data(i), y); + retval.xdata (i) = fcn (xs.data (i), y); } octave_quit (); @@ -276,49 +276,49 @@ for (octave_idx_type j = 0; j < nc; j++) { octave_quit (); - octave_idx_type ix = xs.cidx(j), iy = ys.cidx(j); - octave_idx_type ux = xs.cidx(j+1), uy = ys.cidx(j+1); + octave_idx_type ix = xs.cidx (j), iy = ys.cidx (j); + octave_idx_type ux = xs.cidx (j+1), uy = ys.cidx (j+1); while (ix != ux || iy != uy) { - octave_idx_type rx = xs.ridx(ix), ry = ys.ridx(ix); + octave_idx_type rx = xs.ridx (ix), ry = ys.ridx (ix); ix += rx <= ry; iy += ry <= rx; nz++; } - retval.xcidx(j+1) = nz; + retval.xcidx (j+1) = nz; } // Allocate space. - retval.change_capacity (retval.xcidx(nc)); + retval.change_capacity (retval.xcidx (nc)); // Fill. nz = 0; for (octave_idx_type j = 0; j < nc; j++) { octave_quit (); - octave_idx_type ix = xs.cidx(j), iy = ys.cidx(j); - octave_idx_type ux = xs.cidx(j+1), uy = ys.cidx(j+1); + octave_idx_type ix = xs.cidx (j), iy = ys.cidx (j); + octave_idx_type ux = xs.cidx (j+1), uy = ys.cidx (j+1); while (ix != ux || iy != uy) { - octave_idx_type rx = xs.ridx(ix), ry = ys.ridx(ix); + octave_idx_type rx = xs.ridx (ix), ry = ys.ridx (ix); if (rx == ry) { - retval.xridx(nz) = rx; - retval.xdata(nz) = fcn (xs.data(ix), ys.data(iy)); + retval.xridx (nz) = rx; + retval.xdata (nz) = fcn (xs.data (ix), ys.data (iy)); ix++; iy++; } else if (rx < ry) { - retval.xridx(nz) = rx; - retval.xdata(nz) = fcn (xs.data(ix), yzero); + retval.xridx (nz) = rx; + retval.xdata (nz) = fcn (xs.data (ix), yzero); ix++; } else if (ry < rx) { - retval.xridx(nz) = ry; - retval.xdata(nz) = fcn (xzero, ys.data(iy)); + retval.xridx (nz) = ry; + retval.xdata (nz) = fcn (xzero, ys.data (iy)); iy++; }
--- a/liboctave/oct-fftw.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/oct-fftw.cc Thu Jul 26 08:13:22 2012 -0700 @@ -723,7 +723,7 @@ for (size_t i = 0; i < nr; i++) for (size_t j = nc/2+1; j < nc; j++) - out[j*stride + i*dist] = conj(out[(nc - j)*stride + i*dist]); + out[j*stride + i*dist] = conj (out[(nc - j)*stride + i*dist]); octave_quit (); } @@ -758,10 +758,10 @@ { for (size_t j = 1; j < nr; j++) for (size_t k = nc/2+1; k < nc; k++) - out[k + (j + i*nr)*nc] = conj(out[nc - k + ((i+1)*nr - j)*nc]); + out[k + (j + i*nr)*nc] = conj (out[nc - k + ((i+1)*nr - j)*nc]); for (size_t j = nc/2+1; j < nc; j++) - out[j + i*nr*nc] = conj(out[(i*nr+1)*nc - j]); + out[j + i*nr*nc] = conj (out[(i*nr+1)*nc - j]); } octave_quit (); @@ -782,7 +782,7 @@ for (size_t l = nc/2+1; l < nc; l++) { T tmp = out[i+ j + k + l]; - out[i + j + k + l] = out[i + jj + k + l]; + out[i + j + k + l] = out[i + jj + k + l]; out[i + jj + k + l] = tmp; } jstart = jmax;
--- a/liboctave/oct-group.h Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/oct-group.h Thu Jul 26 08:13:22 2012 -0700 @@ -48,7 +48,7 @@ { if (this != &gr) { - gr_name = gr.gr_name; + gr_name = gr.gr_name; gr_passwd = gr.gr_passwd; gr_gid = gr.gr_gid; gr_mem = gr.gr_mem;
--- a/liboctave/oct-inttypes.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/oct-inttypes.cc Thu Jul 26 08:13:22 2012 -0700 @@ -272,7 +272,7 @@ INT_DOUBLE_BINOP_DECL (+, uint64) { - return (y < 0) ? x - octave_uint64(-y) : x + octave_uint64(y); + return (y < 0) ? x - octave_uint64 (-y) : x + octave_uint64 (y); } DOUBLE_INT_BINOP_DECL (+, uint64) @@ -288,7 +288,7 @@ // probably), the above will work as expected. If not, it's more // complicated - as long as y is within _twice_ the signed range, the // result may still be an integer. An instance of such an operation is - // 3*2**62 + (1+intmin('int64')) that should yield int64(2**62) + 1. So + // 3*2**62 + (1+intmin ('int64')) that should yield int64 (2**62) + 1. So // what we do is to try to convert y/2 and add it twice. Note that if y/2 // overflows, the result must overflow as well, and that y/2 cannot be a // fractional number. @@ -310,12 +310,12 @@ DOUBLE_INT_BINOP_DECL (-, uint64) { if (x <= static_cast<double> (octave_uint64::max ())) - return octave_uint64(x) - y; + return octave_uint64 (x) - y; else { // Again a trick to get the corner cases right. Things like - // 3**2**63 - intmax('uint64') should produce the correct result, i.e. - // int64(2**63) + 1. + // 3**2**63 - intmax ('uint64') should produce the correct result, i.e. + // int64 (2**63) + 1. const double p2_64 = std::pow (2.0, 64); if (y.bool_value ()) { @@ -340,7 +340,7 @@ // be eliminated at compile time. if (twosc && y.value () == std::numeric_limits<int64_t>::min ()) { - return octave_int64 (x + std::pow(2.0, 63)); + return octave_int64 (x + std::pow (2.0, 63)); } else return x + (-y);
--- a/liboctave/oct-inttypes.h Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/oct-inttypes.h Thu Jul 26 08:13:22 2012 -0700 @@ -825,7 +825,7 @@ static int nbits (void) { return std::numeric_limits<T>::digits; } - static int byte_size (void) { return sizeof(T); } + static int byte_size (void) { return sizeof (T); } static const char *type_name ();
--- a/liboctave/oct-locbuf.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/oct-locbuf.cc Thu Jul 26 08:13:22 2012 -0700 @@ -74,11 +74,11 @@ { // Use new [] to get std::bad_alloc if out of memory. - dat = new char [size]; + dat = new char[size]; return; } - dat = new char [chunk_size]; + dat = new char[chunk_size]; chunk = top = dat; left = chunk_size; }
--- a/liboctave/oct-md5.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/oct-md5.cc Thu Jul 26 08:13:22 2012 -0700 @@ -36,7 +36,7 @@ static std::string oct_md5_result_to_str (const unsigned char *buf) { - char tmp [33]; + char tmp[33]; sprintf (tmp, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
--- a/liboctave/oct-rand.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/oct-rand.cc Thu Jul 26 08:13:22 2012 -0700 @@ -360,7 +360,7 @@ break; case poisson_dist: - if (a < 0.0 || xisnan(a) || xisinf(a)) + if (a < 0.0 || xisnan (a) || xisinf (a)) retval = octave_NaN; else { @@ -371,7 +371,7 @@ break; case gamma_dist: - if (a <= 0.0 || xisnan(a) || xisinf(a)) + if (a <= 0.0 || xisnan (a) || xisinf (a)) retval = octave_NaN; else F77_FUNC (dgengam, DGENGAM) (1.0, a, retval); @@ -443,7 +443,7 @@ break; case poisson_dist: - if (da < 0.0 || xisnan(da) || xisinf(da)) + if (da < 0.0 || xisnan (da) || xisinf (da)) dretval = octave_NaN; else { @@ -454,7 +454,7 @@ break; case gamma_dist: - if (da <= 0.0 || xisnan(da) || xisinf(da)) + if (da <= 0.0 || xisnan (da) || xisinf (da)) retval = octave_NaN; else F77_FUNC (dgengam, DGENGAM) (1.0, da, dretval); @@ -630,7 +630,7 @@ oct_get_state (tmp); for (octave_idx_type i = 0; i <= MT_N; i++) - s.elem (i) = static_cast<double> (tmp [i]); + s.elem (i) = static_cast<double> (tmp[i]); return s; } @@ -672,7 +672,7 @@ OCTAVE_LOCAL_BUFFER (uint32_t, tmp, MT_N + 1); for (octave_idx_type i = 0; i < n; i++) - tmp[i] = static_cast<uint32_t> (s.elem(i)); + tmp[i] = static_cast<uint32_t> (s.elem (i)); if (len == MT_N + 1 && tmp[MT_N] <= MT_N && tmp[MT_N] > 0) oct_set_state (tmp); @@ -748,7 +748,7 @@ case poisson_dist: if (use_old_generators) { - if (a < 0.0 || xisnan(a) || xisinf(a)) + if (a < 0.0 || xisnan (a) || xisinf (a)) #define RAND_FUNC(x) x = octave_NaN; MAKE_RAND (len); #undef RAND_FUNC @@ -769,7 +769,7 @@ case gamma_dist: if (use_old_generators) { - if (a <= 0.0 || xisnan(a) || xisinf(a)) + if (a <= 0.0 || xisnan (a) || xisinf (a)) #define RAND_FUNC(x) x = octave_NaN; MAKE_RAND (len); #undef RAND_FUNC @@ -838,7 +838,7 @@ if (use_old_generators) { double da = a; - if (da < 0.0 || xisnan(da) || xisinf(da)) + if (da < 0.0 || xisnan (da) || xisinf (da)) #define RAND_FUNC(x) x = octave_NaN; MAKE_RAND (len); #undef RAND_FUNC @@ -860,7 +860,7 @@ if (use_old_generators) { double da = a; - if (da <= 0.0 || xisnan(da) || xisinf(da)) + if (da <= 0.0 || xisnan (da) || xisinf (da)) #define RAND_FUNC(x) x = octave_NaN; MAKE_RAND (len); #undef RAND_FUNC
--- a/liboctave/oct-sort.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/oct-sort.cc Thu Jul 26 08:13:22 2012 -0700 @@ -1184,7 +1184,7 @@ return nb; /* Merge what remains of the runs, using a temp array with - * min(na, nb) elements. + * min (na, nb) elements. */ if (na <= nb) return merge_lo (pa, na, pb, nb, comp); @@ -1238,7 +1238,7 @@ return nb; /* Merge what remains of the runs, using a temp array with - * min(na, nb) elements. + * min (na, nb) elements. */ if (na <= nb) return merge_lo (pa, ipa, na, pb, ipb, nb, comp); @@ -1413,7 +1413,7 @@ goto fail; if (descending) std::reverse (data + lo, data + lo + n); - /* If short, extend to min(minrun, nremaining). */ + /* If short, extend to min (minrun, nremaining). */ if (n < minrun) { const octave_idx_type force = nremaining <= minrun ? nremaining : minrun; @@ -1475,7 +1475,7 @@ std::reverse (data + lo, data + lo + n); std::reverse (idx + lo, idx + lo + n); } - /* If short, extend to min(minrun, nremaining). */ + /* If short, extend to min (minrun, nremaining). */ if (n < minrun) { const octave_idx_type force = nremaining <= minrun ? nremaining : minrun; @@ -1610,9 +1610,9 @@ while (! runs.empty ()) { - octave_idx_type col = runs.top ().col; - octave_idx_type ofs = runs.top ().ofs; - octave_idx_type nel = runs.top ().nel; + octave_idx_type col = runs.top ().col; + octave_idx_type ofs = runs.top ().ofs; + octave_idx_type nel = runs.top ().nel; runs.pop (); assert (nel > 1);
--- a/liboctave/oct-syscalls.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/oct-syscalls.cc Thu Jul 26 08:13:22 2012 -0700 @@ -358,7 +358,7 @@ (*current_liboctave_error_handler)(child_msg.c_str ()); - exit(0); + exit (0); } else { @@ -372,8 +372,8 @@ else #endif { - fildes[0] = child_stdin [1]; - fildes[1] = child_stdout [0]; + fildes[0] = child_stdin[1]; + fildes[1] = child_stdout[0]; return pid; } }
--- a/liboctave/randgamma.c Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/randgamma.c Thu Jul 26 08:13:22 2012 -0700 @@ -25,8 +25,8 @@ /* -double randg(a) -void fill_randg(a,n,x) +double randg (a) +void fill_randg (a,n,x) Generate a series of standard gamma distributions. @@ -99,9 +99,9 @@ oct_fill_randg (double a, octave_idx_type n, double *r) { octave_idx_type i; - /* If a < 1, start by generating gamma(1+a) */ + /* If a < 1, start by generating gamma (1+a) */ const double d = (a < 1. ? 1.+a : a) - 1./3.; - const double c = 1./sqrt(9.*d); + const double c = 1./sqrt (9.*d); /* Handle invalid cases */ if (a <= 0 || INFINITE(a)) @@ -122,7 +122,7 @@ goto restart; /* rare, so don't bother moving up */ u = RUNI; xsq = x*x; - if (u >= 1.-0.0331*xsq*xsq && log(u) >= 0.5*xsq + d*(1-v+log(v))) + if (u >= 1.-0.0331*xsq*xsq && log (u) >= 0.5*xsq + d*(1-v+log (v))) goto restart; r[i] = d*v; } @@ -130,7 +130,7 @@ { /* Use gamma(a) = gamma(1+a)*U^(1/a) */ /* Given REXP = -log(U) then U^(1/a) = exp(-REXP/a) */ for (i = 0; i < n; i++) - r[i] *= exp(-REXP/a); + r[i] *= exp (-REXP/a); } } @@ -138,7 +138,7 @@ oct_randg (double a) { double ret; - oct_fill_randg(a,1,&ret); + oct_fill_randg (a,1,&ret); return ret; } @@ -157,7 +157,7 @@ octave_idx_type i; /* If a < 1, start by generating gamma(1+a) */ const float d = (a < 1. ? 1.+a : a) - 1./3.; - const float c = 1./sqrt(9.*d); + const float c = 1./sqrt (9.*d); /* Handle invalid cases */ if (a <= 0 || INFINITE(a)) @@ -178,7 +178,7 @@ goto frestart; /* rare, so don't bother moving up */ u = RUNI; xsq = x*x; - if (u >= 1.-0.0331*xsq*xsq && log(u) >= 0.5*xsq + d*(1-v+log(v))) + if (u >= 1.-0.0331*xsq*xsq && log (u) >= 0.5*xsq + d*(1-v+log (v))) goto frestart; r[i] = d*v; } @@ -186,7 +186,7 @@ { /* Use gamma(a) = gamma(1+a)*U^(1/a) */ /* Given REXP = -log(U) then U^(1/a) = exp(-REXP/a) */ for (i = 0; i < n; i++) - r[i] *= exp(-REXP/a); + r[i] *= exp (-REXP/a); } } @@ -194,6 +194,6 @@ oct_float_randg (float a) { float ret; - oct_fill_float_randg(a,1,&ret); + oct_fill_float_randg (a,1,&ret); return ret; }
--- a/liboctave/randmtzig.c Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/randmtzig.c Thu Jul 26 08:13:22 2012 -0700 @@ -117,39 +117,39 @@ All generators share the same state vector. === Mersenne Twister === - void oct_init_by_int(uint32_t s) 32-bit initial state - void oct_init_by_array(uint32_t k[],int m) m*32-bit initial state - void oct_init_by_entropy(void) random initial state - void oct_get_state(uint32_t save[MT_N+1]) saves state in array - void oct_set_state(uint32_t save[MT_N+1]) restores state from array - static uint32_t randmt(void) returns 32-bit unsigned int + void oct_init_by_int (uint32_t s) 32-bit initial state + void oct_init_by_array (uint32_t k[],int m) m*32-bit initial state + void oct_init_by_entropy (void) random initial state + void oct_get_state (uint32_t save[MT_N+1]) saves state in array + void oct_set_state (uint32_t save[MT_N+1]) restores state from array + static uint32_t randmt (void) returns 32-bit unsigned int === inline generators === - static uint32_t randi32(void) returns 32-bit unsigned int - static uint64_t randi53(void) returns 53-bit unsigned int - static uint64_t randi54(void) returns 54-bit unsigned int - static float randu32(void) returns 32-bit uniform in (0,1) - static double randu53(void) returns 53-bit uniform in (0,1) + static uint32_t randi32 (void) returns 32-bit unsigned int + static uint64_t randi53 (void) returns 53-bit unsigned int + static uint64_t randi54 (void) returns 54-bit unsigned int + static float randu32 (void) returns 32-bit uniform in (0,1) + static double randu53 (void) returns 53-bit uniform in (0,1) - double oct_randu(void) returns M-bit uniform in (0,1) - double oct_randn(void) returns M-bit standard normal - double oct_rande(void) returns N-bit standard exponential + double oct_randu (void) returns M-bit uniform in (0,1) + double oct_randn (void) returns M-bit standard normal + double oct_rande (void) returns N-bit standard exponential - float oct_float_randu(void) returns M-bit uniform in (0,1) - float oct_float_randn(void) returns M-bit standard normal - float oct_float_rande(void) returns N-bit standard exponential + float oct_float_randu (void) returns M-bit uniform in (0,1) + float oct_float_randn (void) returns M-bit standard normal + float oct_float_rande (void) returns N-bit standard exponential === Array generators === - void oct_fill_randi32(octave_idx_type, uint32_t []) - void oct_fill_randi64(octave_idx_type, uint64_t []) + void oct_fill_randi32 (octave_idx_type, uint32_t []) + void oct_fill_randi64 (octave_idx_type, uint64_t []) - void oct_fill_randu(octave_idx_type, double []) - void oct_fill_randn(octave_idx_type, double []) - void oct_fill_rande(octave_idx_type, double []) + void oct_fill_randu (octave_idx_type, double []) + void oct_fill_randn (octave_idx_type, double []) + void oct_fill_rande (octave_idx_type, double []) - void oct_fill_float_randu(octave_idx_type, float []) - void oct_fill_float_randn(octave_idx_type, float []) - void oct_fill_float_rande(octave_idx_type, float []) + void oct_fill_float_randu (octave_idx_type, float []) + void oct_fill_float_randn (octave_idx_type, float []) + void oct_fill_float_rande (octave_idx_type, float []) */ #if defined (HAVE_CONFIG_H) @@ -166,9 +166,9 @@ #include "lo-math.h" #include "randmtzig.h" -/* FIXME may want to suppress X86 if sizeof(long)>4 */ -#if !defined(USE_X86_32) -# if defined(i386) || defined(HAVE_X86_32) +/* FIXME may want to suppress X86 if sizeof(long) > 4 */ +#if !defined (USE_X86_32) +# if defined (i386) || defined (HAVE_X86_32) # define USE_X86_32 1 # else # define USE_X86_32 0 @@ -260,34 +260,34 @@ int n = 0; /* Look for entropy in /dev/urandom */ - FILE* urandom =fopen("/dev/urandom", "rb"); + FILE* urandom =fopen ("/dev/urandom", "rb"); if (urandom) { while (n < MT_N) { unsigned char word[4]; - if (fread(word, 4, 1, urandom) != 1) + if (fread (word, 4, 1, urandom) != 1) break; entropy[n++] = word[0]+(word[1]<<8)+(word[2]<<16)+(word[3]<<24); } - fclose(urandom); + fclose (urandom); } /* If there isn't enough entropy, gather some from various sources */ if (n < MT_N) - entropy[n++] = time(NULL); /* Current time in seconds */ + entropy[n++] = time (NULL); /* Current time in seconds */ if (n < MT_N) entropy[n++] = clock (); /* CPU time used (usec) */ #ifdef HAVE_GETTIMEOFDAY if (n < MT_N) { struct timeval tv; - if (gettimeofday(&tv, NULL) != -1) + if (gettimeofday (&tv, NULL) != -1) entropy[n++] = tv.tv_usec; /* Fractional part of current time */ } #endif /* Send all the entropy into the initial state vector */ - oct_init_by_array(entropy,n); + oct_init_by_array (entropy,n); } void @@ -506,7 +506,7 @@ /* New x is given by x = f^{-1}(v/x_{i+1} + f(x_{i+1})), thus * need inverse operator of y = exp(-0.5*x*x) -> x = sqrt(-2*ln(y)) */ - x = sqrt(-2. * log(NOR_SECTION_AREA / x1 + fi[i+1])); + x = sqrt (-2. * log (NOR_SECTION_AREA / x1 + fi[i+1])); ki[i+1] = (ZIGINT)(x / x1 * NMANTISSA); wi[i] = x / NMANTISSA; fi[i] = exp (-0.5 * x * x); @@ -534,7 +534,7 @@ /* New x is given by x = f^{-1}(v/x_{i+1} + f(x_{i+1})), thus * need inverse operator of y = exp(-x) -> x = -ln(y) */ - x = - log(EXP_SECTION_AREA / x1 + fe[i+1]); + x = - log (EXP_SECTION_AREA / x1 + fe[i+1]); ke[i+1] = (ZIGINT)(x / x1 * EMANTISSA); we[i] = x / EMANTISSA; fe[i] = exp (-x); @@ -620,7 +620,7 @@ while ( yy+yy <= xx*xx); return (rabs&0x100 ? -ZIGGURAT_NOR_R-xx : ZIGGURAT_NOR_R+xx); } - else if ((fi[idx-1] - fi[idx]) * RANDU + fi[idx] < exp(-0.5*x*x)) + else if ((fi[idx-1] - fi[idx]) * RANDU + fi[idx] < exp (-0.5*x*x)) return x; } } @@ -645,9 +645,9 @@ * For the exponential tail, the method of Marsaglia[5] provides: * x = r - ln(U); */ - return ZIGGURAT_EXP_R - log(RANDU); + return ZIGGURAT_EXP_R - log (RANDU); } - else if ((fe[idx-1] - fe[idx]) * RANDU + fe[idx] < exp(-x)) + else if ((fe[idx-1] - fe[idx]) * RANDU + fe[idx] < exp (-x)) return x; } } @@ -697,7 +697,7 @@ /* New x is given by x = f^{-1}(v/x_{i+1} + f(x_{i+1})), thus * need inverse operator of y = exp(-0.5*x*x) -> x = sqrt(-2*ln(y)) */ - x = sqrt(-2. * log(NOR_SECTION_AREA / x1 + ffi[i+1])); + x = sqrt (-2. * log (NOR_SECTION_AREA / x1 + ffi[i+1])); fki[i+1] = (ZIGINT)(x / x1 * NMANTISSA); fwi[i] = x / NMANTISSA; ffi[i] = exp (-0.5 * x * x); @@ -725,7 +725,7 @@ /* New x is given by x = f^{-1}(v/x_{i+1} + f(x_{i+1})), thus * need inverse operator of y = exp(-x) -> x = -ln(y) */ - x = - log(EXP_SECTION_AREA / x1 + ffe[i+1]); + x = - log (EXP_SECTION_AREA / x1 + ffe[i+1]); fke[i+1] = (ZIGINT)(x / x1 * EMANTISSA); fwe[i] = x / EMANTISSA; ffe[i] = exp (-x); @@ -787,7 +787,7 @@ while ( yy+yy <= xx*xx); return (rabs&0x100 ? -ZIGGURAT_NOR_R-xx : ZIGGURAT_NOR_R+xx); } - else if ((ffi[idx-1] - ffi[idx]) * RANDU + ffi[idx] < exp(-0.5*x*x)) + else if ((ffi[idx-1] - ffi[idx]) * RANDU + ffi[idx] < exp (-0.5*x*x)) return x; } } @@ -812,9 +812,9 @@ * For the exponential tail, the method of Marsaglia[5] provides: * x = r - ln(U); */ - return ZIGGURAT_EXP_R - log(RANDU); + return ZIGGURAT_EXP_R - log (RANDU); } - else if ((ffe[idx-1] - ffe[idx]) * RANDU + ffe[idx] < exp(-x)) + else if ((ffe[idx-1] - ffe[idx]) * RANDU + ffe[idx] < exp (-x)) return x; } }
--- a/liboctave/randpoisson.c Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/randpoisson.c Thu Jul 26 08:13:22 2012 -0700 @@ -105,7 +105,7 @@ { r = 1.0 / k; rr = r * r; - return ((k + 0.5)*log(k) - k + C0 + r*(C1 + rr*(C3 + rr*(C5 + rr*C7)))); + return ((k + 0.5)*log (k) - k + C0 + r*(C1 + rr*(C3 + rr*(C5 + rr*C7)))); } else return (logfak[(int)k]); @@ -146,7 +146,7 @@ static double f (double k, double l_nu, double c_pm) { - return exp(k * l_nu - flogfak(k) - c_pm); + return exp (k * l_nu - flogfak (k) - c_pm); } static double @@ -163,13 +163,13 @@ { /* set-up */ my_last = my; /* approximate deviation of reflection points k2, k4 from my - 1/2 */ - Ds = sqrt(my + 0.25); + Ds = sqrt (my + 0.25); /* mode m, reflection points k2 and k4, and points k1 and k5, */ /* which delimit the centre region of h(x) */ - m = floor(my); - k2 = ceil(my - 0.5 - Ds); - k4 = floor(my - 0.5 + Ds); + m = floor (my); + k2 = ceil (my - 0.5 - Ds); + k4 = floor (my - 0.5 + Ds); k1 = k2 + k2 - m + 1L; k5 = k4 + k4 - m; @@ -184,18 +184,18 @@ r5 = my / (k5 + 1.0); /* reciprocal values of the scale parameters of exp. tail envelope */ - ll = log(r1); /* expon. tail left */ - lr = -log(r5); /* expon. tail right*/ + ll = log (r1); /* expon. tail left */ + lr = -log (r5); /* expon. tail right*/ /* Poisson constants, necessary for computing function values f(k) */ - l_my = log(my); - c_pm = m * l_my - flogfak(m); + l_my = log (my); + c_pm = m * l_my - flogfak (m); /* function values f(k) = p(k)/p(m) at k = k2, k4, k1, k5 */ - f2 = f(k2, l_my, c_pm); - f4 = f(k4, l_my, c_pm); - f1 = f(k1, l_my, c_pm); - f5 = f(k5, l_my, c_pm); + f2 = f (k2, l_my, c_pm); + f4 = f (k4, l_my, c_pm); + f1 = f (k1, l_my, c_pm); + f5 = f (k5, l_my, c_pm); /* area of the two centre and the two exponential tail regions */ /* area of the two immediate acceptance regions between k2, k4 */ @@ -216,26 +216,26 @@ /* immediate acceptance region R2 = [k2, m) *[0, f2), X = k2, ... m -1 */ - if ((V = U - p1) < 0.0) return(k2 + floor(U/f2)); + if ((V = U - p1) < 0.0) return (k2 + floor (U/f2)); /* immediate acceptance region R1 = [k1, k2)*[0, f1), X = k1, ... k2-1 */ - if ((W = V / dl) < f1 ) return(k1 + floor(V/f1)); + if ((W = V / dl) < f1 ) return (k1 + floor (V/f1)); /* computation of candidate X < k2, and its counterpart Y > k2 */ /* either squeeze-acceptance of X or acceptance-rejection of Y */ - Dk = floor(dl * RUNI) + 1.0; + Dk = floor (dl * RUNI) + 1.0; if (W <= f2 - Dk * (f2 - f2/r2)) { /* quick accept of */ - return(k2 - Dk); /* X = k2 - Dk */ + return (k2 - Dk); /* X = k2 - Dk */ } if ((V = f2 + f2 - W) < 1.0) { /* quick reject of Y*/ Y = k2 + Dk; if (V <= f2 + Dk * (1.0 - f2)/(dl + 1.0)) { /* quick accept of */ - return(Y); /* Y = k2 + Dk */ + return (Y); /* Y = k2 + Dk */ } - if (V <= f(Y, l_my, c_pm)) return(Y); /* final accept of Y*/ + if (V <= f (Y, l_my, c_pm)) return (Y); /* final accept of Y*/ } X = k2 - Dk; } @@ -243,26 +243,26 @@ { /* centre right */ /* immediate acceptance region R3 = [m, k4+1)*[0, f4), X = m, ... k4 */ - if ((V = U - p3) < 0.0) return(k4 - floor((U - p2)/f4)); + if ((V = U - p3) < 0.0) return (k4 - floor ((U - p2)/f4)); /* immediate acceptance region R4 = [k4+1, k5+1)*[0, f5) */ - if ((W = V / dr) < f5 ) return(k5 - floor(V/f5)); + if ((W = V / dr) < f5 ) return (k5 - floor (V/f5)); /* computation of candidate X > k4, and its counterpart Y < k4 */ /* either squeeze-acceptance of X or acceptance-rejection of Y */ - Dk = floor(dr * RUNI) + 1.0; + Dk = floor (dr * RUNI) + 1.0; if (W <= f4 - Dk * (f4 - f4*r4)) { /* quick accept of */ - return(k4 + Dk); /* X = k4 + Dk */ + return (k4 + Dk); /* X = k4 + Dk */ } if ((V = f4 + f4 - W) < 1.0) { /* quick reject of Y*/ Y = k4 - Dk; if (V <= f4 + Dk * (1.0 - f4)/ dr) { /* quick accept of */ - return(Y); /* Y = k4 - Dk */ + return (Y); /* Y = k4 - Dk */ } - if (V <= f(Y, l_my, c_pm)) return(Y); /* final accept of Y*/ + if (V <= f (Y, l_my, c_pm)) return (Y); /* final accept of Y*/ } X = k4 + Dk; } @@ -271,26 +271,26 @@ W = RUNI; if (U < p5) { /* expon. tail left */ - Dk = floor(1.0 - log(W)/ll); + Dk = floor (1.0 - log (W)/ll); if ((X = k1 - Dk) < 0L) continue; /* 0 <= X <= k1 - 1 */ W *= (U - p4) * ll; /* W -- U(0, h(x)) */ if (W <= f1 - Dk * (f1 - f1/r1)) - return(X); /* quick accept of X*/ + return (X); /* quick accept of X*/ } else { /* expon. tail right*/ - Dk = floor(1.0 - log(W)/lr); + Dk = floor (1.0 - log (W)/lr); X = k5 + Dk; /* X >= k5 + 1 */ W *= (U - p5) * lr; /* W -- U(0, h(x)) */ if (W <= f5 - Dk * (f5 - f5*r5)) - return(X); /* quick accept of X*/ + return (X); /* quick accept of X*/ } } /* acceptance-rejection test of candidate X from the original area */ /* test, whether W <= f(k), with W = U*h(x) and U -- U(0, 1)*/ /* log f(X) = (X - m)*log(my) - log X! + log m! */ - if (log(W) <= X * l_my - flogfak(X) - c_pm) return(X); + if (log (W) <= X * l_my - flogfak (X) - c_pm) return (X); } } /* ---- pprsc.c end ------ */ @@ -300,7 +300,7 @@ /* Given uniform u, find x such that CDF(L,x)==u. Return x. */ static void -poisson_cdf_lookup(double lambda, double *p, size_t n) +poisson_cdf_lookup (double lambda, double *p, size_t n) { /* Table size is predicated on the maximum value of lambda * we want to store in the table, and the maximum value of @@ -316,12 +316,12 @@ /* Precompute the table for the u up to and including 0.458. * We will almost certainly need it. */ - int intlambda = (int)floor(lambda); + int intlambda = (int)floor (lambda); double P; int tableidx; size_t i = n; - t[0] = P = exp(-lambda); + t[0] = P = exp (-lambda); for (tableidx = 1; tableidx <= intlambda; tableidx++) { P = P*lambda/(double)tableidx; t[tableidx] = t[tableidx-1] + P; @@ -369,18 +369,18 @@ } static void -poisson_cdf_lookup_float(double lambda, float *p, size_t n) +poisson_cdf_lookup_float (double lambda, float *p, size_t n) { double t[TABLESIZE]; /* Precompute the table for the u up to and including 0.458. * We will almost certainly need it. */ - int intlambda = (int)floor(lambda); + int intlambda = (int)floor (lambda); double P; int tableidx; size_t i = n; - t[0] = P = exp(-lambda); + t[0] = P = exp (-lambda); for (tableidx = 1; tableidx <= intlambda; tableidx++) { P = P*lambda/(double)tableidx; t[tableidx] = t[tableidx-1] + P; @@ -412,8 +412,8 @@ static void poisson_rejection (double lambda, double *p, size_t n) { - double sq = sqrt(2.0*lambda); - double alxm = log(lambda); + double sq = sqrt (2.0*lambda); + double alxm = log (lambda); double g = lambda*alxm - LGAMMA(lambda+1.0); size_t i; @@ -425,8 +425,8 @@ y = tan(M_PI*RUNI); em = sq * y + lambda; } while (em < 0.0); - em = floor(em); - t = 0.9*(1.0+y*y)*exp(em*alxm-flogfak(em)-g); + em = floor (em); + t = 0.9*(1.0+y*y)*exp (em*alxm-flogfak (em)-g); } while (RUNI > t); p[i] = em; } @@ -436,8 +436,8 @@ static void poisson_rejection_float (double lambda, float *p, size_t n) { - double sq = sqrt(2.0*lambda); - double alxm = log(lambda); + double sq = sqrt (2.0*lambda); + double alxm = log (lambda); double g = lambda*alxm - LGAMMA(lambda+1.0); size_t i; @@ -446,11 +446,11 @@ double y, em, t; do { do { - y = tan(M_PI*RUNI); + y = tan (M_PI*RUNI); em = sq * y + lambda; } while (em < 0.0); - em = floor(em); - t = 0.9*(1.0+y*y)*exp(em*alxm-flogfak(em)-g); + em = floor (em); + t = 0.9*(1.0+y*y)*exp (em*alxm-flogfak (em)-g); } while (RUNI > t); p[i] = em; } @@ -477,20 +477,20 @@ } else if (L <= 10.0) { - poisson_cdf_lookup(L, p, n); + poisson_cdf_lookup (L, p, n); } else if (L <= 1e8) { for (i=0; i<n; i++) - p[i] = pprsc(L); + p[i] = pprsc (L); } else { /* normal approximation: from Phys. Rev. D (1994) v50 p1284 */ - const double sqrtL = sqrt(L); + const double sqrtL = sqrt (L); for (i = 0; i < n; i++) { - p[i] = floor(RNOR*sqrtL + L + 0.5); + p[i] = floor (RNOR*sqrtL + L + 0.5); if (p[i] < 0.0) p[i] = 0.0; /* will probably never happen */ } @@ -505,7 +505,7 @@ if (L < 0.0) ret = NAN; else if (L <= 12.0) { /* From Press, et al. Numerical recipes */ - double g = exp(-L); + double g = exp (-L); int em = -1; double t = 1.0; do { @@ -515,14 +515,14 @@ ret = em; } else if (L <= 1e8) { /* numerical recipes */ - poisson_rejection(L, &ret, 1); + poisson_rejection (L, &ret, 1); } else if (INFINITE(L)) { /* FIXME R uses NaN, but the normal approx. suggests that as * limit should be inf. Which is correct? */ ret = NAN; } else { /* normal approximation: from Phys. Rev. D (1994) v50 p1284 */ - ret = floor(RNOR*sqrt(L) + L + 0.5); + ret = floor (RNOR*sqrt (L) + L + 0.5); if (ret < 0.0) ret = 0.0; /* will probably never happen */ } return ret; @@ -541,20 +541,20 @@ } else if (L <= 10.0) { - poisson_cdf_lookup_float(L, p, n); + poisson_cdf_lookup_float (L, p, n); } else if (L <= 1e8) { for (i=0; i<n; i++) - p[i] = pprsc(L); + p[i] = pprsc (L); } else { /* normal approximation: from Phys. Rev. D (1994) v50 p1284 */ - const double sqrtL = sqrt(L); + const double sqrtL = sqrt (L); for (i = 0; i < n; i++) { - p[i] = floor(RNOR*sqrtL + L + 0.5); + p[i] = floor (RNOR*sqrtL + L + 0.5); if (p[i] < 0.0) p[i] = 0.0; /* will probably never happen */ } @@ -570,7 +570,7 @@ if (L < 0.0) ret = NAN; else if (L <= 12.0) { /* From Press, et al. Numerical recipes */ - double g = exp(-L); + double g = exp (-L); int em = -1; double t = 1.0; do { @@ -580,14 +580,14 @@ ret = em; } else if (L <= 1e8) { /* numerical recipes */ - poisson_rejection_float(L, &ret, 1); + poisson_rejection_float (L, &ret, 1); } else if (INFINITE(L)) { /* FIXME R uses NaN, but the normal approx. suggests that as * limit should be inf. Which is correct? */ ret = NAN; } else { /* normal approximation: from Phys. Rev. D (1994) v50 p1284 */ - ret = floor(RNOR*sqrt(L) + L + 0.5); + ret = floor (RNOR*sqrt (L) + L + 0.5); if (ret < 0.0) ret = 0.0; /* will probably never happen */ } return ret;
--- a/liboctave/sparse-base-chol.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/sparse-base-chol.cc Thu Jul 26 08:13:22 2012 -0700 @@ -56,24 +56,24 @@ for (k = 0; k < ncol; k++) { - p = Sp [k]; + p = Sp[k]; pend = Sp [k+1]; - Sp [k] = pdest; + Sp[k] = pdest; for (; p < pend; p++) { - sik = Sx [p]; + sik = Sx[p]; if (CHOLMOD_IS_NONZERO (sik)) { if (p != pdest) { - Si [pdest] = Si [p]; - Sx [pdest] = sik; + Si[pdest] = Si[p]; + Sx[pdest] = sik; } pdest++; } } } - Sp [ncol] = pdest; + Sp[ncol] = pdest; } #endif @@ -157,7 +157,7 @@ if (natural) { cm->nmethods = 1 ; - cm->method [0].ordering = CHOLMOD_NATURAL ; + cm->method[0].ordering = CHOLMOD_NATURAL ; cm->postorder = false ; } @@ -229,11 +229,11 @@ octave_idx_type nnz = m->nzmax; chol_type ret (m->nrow, nc, nnz); for (octave_idx_type j = 0; j < nc+1; j++) - ret.xcidx(j) = static_cast<octave_idx_type *>(m->p)[j]; + ret.xcidx (j) = static_cast<octave_idx_type *>(m->p)[j]; for (octave_idx_type i = 0; i < nnz; i++) { - ret.xridx(i) = static_cast<octave_idx_type *>(m->i)[i]; - ret.xdata(i) = static_cast<chol_elt *>(m->x)[i]; + ret.xridx (i) = static_cast<octave_idx_type *>(m->i)[i]; + ret.xdata (i) = static_cast<chol_elt *>(m->x)[i]; } return ret; #else @@ -252,11 +252,11 @@ for (octave_idx_type i = 0; i < n; i++) { - p.xcidx(i) = i; - p.xridx(i) = static_cast<octave_idx_type>(perms(i)); - p.xdata(i) = 1; + p.xcidx (i) = i; + p.xridx (i) = static_cast<octave_idx_type>(perms (i)); + p.xdata (i) = 1; } - p.xcidx(n) = n; + p.xcidx (n) = n; return p; #else @@ -277,7 +277,7 @@ double rcond2; octave_idx_type info; MatrixType mattype (MatrixType::Upper); - chol_type linv = L ().hermitian ().inverse(mattype, info, rcond2, 1, 0); + chol_type linv = L ().hermitian ().inverse (mattype, info, rcond2, 1, 0); if (perms.length () == n) {
--- a/liboctave/sparse-base-lu.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/sparse-base-lu.cc Thu Jul 26 08:13:22 2012 -0700 @@ -37,26 +37,26 @@ lu_type Yout (nr, nc, Lfact.nnz () + Ufact.nnz ()); octave_idx_type ii = 0; - Yout.xcidx(0) = 0; + Yout.xcidx (0) = 0; for (octave_idx_type j = 0; j < nc; j++) { - for (octave_idx_type i = Ufact.cidx (j); i < Ufact.cidx(j + 1); i++) + for (octave_idx_type i = Ufact.cidx (j); i < Ufact.cidx (j + 1); i++) { - Yout.xridx (ii) = Ufact.ridx(i); - Yout.xdata (ii++) = Ufact.data(i); + Yout.xridx (ii) = Ufact.ridx (i); + Yout.xdata (ii++) = Ufact.data (i); } if (j < rcmin) { // Note the +1 skips the 1.0 on the diagonal for (octave_idx_type i = Lfact.cidx (j) + 1; - i < Lfact.cidx(j +1); i++) + i < Lfact.cidx (j +1); i++) { - Yout.xridx (ii) = Lfact.ridx(i); - Yout.xdata (ii++) = Lfact.data(i); + Yout.xridx (ii) = Lfact.ridx (i); + Yout.xdata (ii++) = Lfact.data (i); } } - Yout.xcidx(j + 1) = ii; + Yout.xcidx (j + 1) = ii; } return Yout;
--- a/liboctave/sparse-dmsolve.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/sparse-dmsolve.cc Thu Jul 26 08:13:22 2012 -0700 @@ -54,16 +54,16 @@ nz = 0; for (octave_idx_type j = cst ; j < cend ; j++) { - octave_idx_type qq = (Q ? Q [j] : j); + octave_idx_type qq = (Q ? Q[j] : j); B.xcidx (j - cst) = nz; - for (octave_idx_type p = A.cidx(qq) ; p < A.cidx (qq+1) ; p++) + for (octave_idx_type p = A.cidx (qq) ; p < A.cidx (qq+1) ; p++) { octave_quit (); octave_idx_type r = (Pinv ? Pinv [A.ridx (p)] : A.ridx (p)); if (r >= rst && r < rend) { B.xdata (nz) = A.data (p); - B.xridx (nz++) = r - rst ; + B.xridx (nz++) = r - rst ; } } } @@ -77,16 +77,16 @@ nz = 0; for (octave_idx_type j = cst ; j < cend ; j++) { - octave_idx_type qq = (Q ? Q [j] : j); + octave_idx_type qq = (Q ? Q[j] : j); B.xcidx (j - cst) = nz; - for (octave_idx_type p = A.cidx(qq) ; p < A.cidx (qq+1) ; p++) + for (octave_idx_type p = A.cidx (qq) ; p < A.cidx (qq+1) ; p++) { octave_quit (); octave_idx_type r = (Pinv ? Pinv [A.ridx (p)] : A.ridx (p)); if (r >= rst && r < rend) { X [r-rst] = A.data (p); - B.xridx (nz++) = r - rst ; + B.xridx (nz++) = r - rst ; } } sort.sort (ri + B.xcidx (j - cst), nz - B.xcidx (j - cst)); @@ -197,17 +197,17 @@ OCTAVE_LOCAL_BUFFER (octave_idx_type, Qinv, nr); for (octave_idx_type i = 0; i < nr; i++) - Qinv [Q [i]] = i; + Qinv[Q[i]] = i; // First count the number of elements in the final array - octave_idx_type nel = a.xcidx(c) + b.nnz (); + octave_idx_type nel = a.xcidx (c) + b.nnz (); if (c + b_cols < nc) - nel += a.xcidx(nc) - a.xcidx(c + b_cols); + nel += a.xcidx (nc) - a.xcidx (c + b_cols); for (octave_idx_type i = c; i < c + b_cols; i++) - for (octave_idx_type j = a.xcidx(i); j < a.xcidx(i+1); j++) - if (Qinv [a.xridx(j)] < r || Qinv [a.xridx(j)] >= r + b_rows) + for (octave_idx_type j = a.xcidx (i); j < a.xcidx (i+1); j++) + if (Qinv [a.xridx (j)] < r || Qinv [a.xridx (j)] >= r + b_rows) nel++; OCTAVE_LOCAL_BUFFER (T, X, nr); @@ -216,49 +216,49 @@ a = MSparse<T> (nr, nc, nel); octave_idx_type *ri = a.xridx (); - for (octave_idx_type i = 0; i < tmp.cidx(c); i++) + for (octave_idx_type i = 0; i < tmp.cidx (c); i++) { - a.xdata(i) = tmp.xdata(i); - a.xridx(i) = tmp.xridx(i); + a.xdata (i) = tmp.xdata (i); + a.xridx (i) = tmp.xridx (i); } for (octave_idx_type i = 0; i < c + 1; i++) - a.xcidx(i) = tmp.xcidx(i); + a.xcidx (i) = tmp.xcidx (i); - octave_idx_type ii = a.xcidx(c); + octave_idx_type ii = a.xcidx (c); for (octave_idx_type i = c; i < c + b_cols; i++) { octave_quit (); - for (octave_idx_type j = tmp.xcidx(i); j < tmp.xcidx(i+1); j++) - if (Qinv [tmp.xridx(j)] < r || Qinv [tmp.xridx(j)] >= r + b_rows) + for (octave_idx_type j = tmp.xcidx (i); j < tmp.xcidx (i+1); j++) + if (Qinv [tmp.xridx (j)] < r || Qinv [tmp.xridx (j)] >= r + b_rows) { - X [tmp.xridx(j)] = tmp.xdata(j); - a.xridx(ii++) = tmp.xridx(j); + X [tmp.xridx (j)] = tmp.xdata (j); + a.xridx (ii++) = tmp.xridx (j); } octave_quit (); - for (octave_idx_type j = b.cidx(i-c); j < b.cidx(i-c+1); j++) + for (octave_idx_type j = b.cidx (i-c); j < b.cidx (i-c+1); j++) { - X [Q [r + b.ridx(j)]] = b.data(j); - a.xridx(ii++) = Q [r + b.ridx(j)]; + X [Q [r + b.ridx (j)]] = b.data (j); + a.xridx (ii++) = Q [r + b.ridx (j)]; } sort.sort (ri + a.xcidx (i), ii - a.xcidx (i)); for (octave_idx_type p = a.xcidx (i); p < ii; p++) a.xdata (p) = X [a.xridx (p)]; - a.xcidx(i+1) = ii; + a.xcidx (i+1) = ii; } for (octave_idx_type i = c + b_cols; i < nc; i++) { - for (octave_idx_type j = tmp.xcidx(i); j < tmp.cidx(i+1); j++) + for (octave_idx_type j = tmp.xcidx (i); j < tmp.cidx (i+1); j++) { - a.xdata(ii) = tmp.xdata(j); - a.xridx(ii++) = tmp.xridx(j); + a.xdata (ii) = tmp.xdata (j); + a.xridx (ii++) = tmp.xridx (j); } - a.xcidx(i+1) = ii; + a.xcidx (i+1) = ii; } } @@ -287,7 +287,7 @@ for (octave_idx_type i = 0; i < b_nr; i++) { octave_quit (); - Btx [p [i] + off] = Bx [ i + off]; + Btx[p[i] + off] = Bx[ i + off]; } } } @@ -318,15 +318,15 @@ octave_sort<octave_idx_type> sort; octave_idx_type *ri = a.xridx (); OCTAVE_LOCAL_BUFFER (RT, X, b_nr); - a.xcidx(0) = 0; + a.xcidx (0) = 0; for (octave_idx_type j = 0; j < b_nc; j++) { - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) { octave_quit (); - octave_idx_type r = p [b.ridx (i)]; - X [r] = b.data (i); - a.xridx(nz++) = p [b.ridx (i)]; + octave_idx_type r = p[b.ridx (i)]; + X[r] = b.data (i); + a.xridx (nz++) = p[b.ridx (i)]; } sort.sort (ri + a.xcidx (j), nz - a.xcidx (j)); for (octave_idx_type i = a.cidx (j); i < nz; i++) @@ -334,7 +334,7 @@ octave_quit (); a.xdata (i) = X [a.xridx (i)]; } - a.xcidx(j+1) = nz; + a.xcidx (j+1) = nz; } } @@ -389,7 +389,7 @@ csm.p = const_cast<octave_idx_type *>(a.cidx ()); csm.i = const_cast<octave_idx_type *>(a.ridx ()); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (d) *dm = CXSPARSE_DNAME(_dmperm) (&csm, 0); octave_idx_type *p = dm->p; octave_idx_type *q = dm->q; @@ -400,26 +400,26 @@ #endif OCTAVE_LOCAL_BUFFER (octave_idx_type, pinv, nr); for (octave_idx_type i = 0; i < nr; i++) - pinv [p [i]] = i; + pinv[p[i]] = i; RT btmp; dmsolve_permute (btmp, b, pinv); info = 0; retval.resize (nc, b_nc); // Leading over-determined block - if (dm->rr [2] < nr && dm->cc [3] < nc) + if (dm->rr[2] < nr && dm->cc[3] < nc) { - ST m = dmsolve_extract (a, pinv, q, dm->rr [2], nr, dm->cc [3], nc, + ST m = dmsolve_extract (a, pinv, q, dm->rr[2], nr, dm->cc[3], nc, nnz_remaining, true); nnz_remaining -= m.nnz (); RT mtmp = qrsolve (m, dmsolve_extract (btmp, 0, 0, dm->rr[2], b_nr, 0, b_nc), info); - dmsolve_insert (retval, mtmp, q, dm->cc [3], 0); - if (dm->rr [2] > 0 && !info) + dmsolve_insert (retval, mtmp, q, dm->cc[3], 0); + if (dm->rr[2] > 0 && !info) { - m = dmsolve_extract (a, pinv, q, 0, dm->rr [2], - dm->cc [3], nc, nnz_remaining, true); + m = dmsolve_extract (a, pinv, q, 0, dm->rr[2], + dm->cc[3], nc, nnz_remaining, true); nnz_remaining -= m.nnz (); RT ctmp = dmsolve_extract (btmp, 0, 0, 0, dm->rr[2], 0, b_nc); @@ -429,12 +429,12 @@ // Structurally non-singular blocks // FIXME Should use fine Dulmange-Mendelsohn decomposition here. - if (dm->rr [1] < dm->rr [2] && dm->cc [2] < dm->cc [3] && !info) + if (dm->rr[1] < dm->rr[2] && dm->cc[2] < dm->cc[3] && !info) { - ST m = dmsolve_extract (a, pinv, q, dm->rr [1], dm->rr [2], - dm->cc [2], dm->cc [3], nnz_remaining, false); + ST m = dmsolve_extract (a, pinv, q, dm->rr[1], dm->rr[2], + dm->cc[2], dm->cc[3], nnz_remaining, false); nnz_remaining -= m.nnz (); - RT btmp2 = dmsolve_extract (btmp, 0, 0, dm->rr [1], dm->rr [2], + RT btmp2 = dmsolve_extract (btmp, 0, 0, dm->rr[1], dm->rr[2], 0, b_nc); double rcond = 0.0; MatrixType mtyp (MatrixType::Full); @@ -446,11 +446,11 @@ mtmp = qrsolve (m, btmp2, info); } - dmsolve_insert (retval, mtmp, q, dm->cc [2], 0); - if (dm->rr [1] > 0 && !info) + dmsolve_insert (retval, mtmp, q, dm->cc[2], 0); + if (dm->rr[1] > 0 && !info) { - m = dmsolve_extract (a, pinv, q, 0, dm->rr [1], dm->cc [2], - dm->cc [3], nnz_remaining, true); + m = dmsolve_extract (a, pinv, q, 0, dm->rr[1], dm->cc[2], + dm->cc[3], nnz_remaining, true); nnz_remaining -= m.nnz (); RT ctmp = dmsolve_extract (btmp, 0, 0, 0, dm->rr[1], 0, b_nc); @@ -459,13 +459,13 @@ } // Trailing under-determined block - if (dm->rr [1] > 0 && dm->cc [2] > 0 && !info) + if (dm->rr[1] > 0 && dm->cc[2] > 0 && !info) { - ST m = dmsolve_extract (a, pinv, q, 0, dm->rr [1], 0, - dm->cc [2], nnz_remaining, true); + ST m = dmsolve_extract (a, pinv, q, 0, dm->rr[1], 0, + dm->cc[2], nnz_remaining, true); RT mtmp = - qrsolve (m, dmsolve_extract(btmp, 0, 0, 0, dm->rr [1] , 0, - b_nc), info); + qrsolve (m, dmsolve_extract (btmp, 0, 0, 0, dm->rr[1] , 0, + b_nc), info); dmsolve_insert (retval, mtmp, q, 0, 0); }
--- a/liboctave/str-vec.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/str-vec.cc Thu Jul 26 08:13:22 2012 -0700 @@ -54,7 +54,7 @@ for (std::list<std::string>::const_iterator p = lst.begin (); p != lst.end (); p++) - elem(i++) = *p; + elem (i++) = *p; } string_vector::string_vector (const std::set<std::string>& lst) @@ -69,7 +69,7 @@ for (std::set<std::string>::const_iterator p = lst.begin (); p != lst.end (); p++) - elem(i++) = *p; + elem (i++) = *p; } // Create a string vector from a NULL terminated list of C strings. @@ -125,9 +125,9 @@ octave_idx_type k = 0; for (octave_idx_type i = 1; i < len; i++) - if (elem(i) != elem(k)) + if (elem (i) != elem (k)) if (++k != i) - elem(k) = elem(i); + elem (k) = elem (i); if (len != ++k) resize (k); @@ -143,7 +143,7 @@ resize (len + 1); - elem(len) = s; + elem (len) = s; return *this; } @@ -158,7 +158,7 @@ resize (new_len); for (octave_idx_type i = 0; i < sv_len; i++) - elem(len + i) = sv[i]; + elem (len + i) = sv[i]; return *this; } @@ -175,9 +175,9 @@ octave_idx_type i; for (i = 0; i < len - 1; i++) - retval += elem(i) + sep; + retval += elem (i) + sep; - retval += elem(i); + retval += elem (i); } return retval; @@ -190,10 +190,10 @@ char **retval = new char * [len + 1]; - retval [len] = 0; + retval[len] = 0; for (octave_idx_type i = 0; i < len; i++) - retval[i] = strsave (elem(i).c_str ()); + retval[i] = strsave (elem (i).c_str ()); return retval; }
--- a/liboctave/str-vec.h Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/str-vec.h Thu Jul 26 08:13:22 2012 -0700 @@ -79,7 +79,7 @@ for (octave_idx_type i = 0; i < n; i++) { - octave_idx_type tmp = elem(i).length (); + octave_idx_type tmp = elem (i).length (); if (tmp > longest) longest = tmp;
--- a/liboctave/tempnam.c Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/tempnam.c Thu Jul 26 08:13:22 2012 -0700 @@ -43,16 +43,16 @@ { size_t len; register char *s; - register char *t = __stdio_gen_tempname(dir, pfx, 1, &len, (FILE **) NULL); + register char *t = __stdio_gen_tempname (dir, pfx, 1, &len, (FILE **) NULL); if (t == NULL) return NULL; - s = (char *) malloc(len); + s = (char *) malloc (len); if (s == NULL) return NULL; - (void) memcpy(s, t, len); + (void) memcpy (s, t, len); return s; }
--- a/liboctave/tempname.c Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/tempname.c Thu Jul 26 08:13:22 2012 -0700 @@ -112,14 +112,14 @@ if (dir_search) { - register const char *d = getenv("TMPDIR"); - if (d != NULL && !diraccess(d)) + register const char *d = getenv ("TMPDIR"); + if (d != NULL && !diraccess (d)) d = NULL; - if (d == NULL && dir != NULL && diraccess(dir)) + if (d == NULL && dir != NULL && diraccess (dir)) d = dir; - if (d == NULL && diraccess(tmpdir)) + if (d == NULL && diraccess (tmpdir)) d = tmpdir; - if (d == NULL && diraccess("/tmp")) + if (d == NULL && diraccess ("/tmp")) d = "/tmp"; if (d == NULL) { @@ -139,14 +139,14 @@ if (pfx != NULL && *pfx != '\0') { - plen = strlen(pfx); + plen = strlen (pfx); if (plen > 5) plen = 5; } else plen = 0; - if (dir != tmpdir && !strcmp(dir, tmpdir)) + if (dir != tmpdir && !strcmp (dir, tmpdir)) dir = tmpdir; idx = &indices[(plen == 0 && dir == tmpdir) ? 1 : 0];