Mercurial > hg > octave-nkf
comparison liboctave/dNDArray.cc @ 14846:460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Example: func() => func ()
* dynamic.txi, func.txi, oop.txi, var.txi, embedded.cc, fortdemo.cc,
funcdemo.cc, paramdemo.cc, stringdemo.cc, unwinddemo.cc, Array.cc, Array.h,
CColVector.cc, CDiagMatrix.h, CMatrix.cc, CNDArray.cc, CRowVector.cc,
CSparse.cc, CmplxGEPBAL.cc, EIG.cc, MSparse.cc, MatrixType.cc,
Sparse-op-defs.h, Sparse-perm-op-defs.h, Sparse.cc, Sparse.h,
SparseCmplxCHOL.cc, SparseCmplxCHOL.h, SparseCmplxLU.cc, SparseCmplxQR.cc,
SparseCmplxQR.h, SparseQR.cc, SparseQR.h, SparsedbleCHOL.cc, SparsedbleCHOL.h,
SparsedbleLU.cc, SparsedbleLU.h, base-lu.cc, cmd-hist.cc, dColVector.cc,
dDiagMatrix.h, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, dbleCHOL.cc,
dbleGEPBAL.cc, dim-vector.cc, eigs-base.cc, f2c-main.c, fCColVector.cc,
fCDiagMatrix.h, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fCmplxGEPBAL.cc,
fColVector.cc, fDiagMatrix.h, fEIG.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc,
file-ops.cc, file-stat.cc, floatCHOL.cc, floatGEPBAL.cc, idx-vector.h,
lo-specfun.cc, lo-sysdep.cc, mx-inlines.cc, oct-binmap.h, oct-convn.cc,
oct-md5.cc, oct-mem.h, oct-rand.cc, oct-syscalls.cc, randgamma.c, randmtzig.c,
sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc, sparse-dmsolve.cc,
tempname.c, curl.m, divergence.m, randi.m, dlmwrite.m, edit.m, getappdata.m,
what.m, getarchdir.m, install.m, installed_packages.m, repackage.m,
unload_packages.m, colorbar.m, figure.m, isosurface.m, legend.m, loglog.m,
plot.m, plot3.m, plotyy.m, polar.m, __errplot__.m, __ghostscript__.m,
__marching_cube__.m, __plt__.m, __scatter__.m, semilogx.m, semilogy.m,
trimesh.m, trisurf.m, demo.m, test.m, datetick.m, __delaunayn__.cc,
__dsearchn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc,
__lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, balance.cc,
bsxfun.cc, ccolamd.cc, cellfun.cc, chol.cc, daspk.cc, dasrt.cc, dassl.cc,
dmperm.cc, eig.cc, eigs.cc, fftw.cc, filter.cc, find.cc, kron.cc, lookup.cc,
lsode.cc, matrix_type.cc, md5sum.cc, mgorth.cc, qr.cc, quad.cc, rand.cc,
regexp.cc, symbfact.cc, tril.cc, urlwrite.cc, op-bm-bm.cc, op-cdm-cdm.cc,
op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-scm.cc,
op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-fcdm-fcdm.cc,
op-fcm-fcm.cc, op-fdm-fdm.cc, op-fm-fm.cc, op-int.h, op-m-m.cc, op-m-scm.cc,
op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-scm.cc,
op-s-sm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc,
op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc,
op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-str.cc, op-struct.cc, bitfcns.cc,
data.cc, debug.cc, dynamic-ld.cc, error.cc, gl-render.cc, graphics.cc,
graphics.in.h, load-path.cc, ls-hdf5.cc, ls-mat5.cc, ls-mat5.h,
ls-oct-ascii.cc, ls-oct-ascii.h, mex.cc, mk-errno-list, oct-map.cc, oct-obj.h,
oct-parse.yy, octave-config.in.cc, ov-base-int.cc, ov-base-mat.cc, ov-base.cc,
ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc,
ov-class.h, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc,
ov-flt-re-mat.cc, ov-intx.h, ov-range.h, ov-re-mat.cc, ov-re-sparse.cc,
ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.h, ov.h, pr-output.cc, pt-id.cc,
pt-id.h, pt-mat.cc, pt-select.cc, sparse.cc, symtab.cc, symtab.h, syscalls.cc,
toplev.cc, txt-eng-ft.cc, variables.cc, zfstream.cc, zfstream.h, Dork.m,
getStash.m, myStash.m, Gork.m, Pork.m, myStash.m, getStash.m, myStash.m,
getStash.m, myStash.m, fntests.m: Use Octave coding convention for
cuddled parenthis in function calls with empty argument lists.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Sun, 08 Jul 2012 11:28:50 -0700 |
| parents | 5bc9b9cb4362 |
| children | 3d8ace26c5b4 |
comparison
equal
deleted
inserted
replaced
| 14844:5bc9b9cb4362 | 14846:460a3c6d8bf1 |
|---|---|
| 158 } | 158 } |
| 159 | 159 |
| 160 ComplexNDArray | 160 ComplexNDArray |
| 161 NDArray::fourier2d (void) const | 161 NDArray::fourier2d (void) const |
| 162 { | 162 { |
| 163 dim_vector dv = dims(); | 163 dim_vector dv = dims (); |
| 164 if (dv.length () < 2) | 164 if (dv.length () < 2) |
| 165 return ComplexNDArray (); | 165 return ComplexNDArray (); |
| 166 | 166 |
| 167 dim_vector dv2(dv(0), dv(1)); | 167 dim_vector dv2(dv(0), dv(1)); |
| 168 const double *in = fortran_vec (); | 168 const double *in = fortran_vec (); |
| 169 ComplexNDArray retval (dv); | 169 ComplexNDArray retval (dv); |
| 170 Complex *out = retval.fortran_vec (); | 170 Complex *out = retval.fortran_vec (); |
| 171 octave_idx_type howmany = numel() / dv(0) / dv(1); | 171 octave_idx_type howmany = numel () / dv(0) / dv(1); |
| 172 octave_idx_type dist = dv(0) * dv(1); | 172 octave_idx_type dist = dv(0) * dv(1); |
| 173 | 173 |
| 174 for (octave_idx_type i=0; i < howmany; i++) | 174 for (octave_idx_type i=0; i < howmany; i++) |
| 175 octave_fftw::fftNd (in + i*dist, out + i*dist, 2, dv2); | 175 octave_fftw::fftNd (in + i*dist, out + i*dist, 2, dv2); |
| 176 | 176 |
| 178 } | 178 } |
| 179 | 179 |
| 180 ComplexNDArray | 180 ComplexNDArray |
| 181 NDArray::ifourier2d (void) const | 181 NDArray::ifourier2d (void) const |
| 182 { | 182 { |
| 183 dim_vector dv = dims(); | 183 dim_vector dv = dims (); |
| 184 if (dv.length () < 2) | 184 if (dv.length () < 2) |
| 185 return ComplexNDArray (); | 185 return ComplexNDArray (); |
| 186 | 186 |
| 187 dim_vector dv2(dv(0), dv(1)); | 187 dim_vector dv2(dv(0), dv(1)); |
| 188 ComplexNDArray retval (*this); | 188 ComplexNDArray retval (*this); |
| 189 Complex *out = retval.fortran_vec (); | 189 Complex *out = retval.fortran_vec (); |
| 190 octave_idx_type howmany = numel() / dv(0) / dv(1); | 190 octave_idx_type howmany = numel () / dv(0) / dv(1); |
| 191 octave_idx_type dist = dv(0) * dv(1); | 191 octave_idx_type dist = dv(0) * dv(1); |
| 192 | 192 |
| 193 for (octave_idx_type i=0; i < howmany; i++) | 193 for (octave_idx_type i=0; i < howmany; i++) |
| 194 octave_fftw::ifftNd (out + i*dist, out + i*dist, 2, dv2); | 194 octave_fftw::ifftNd (out + i*dist, out + i*dist, 2, dv2); |
| 195 | 195 |
| 342 } | 342 } |
| 343 | 343 |
| 344 ComplexNDArray | 344 ComplexNDArray |
| 345 NDArray::fourier2d (void) const | 345 NDArray::fourier2d (void) const |
| 346 { | 346 { |
| 347 dim_vector dv = dims(); | 347 dim_vector dv = dims (); |
| 348 dim_vector dv2 (dv(0), dv(1)); | 348 dim_vector dv2 (dv(0), dv(1)); |
| 349 int rank = 2; | 349 int rank = 2; |
| 350 ComplexNDArray retval (*this); | 350 ComplexNDArray retval (*this); |
| 351 octave_idx_type stride = 1; | 351 octave_idx_type stride = 1; |
| 352 | 352 |
| 390 } | 390 } |
| 391 | 391 |
| 392 ComplexNDArray | 392 ComplexNDArray |
| 393 NDArray::ifourier2d (void) const | 393 NDArray::ifourier2d (void) const |
| 394 { | 394 { |
| 395 dim_vector dv = dims(); | 395 dim_vector dv = dims (); |
| 396 dim_vector dv2 (dv(0), dv(1)); | 396 dim_vector dv2 (dv(0), dv(1)); |
| 397 int rank = 2; | 397 int rank = 2; |
| 398 ComplexNDArray retval (*this); | 398 ComplexNDArray retval (*this); |
| 399 octave_idx_type stride = 1; | 399 octave_idx_type stride = 1; |
| 400 | 400 |