Mercurial > hg > octave-lyh

comparison liboctave/CMatrix.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 e8e86ae3abbc
children 3d8ace26c5b4
comparison
equal deleted inserted replaced
14844:5bc9b9cb4362 14846:460a3c6d8bf1
1087 info = 0; 1087 info = 0;
1088 1088
1089 // Calculate the norm of the matrix, for later use. 1089 // Calculate the norm of the matrix, for later use.
1090 double anorm; 1090 double anorm;
1091 if (calc_cond) 1091 if (calc_cond)
1092 anorm = retval.abs().sum().row(static_cast<octave_idx_type>(0)).max(); 1092 anorm = retval.abs ().sum ().row(static_cast<octave_idx_type>(0)).max ();
1093 1093
1094 F77_XFCN (zgetrf, ZGETRF, (nc, nc, tmp_data, nr, pipvt, info)); 1094 F77_XFCN (zgetrf, ZGETRF, (nc, nc, tmp_data, nr, pipvt, info));
1095 1095
1096 // Throw-away extra info LAPACK gives so as to not change output. 1096 // Throw-away extra info LAPACK gives so as to not change output.
1097 rcon = 0.0; 1097 rcon = 0.0;
1125 if (zgetri_info != 0) 1125 if (zgetri_info != 0)
1126 info = -1; 1126 info = -1;
1127 } 1127 }
1128 1128
1129 if (info != 0) 1129 if (info != 0)
1130 mattype.mark_as_rectangular(); 1130 mattype.mark_as_rectangular ();
1131 } 1131 }
1132 1132
1133 return retval; 1133 return retval;
1134 } 1134 }
1135 1135
1151 { 1151 {
1152 ComplexCHOL chol (*this, info, calc_cond); 1152 ComplexCHOL chol (*this, info, calc_cond);
1153 if (info == 0) 1153 if (info == 0)
1154 { 1154 {
1155 if (calc_cond) 1155 if (calc_cond)
1156 rcon = chol.rcond(); 1156 rcon = chol.rcond ();
1157 else 1157 else
1158 rcon = 1.0; 1158 rcon = 1.0;
1159 ret = chol.inverse (); 1159 ret = chol.inverse ();
1160 } 1160 }
1161 else 1161 else
1791 1791
1792 if (typ == MatrixType::Hermitian) 1792 if (typ == MatrixType::Hermitian)
1793 { 1793 {
1794 octave_idx_type info = 0; 1794 octave_idx_type info = 0;
1795 char job = 'L'; 1795 char job = 'L';
1796 anorm = atmp.abs().sum(). 1796 anorm = atmp.abs ().sum ().
1797 row(static_cast<octave_idx_type>(0)).max(); 1797 row(static_cast<octave_idx_type>(0)).max ();
1798 1798
1799 F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, 1799 F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
1800 tmp_data, nr, info 1800 tmp_data, nr, info
1801 F77_CHAR_ARG_LEN (1))); 1801 F77_CHAR_ARG_LEN (1)));
1802 1802
1831 1831
1832 Array<octave_idx_type> ipvt (dim_vector (nr, 1)); 1832 Array<octave_idx_type> ipvt (dim_vector (nr, 1));
1833 octave_idx_type *pipvt = ipvt.fortran_vec (); 1833 octave_idx_type *pipvt = ipvt.fortran_vec ();
1834 1834
1835 if(anorm < 0.) 1835 if(anorm < 0.)
1836 anorm = atmp.abs().sum(). 1836 anorm = atmp.abs ().sum ().
1837 row(static_cast<octave_idx_type>(0)).max(); 1837 row(static_cast<octave_idx_type>(0)).max ();
1838 1838
1839 Array<Complex> z (dim_vector (2 * nc, 1)); 1839 Array<Complex> z (dim_vector (2 * nc, 1));
1840 Complex *pz = z.fortran_vec (); 1840 Complex *pz = z.fortran_vec ();
1841 Array<double> rz (dim_vector (2 * nc, 1)); 1841 Array<double> rz (dim_vector (2 * nc, 1));
1842 double *prz = rz.fortran_vec (); 1842 double *prz = rz.fortran_vec ();
2098 { 2098 {
2099 info = 0; 2099 info = 0;
2100 char job = 'L'; 2100 char job = 'L';
2101 ComplexMatrix atmp = *this; 2101 ComplexMatrix atmp = *this;
2102 Complex *tmp_data = atmp.fortran_vec (); 2102 Complex *tmp_data = atmp.fortran_vec ();
2103 anorm = atmp.abs().sum().row(static_cast<octave_idx_type>(0)).max(); 2103 anorm = atmp.abs ().sum ().row(static_cast<octave_idx_type>(0)).max ();
2104 2104
2105 F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, 2105 F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
2106 tmp_data, nr, info 2106 tmp_data, nr, info
2107 F77_CHAR_ARG_LEN (1))); 2107 F77_CHAR_ARG_LEN (1)));
2108 2108
2154 2154
2155 octave_idx_type b_nc = b.cols (); 2155 octave_idx_type b_nc = b.cols ();
2156 2156
2157 F77_XFCN (zpotrs, ZPOTRS, (F77_CONST_CHAR_ARG2 (&job, 1), 2157 F77_XFCN (zpotrs, ZPOTRS, (F77_CONST_CHAR_ARG2 (&job, 1),
2158 nr, b_nc, tmp_data, nr, 2158 nr, b_nc, tmp_data, nr,
2159 result, b.rows(), info 2159 result, b.rows (), info
2160 F77_CHAR_ARG_LEN (1))); 2160 F77_CHAR_ARG_LEN (1)));
2161 } 2161 }
2162 else 2162 else
2163 { 2163 {
2164 mattype.mark_as_unsymmetric (); 2164 mattype.mark_as_unsymmetric ();
2182 Array<double> rz (dim_vector (2 * nc, 1)); 2182 Array<double> rz (dim_vector (2 * nc, 1));
2183 double *prz = rz.fortran_vec (); 2183 double *prz = rz.fortran_vec ();
2184 2184
2185 // Calculate the norm of the matrix, for later use. 2185 // Calculate the norm of the matrix, for later use.
2186 if (anorm < 0.) 2186 if (anorm < 0.)
2187 anorm = atmp.abs().sum().row(static_cast<octave_idx_type>(0)).max(); 2187 anorm = atmp.abs ().sum ().row(static_cast<octave_idx_type>(0)).max ();
2188 2188
2189 F77_XFCN (zgetrf, ZGETRF, (nr, nr, tmp_data, nr, pipvt, info)); 2189 F77_XFCN (zgetrf, ZGETRF, (nr, nr, tmp_data, nr, pipvt, info));
2190 2190
2191 // Throw-away extra info LAPACK gives so as to not change output. 2191 // Throw-away extra info LAPACK gives so as to not change output.
2192 rcon = 0.0; 2192 rcon = 0.0;
2240 octave_idx_type b_nc = b.cols (); 2240 octave_idx_type b_nc = b.cols ();
2241 2241
2242 char job = 'N'; 2242 char job = 'N';
2243 F77_XFCN (zgetrs, ZGETRS, (F77_CONST_CHAR_ARG2 (&job, 1), 2243 F77_XFCN (zgetrs, ZGETRS, (F77_CONST_CHAR_ARG2 (&job, 1),
2244 nr, b_nc, tmp_data, nr, 2244 nr, b_nc, tmp_data, nr,
2245 pipvt, result, b.rows(), info 2245 pipvt, result, b.rows (), info
2246 F77_CHAR_ARG_LEN (1))); 2246 F77_CHAR_ARG_LEN (1)));
2247 } 2247 }
2248 else 2248 else
2249 mattype.mark_as_rectangular (); 2249 mattype.mark_as_rectangular ();
2250 } 2250 }