Mercurial > hg > octave-jordi

comparison liboctave/array/dSparse.cc @ 20954:77f5591878bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use '! expr' rather than '!expr' to conform to coding guidelines. * dialog.h, documentation-dock-widget.cc, files-dock-widget.cc, find-files-dialog.cc, file-editor-tab.cc, file-editor.cc, find-dialog.cc, octave-qscintilla.cc, main-window.cc, parser.cc, resource-manager.cc, workspace-view.cc, data.cc, dlmread.cc, gl-render.cc, gl2ps-renderer.cc, graphics.cc, graphics.in.h, ls-hdf5.cc, ls-mat5.cc, ls-oct-binary.cc, lsode.cc, mappers.cc, pt-jit.cc, regexp.cc, spparms.cc, symtab.h, utils.cc, zfstream.cc, __eigs__.cc, __glpk__.cc, __init_fltk__.cc, ccolamd.cc, colamd.cc, ov-base-diag.cc, ov-base-int.cc, ov-base-sparse.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-class.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-java.cc, ov-perm.cc, ov-re-sparse.cc, ov-str-mat.cc, ov-struct.cc, ov.cc, pt-mat.cc, Array.cc, Array.h, CMatrix.cc, CSparse.cc, MatrixType.cc, PermMatrix.cc, Sparse.h, dMatrix.cc, dSparse.cc, fCMatrix.cc, fMatrix.cc, idx-vector.cc, CollocWt.h, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseQR.cc, SparsedbleLU.cc, base-qr.cc, eigs-base.cc, oct-fftw.cc, randmtzig.c, sparse-dmsolve.cc, kpse.cc, lo-regexp.cc, oct-locbuf.h, url-transfer.cc, url-transfer.h, bitset.m, interp2.m, __isequal__.m, inpolygon.m, questdlg.m, help.m, compare_versions.m, substruct.m, configure_make.m, whitebg.m, __marching_cube__.m, struct2hdl.m, polyfit.m, spline.m, unique.m, svds.m, ellipke.m, binoinv.m, hygepdf.m, nbininv.m, poissinv.m, tcdf.m, unidcdf.m, unidpdf.m, dec2base.m, assert.m, weekday.m, mkoctfile.in.cc: maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
author Rik <rik@octave.org>
date Sun, 20 Dec 2015 10:15:02 -0800
parents 17d647821d61
children
comparison
equal deleted inserted replaced
20953:6982def1d416 20954:77f5591878bf
1218 // Matrix is either singular or not positive definite 1218 // Matrix is either singular or not positive definite
1219 mattype.mark_as_unsymmetric (); 1219 mattype.mark_as_unsymmetric ();
1220 } 1220 }
1221 } 1221 }
1222 1222
1223 if (!mattype.is_hermitian ()) 1223 if (! mattype.is_hermitian ())
1224 { 1224 {
1225 octave_idx_type n = rows (); 1225 octave_idx_type n = rows ();
1226 ColumnVector Qinit(n); 1226 ColumnVector Qinit(n);
1227 for (octave_idx_type i = 0; i < n; i++) 1227 for (octave_idx_type i = 0; i < n; i++)
1228 Qinit(i) = i; 1228 Qinit(i) = i;
1278 Matrix Control (UMFPACK_CONTROL, 1); 1278 Matrix Control (UMFPACK_CONTROL, 1);
1279 double *control = Control.fortran_vec (); 1279 double *control = Control.fortran_vec ();
1280 UMFPACK_DNAME (defaults) (control); 1280 UMFPACK_DNAME (defaults) (control);
1281 1281
1282 double tmp = octave_sparse_params::get_key ("spumoni"); 1282 double tmp = octave_sparse_params::get_key ("spumoni");
1283 if (!xisnan (tmp)) 1283 if (! xisnan (tmp))
1284 Control (UMFPACK_PRL) = tmp; 1284 Control (UMFPACK_PRL) = tmp;
1285 1285
1286 tmp = octave_sparse_params::get_key ("piv_tol"); 1286 tmp = octave_sparse_params::get_key ("piv_tol");
1287 if (!xisnan (tmp)) 1287 if (! xisnan (tmp))
1288 { 1288 {
1289 Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; 1289 Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp;
1290 Control (UMFPACK_PIVOT_TOLERANCE) = tmp; 1290 Control (UMFPACK_PIVOT_TOLERANCE) = tmp;
1291 } 1291 }
1292 1292
1293 // Set whether we are allowed to modify Q or not 1293 // Set whether we are allowed to modify Q or not
1294 tmp = octave_sparse_params::get_key ("autoamd"); 1294 tmp = octave_sparse_params::get_key ("autoamd");
1295 if (!xisnan (tmp)) 1295 if (! xisnan (tmp))
1296 Control (UMFPACK_FIXQ) = tmp; 1296 Control (UMFPACK_FIXQ) = tmp;
1297 1297
1298 // Turn-off UMFPACK scaling for LU 1298 // Turn-off UMFPACK scaling for LU
1299 Control (UMFPACK_SCALE) = UMFPACK_SCALE_NONE; 1299 Control (UMFPACK_SCALE) = UMFPACK_SCALE_NONE;
1300 1300
5659 Control = Matrix (UMFPACK_CONTROL, 1); 5659 Control = Matrix (UMFPACK_CONTROL, 1);
5660 double *control = Control.fortran_vec (); 5660 double *control = Control.fortran_vec ();
5661 UMFPACK_DNAME (defaults) (control); 5661 UMFPACK_DNAME (defaults) (control);
5662 5662
5663 double tmp = octave_sparse_params::get_key ("spumoni"); 5663 double tmp = octave_sparse_params::get_key ("spumoni");
5664 if (!xisnan (tmp)) 5664 if (! xisnan (tmp))
5665 Control (UMFPACK_PRL) = tmp; 5665 Control (UMFPACK_PRL) = tmp;
5666 tmp = octave_sparse_params::get_key ("piv_tol"); 5666 tmp = octave_sparse_params::get_key ("piv_tol");
5667 if (!xisnan (tmp)) 5667 if (! xisnan (tmp))
5668 { 5668 {
5669 Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; 5669 Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp;
5670 Control (UMFPACK_PIVOT_TOLERANCE) = tmp; 5670 Control (UMFPACK_PIVOT_TOLERANCE) = tmp;
5671 } 5671 }
5672 5672
5673 // Set whether we are allowed to modify Q or not 5673 // Set whether we are allowed to modify Q or not
5674 tmp = octave_sparse_params::get_key ("autoamd"); 5674 tmp = octave_sparse_params::get_key ("autoamd");
5675 if (!xisnan (tmp)) 5675 if (! xisnan (tmp))
5676 Control (UMFPACK_FIXQ) = tmp; 5676 Control (UMFPACK_FIXQ) = tmp;
5677 5677
5678 UMFPACK_DNAME (report_control) (control); 5678 UMFPACK_DNAME (report_control) (control);
5679 5679
5680 const octave_idx_type *Ap = cidx (); 5680 const octave_idx_type *Ap = cidx ();