Mercurial > octave-nkf
diff 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 |
line wrap: on
line diff
--- a/libinterp/corefcn/__ichol__.cc Mon Oct 05 12:03:16 2015 -0700 +++ b/libinterp/corefcn/__ichol__.cc Mon Oct 05 19:29:36 2015 -0400 @@ -221,8 +221,8 @@ sm = feval ("tril", param_list)(0).sparse_matrix_value (); ichol_0 <SparseMatrix, double, ichol_mult_real, ichol_checkpivot_real> (sm, michol); - if (! error_state) - retval(0) = sm; + + retval(0) = sm; } else { @@ -231,8 +231,8 @@ sm = feval ("tril", param_list)(0).sparse_complex_matrix_value (); ichol_0 <SparseComplexMatrix, Complex, ichol_mult_complex, ichol_checkpivot_complex> (sm, michol); - if (! error_state) - retval(0) = sm; + + retval(0) = sm; } return retval; @@ -428,17 +428,16 @@ } } - if (! error_state) + // Build the output matrices + L = octave_matrix_t (n, n, total_len); + + for (i = 0; i <= n; i++) + L.cidx (i) = cidx_l[i]; + + for (i = 0; i < total_len; i++) { - // Build the output matrices - L = octave_matrix_t (n, n, total_len); - for (i = 0; i <= n; i++) - L.cidx (i) = cidx_l[i]; - for (i = 0; i < total_len; i++) - { - L.ridx (i) = ridx_l[i]; - L.data (i) = data_l[i]; - } + L.ridx (i) = ridx_l[i]; + L.data (i) = data_l[i]; } } @@ -486,8 +485,8 @@ ichol_t <SparseMatrix, double, ichol_mult_real, ichol_checkpivot_real> (sm_l, L, cols_norm.fortran_vec (), droptol, michol); - if (! error_state) - retval(0) = L; + + retval(0) = L; } else { @@ -505,8 +504,8 @@ Complex, ichol_mult_complex, ichol_checkpivot_complex> (sm_l, L, cols_norm.fortran_vec (), Complex (droptol), michol); - if (! error_state) - retval(0) = L; + + retval(0) = L; } return retval;