Mercurial > octave-nkf
comparison libinterp/corefcn/__ichol__.cc @ 20587:f90c8372b7ba
eliminate many more simple uses of error_state
* Cell.cc, __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, colloc.cc,
det.cc, dlmread.cc, dynamic-ld.cc, eig.cc, fft.cc, fft2.cc, fftn.cc,
gcd.cc, getgrent.cc, getpwent.cc, givens.cc, hess.cc, input.cc,
levenshtein.cc, load-path.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc,
lsode.cc, lu.cc, max.cc, md5sum.cc, mex.cc, pager.cc, pinv.cc,
pr-output.cc, qz.cc, schur.cc, sparse.cc, sqrtm.cc, str2double.cc,
strfns.cc, sub2ind.cc, sysdep.cc, time.cc, toplev.cc, tril.cc,
tsearch.cc, typecast.cc, __init_gnuplot__.cc, __magick_read__.cc,
__osmesa_print__.cc, amd.cc, audiodevinfo.cc, dmperm.cc, fftw.cc,
symrcm.cc, ov-base-diag.cc, ov-base-sparse.cc, ov-base.cc,
ov-bool-sparse.cc, ov-builtin.cc, ov-complex.cc, ov-cx-diag.cc,
ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc,
ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-lazy-idx.cc, ov-mex-fcn.cc,
ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc,
ov-scalar.cc, ov-str-mat.cc, op-bm-b.cc, op-bm-bm.cc, op-sbm-b.cc,
op-sbm-bm.cc, op-str-m.cc, op-str-s.cc, oct-parse.in.yy, pt-cbinop.cc,
pt-colon.cc, pt-decl.cc, pt-exp.cc, pt-id.cc, pt-misc.cc,
pt-select.cc, pt-unop.cc: Eliminate simple uses of error_state.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 05 Oct 2015 19:29:36 -0400 |
| parents | 12ecb7212b44 |
| children |
comparison
equal
deleted
inserted
replaced
| 20586:b7ac1e94266e | 20587:f90c8372b7ba |
|---|---|
| 219 SparseMatrix sm = args(0).sparse_matrix_value (); | 219 SparseMatrix sm = args(0).sparse_matrix_value (); |
| 220 param_list.append (sm); | 220 param_list.append (sm); |
| 221 sm = feval ("tril", param_list)(0).sparse_matrix_value (); | 221 sm = feval ("tril", param_list)(0).sparse_matrix_value (); |
| 222 ichol_0 <SparseMatrix, double, ichol_mult_real, | 222 ichol_0 <SparseMatrix, double, ichol_mult_real, |
| 223 ichol_checkpivot_real> (sm, michol); | 223 ichol_checkpivot_real> (sm, michol); |
| 224 if (! error_state) | 224 |
| 225 retval(0) = sm; | 225 retval(0) = sm; |
| 226 } | 226 } |
| 227 else | 227 else |
| 228 { | 228 { |
| 229 SparseComplexMatrix sm = args(0).sparse_complex_matrix_value (); | 229 SparseComplexMatrix sm = args(0).sparse_complex_matrix_value (); |
| 230 param_list.append (sm); | 230 param_list.append (sm); |
| 231 sm = feval ("tril", param_list)(0).sparse_complex_matrix_value (); | 231 sm = feval ("tril", param_list)(0).sparse_complex_matrix_value (); |
| 232 ichol_0 <SparseComplexMatrix, Complex, ichol_mult_complex, | 232 ichol_0 <SparseComplexMatrix, Complex, ichol_mult_complex, |
| 233 ichol_checkpivot_complex> (sm, michol); | 233 ichol_checkpivot_complex> (sm, michol); |
| 234 if (! error_state) | 234 |
| 235 retval(0) = sm; | 235 retval(0) = sm; |
| 236 } | 236 } |
| 237 | 237 |
| 238 return retval; | 238 return retval; |
| 239 } | 239 } |
| 240 | 240 |
| 426 Llist[jjrow] = k; | 426 Llist[jjrow] = k; |
| 427 } | 427 } |
| 428 } | 428 } |
| 429 } | 429 } |
| 430 | 430 |
| 431 if (! error_state) | 431 // Build the output matrices |
| 432 { | 432 L = octave_matrix_t (n, n, total_len); |
| 433 // Build the output matrices | 433 |
| 434 L = octave_matrix_t (n, n, total_len); | 434 for (i = 0; i <= n; i++) |
| 435 for (i = 0; i <= n; i++) | 435 L.cidx (i) = cidx_l[i]; |
| 436 L.cidx (i) = cidx_l[i]; | 436 |
| 437 for (i = 0; i < total_len; i++) | 437 for (i = 0; i < total_len; i++) |
| 438 { | 438 { |
| 439 L.ridx (i) = ridx_l[i]; | 439 L.ridx (i) = ridx_l[i]; |
| 440 L.data (i) = data_l[i]; | 440 L.data (i) = data_l[i]; |
| 441 } | |
| 442 } | 441 } |
| 443 } | 442 } |
| 444 | 443 |
| 445 DEFUN (__icholt__, args, nargout, | 444 DEFUN (__icholt__, args, nargout, |
| 446 "-*- texinfo -*-\n\ | 445 "-*- texinfo -*-\n\ |
| 484 cols_norm = feval ("norm", param_list)(0).vector_value (); | 483 cols_norm = feval ("norm", param_list)(0).vector_value (); |
| 485 param_list.clear (); | 484 param_list.clear (); |
| 486 ichol_t <SparseMatrix, | 485 ichol_t <SparseMatrix, |
| 487 double, ichol_mult_real, ichol_checkpivot_real> | 486 double, ichol_mult_real, ichol_checkpivot_real> |
| 488 (sm_l, L, cols_norm.fortran_vec (), droptol, michol); | 487 (sm_l, L, cols_norm.fortran_vec (), droptol, michol); |
| 489 if (! error_state) | 488 |
| 490 retval(0) = L; | 489 retval(0) = L; |
| 491 } | 490 } |
| 492 else | 491 else |
| 493 { | 492 { |
| 494 Array <Complex> cols_norm; | 493 Array <Complex> cols_norm; |
| 495 SparseComplexMatrix L; | 494 SparseComplexMatrix L; |
| 503 param_list.clear (); | 502 param_list.clear (); |
| 504 ichol_t <SparseComplexMatrix, | 503 ichol_t <SparseComplexMatrix, |
| 505 Complex, ichol_mult_complex, ichol_checkpivot_complex> | 504 Complex, ichol_mult_complex, ichol_checkpivot_complex> |
| 506 (sm_l, L, cols_norm.fortran_vec (), | 505 (sm_l, L, cols_norm.fortran_vec (), |
| 507 Complex (droptol), michol); | 506 Complex (droptol), michol); |
| 508 if (! error_state) | 507 |
| 509 retval(0) = L; | 508 retval(0) = L; |
| 510 } | 509 } |
| 511 | 510 |
| 512 return retval; | 511 return retval; |
| 513 } | 512 } |
| 514 | 513 |