Mercurial > octave
diff liboctave/oct-binmap.h @ 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/.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 26 Jul 2012 08:13:22 -0700 |
parents | 460a3c6d8bf1 |
children |
line wrap: on
line diff
--- 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++; }