Mercurial > hg > octave-nkf

comparison liboctave/Sparse-op-defs.h @ 14846:460a3c6d8bf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 72c96de7a403
children 3d8ace26c5b4
comparison
equal deleted inserted replaced
14844:5bc9b9cb4362 14846:460a3c6d8bf1
517 if (m1.elem(0,0) == 0.) \ 517 if (m1.elem(0,0) == 0.) \
518 r = R (m2_nr, m2_nc); \ 518 r = R (m2_nr, m2_nc); \
519 else \ 519 else \
520 { \ 520 { \
521 r = R (m2); \ 521 r = R (m2); \
522 octave_idx_type m2_nnz = m2.nnz(); \ 522 octave_idx_type m2_nnz = m2.nnz (); \
523 \ 523 \
524 for (octave_idx_type i = 0 ; i < m2_nnz ; i++) \ 524 for (octave_idx_type i = 0 ; i < m2_nnz ; i++) \
525 { \ 525 { \
526 octave_quit (); \ 526 octave_quit (); \
527 r.data (i) = m1.data(0) OP r.data(i); \ 527 r.data (i) = m1.data(0) OP r.data(i); \
534 if (m2.elem(0,0) == 0.) \ 534 if (m2.elem(0,0) == 0.) \
535 r = R (m1_nr, m1_nc); \ 535 r = R (m1_nr, m1_nc); \
536 else \ 536 else \
537 { \ 537 { \
538 r = R (m1); \ 538 r = R (m1); \
539 octave_idx_type m1_nnz = m1.nnz(); \ 539 octave_idx_type m1_nnz = m1.nnz (); \
540 \ 540 \
541 for (octave_idx_type i = 0 ; i < m1_nnz ; i++) \ 541 for (octave_idx_type i = 0 ; i < m1_nnz ; i++) \
542 { \ 542 { \
543 octave_quit (); \ 543 octave_quit (); \
544 r.data (i) = r.data(i) OP m2.data(0); \ 544 r.data (i) = r.data(i) OP m2.data(0); \
610 octave_idx_type m2_nr = m2.rows (); \ 610 octave_idx_type m2_nr = m2.rows (); \
611 octave_idx_type m2_nc = m2.cols (); \ 611 octave_idx_type m2_nc = m2.cols (); \
612 \ 612 \
613 if (m1_nr == 1 && m1_nc == 1) \ 613 if (m1_nr == 1 && m1_nc == 1) \
614 { \ 614 { \
615 if ((m1.elem (0,0) OP Complex()) == Complex()) \ 615 if ((m1.elem (0,0) OP Complex ()) == Complex ()) \
616 { \ 616 { \
617 octave_idx_type m2_nnz = m2.nnz(); \ 617 octave_idx_type m2_nnz = m2.nnz (); \
618 r = R (m2); \ 618 r = R (m2); \
619 for (octave_idx_type i = 0 ; i < m2_nnz ; i++) \ 619 for (octave_idx_type i = 0 ; i < m2_nnz ; i++) \
620 r.data (i) = m1.elem(0,0) OP r.data(i); \ 620 r.data (i) = m1.elem(0,0) OP r.data(i); \
621 r.maybe_compress (); \ 621 r.maybe_compress (); \
622 } \ 622 } \
636 r.maybe_compress (); \ 636 r.maybe_compress (); \
637 } \ 637 } \
638 } \ 638 } \
639 else if (m2_nr == 1 && m2_nc == 1) \ 639 else if (m2_nr == 1 && m2_nc == 1) \
640 { \ 640 { \
641 if ((Complex() OP m1.elem (0,0)) == Complex()) \ 641 if ((Complex () OP m1.elem (0,0)) == Complex ()) \
642 { \ 642 { \
643 octave_idx_type m1_nnz = m1.nnz(); \ 643 octave_idx_type m1_nnz = m1.nnz (); \
644 r = R (m1); \ 644 r = R (m1); \
645 for (octave_idx_type i = 0 ; i < m1_nnz ; i++) \ 645 for (octave_idx_type i = 0 ; i < m1_nnz ; i++) \
646 r.data (i) = r.data(i) OP m2.elem(0,0); \ 646 r.data (i) = r.data(i) OP m2.elem(0,0); \
647 r.maybe_compress (); \ 647 r.maybe_compress (); \
648 } \ 648 } \
649 else \ 649 else \
650 { \ 650 { \
651 r = R (m1_nr, m1_nc, Complex() OP m2.elem(0,0)); \ 651 r = R (m1_nr, m1_nc, Complex () OP m2.elem(0,0)); \
652 for (octave_idx_type j = 0 ; j < m1_nc ; j++) \ 652 for (octave_idx_type j = 0 ; j < m1_nc ; j++) \
653 { \ 653 { \
654 octave_quit (); \ 654 octave_quit (); \
655 octave_idx_type idxj = j * m1_nr; \ 655 octave_idx_type idxj = j * m1_nr; \
656 for (octave_idx_type i = m1.cidx(j) ; i < m1.cidx(j+1) ; i++) \ 656 for (octave_idx_type i = m1.cidx(j) ; i < m1.cidx(j+1) ; i++) \
1828 SPARSE_ANY_ALL_OP_ROW_CODE (TEST_OP, TEST_TRUE_VAL), \ 1828 SPARSE_ANY_ALL_OP_ROW_CODE (TEST_OP, TEST_TRUE_VAL), \
1829 SPARSE_ANY_ALL_OP_COL_CODE (TEST_OP, TEST_TRUE_VAL), \ 1829 SPARSE_ANY_ALL_OP_COL_CODE (TEST_OP, TEST_TRUE_VAL), \
1830 INIT_VAL, MT_RESULT) 1830 INIT_VAL, MT_RESULT)
1831 1831
1832 #define SPARSE_ALL_OP(DIM) \ 1832 #define SPARSE_ALL_OP(DIM) \
1833 if ((rows() == 1 && dim == -1) || dim == 1) \ 1833 if ((rows () == 1 && dim == -1) || dim == 1) \
1834 return transpose (). all (0). transpose(); \ 1834 return transpose (). all (0). transpose (); \
1835 else \ 1835 else \
1836 { \ 1836 { \
1837 SPARSE_ANY_ALL_OP (DIM, (cidx(j+1) - cidx(j) < nr ? false : true), \ 1837 SPARSE_ANY_ALL_OP (DIM, (cidx(j+1) - cidx(j) < nr ? false : true), \
1838 true, ==, false); \ 1838 true, ==, false); \
1839 } 1839 }
1848 octave_idx_type a_nc = a.cols (); \ 1848 octave_idx_type a_nc = a.cols (); \
1849 \ 1849 \
1850 if (nr == 1 && nc == 1) \ 1850 if (nr == 1 && nc == 1) \
1851 { \ 1851 { \
1852 RET_EL_TYPE s = m.elem(0,0); \ 1852 RET_EL_TYPE s = m.elem(0,0); \
1853 octave_idx_type nz = a.nnz(); \ 1853 octave_idx_type nz = a.nnz (); \
1854 RET_TYPE r (a_nr, a_nc, nz); \ 1854 RET_TYPE r (a_nr, a_nc, nz); \
1855 \ 1855 \
1856 for (octave_idx_type i = 0; i < nz; i++) \ 1856 for (octave_idx_type i = 0; i < nz; i++) \
1857 { \ 1857 { \
1858 octave_quit (); \ 1858 octave_quit (); \
1869 return r; \ 1869 return r; \
1870 } \ 1870 } \
1871 else if (a_nr == 1 && a_nc == 1) \ 1871 else if (a_nr == 1 && a_nc == 1) \
1872 { \ 1872 { \
1873 RET_EL_TYPE s = a.elem(0,0); \ 1873 RET_EL_TYPE s = a.elem(0,0); \
1874 octave_idx_type nz = m.nnz(); \ 1874 octave_idx_type nz = m.nnz (); \
1875 RET_TYPE r (nr, nc, nz); \ 1875 RET_TYPE r (nr, nc, nz); \
1876 \ 1876 \
1877 for (octave_idx_type i = 0; i < nz; i++) \ 1877 for (octave_idx_type i = 0; i < nz; i++) \
1878 { \ 1878 { \
1879 octave_quit (); \ 1879 octave_quit (); \
1944 /* The below is a simplication of the 'polyfit'-ed parameters */ \ 1944 /* The below is a simplication of the 'polyfit'-ed parameters */ \
1945 /* to these breakpoints */ \ 1945 /* to these breakpoints */ \
1946 octave_idx_type n_per_col = (a_nc > 43000 ? 43000 : \ 1946 octave_idx_type n_per_col = (a_nc > 43000 ? 43000 : \
1947 (a_nc * a_nc) / 43000); \ 1947 (a_nc * a_nc) / 43000); \
1948 octave_idx_type ii = 0; \ 1948 octave_idx_type ii = 0; \
1949 octave_idx_type *ri = retval.xridx(); \ 1949 octave_idx_type *ri = retval.xridx (); \
1950 octave_sort<octave_idx_type> sort; \ 1950 octave_sort<octave_idx_type> sort; \
1951 \ 1951 \
1952 for (octave_idx_type i = 0; i < a_nc ; i++) \ 1952 for (octave_idx_type i = 0; i < a_nc ; i++) \
1953 { \ 1953 { \
1954 if (retval.xcidx(i+1) - retval.xcidx(i) > n_per_col) \ 1954 if (retval.xcidx(i+1) - retval.xcidx(i) > n_per_col) \