Mercurial > hg > octave-lyh

comparison src/ov-re-sparse.cc @ 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 cb85e836d035
children f7afecdd87ef
comparison
equal deleted inserted replaced
14844:5bc9b9cb4362 14846:460a3c6d8bf1
259 259
260 bool 260 bool
261 octave_sparse_matrix::save_binary (std::ostream& os, bool&save_as_floats) 261 octave_sparse_matrix::save_binary (std::ostream& os, bool&save_as_floats)
262 { 262 {
263 dim_vector d = this->dims (); 263 dim_vector d = this->dims ();
264 if (d.length() < 1) 264 if (d.length () < 1)
265 return false; 265 return false;
266 266
267 // Ensure that additional memory is deallocated 267 // Ensure that additional memory is deallocated
268 matrix.maybe_compress (); 268 matrix.maybe_compress ();
269 269
317 octave_quit (); 317 octave_quit ();
318 itmp = matrix.ridx(i); 318 itmp = matrix.ridx(i);
319 os.write (reinterpret_cast<char *> (&itmp), 4); 319 os.write (reinterpret_cast<char *> (&itmp), 4);
320 } 320 }
321 321
322 write_doubles (os, matrix.data(), st, nz); 322 write_doubles (os, matrix.data (), st, nz);
323 323
324 return true; 324 return true;
325 } 325 }
326 326
327 bool 327 bool
504 return false; 504 return false;
505 } 505 }
506 506
507 H5Sclose (space_hid); 507 H5Sclose (space_hid);
508 508
509 hdims[0] = m.cols() + 1; 509 hdims[0] = m.cols () + 1;
510 hdims[1] = 1; 510 hdims[1] = 1;
511 511
512 space_hid = H5Screate_simple (2, hdims, 0); 512 space_hid = H5Screate_simple (2, hdims, 0);
513 513
514 if (space_hid < 0) 514 if (space_hid < 0)
855 #endif 855 #endif
856 856
857 mxArray * 857 mxArray *
858 octave_sparse_matrix::as_mxArray (void) const 858 octave_sparse_matrix::as_mxArray (void) const
859 { 859 {
860 mwSize nz = nzmax(); 860 mwSize nz = nzmax ();
861 mwSize nr = rows(); 861 mwSize nr = rows ();
862 mwSize nc = columns(); 862 mwSize nc = columns ();
863 mxArray *retval = new mxArray (mxDOUBLE_CLASS, nr, nc, nz, mxREAL); 863 mxArray *retval = new mxArray (mxDOUBLE_CLASS, nr, nc, nz, mxREAL);
864 double *pr = static_cast<double *> (retval->get_data ()); 864 double *pr = static_cast<double *> (retval->get_data ());
865 mwIndex *ir = retval->get_ir(); 865 mwIndex *ir = retval->get_ir ();
866 mwIndex *jc = retval->get_jc(); 866 mwIndex *jc = retval->get_jc ();
867 867
868 for (mwIndex i = 0; i < nz; i++) 868 for (mwIndex i = 0; i < nz; i++)
869 { 869 {
870 pr[i] = matrix.data(i); 870 pr[i] = matrix.data(i);
871 ir[i] = matrix.ridx(i); 871 ir[i] = matrix.ridx(i);