octave: liboctave/array/CSparse.cc comparison

comparison liboctave/array/CSparse.cc @ 21100:e39e05d90788

Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. * libinterp/corefcn/errwarn.h, libinterp/corefcn/errwarn.cc: New header and .cc file with common errors and warnings for libinterp. * libinterp/corefcn/module.mk: Add errwarn.h, errwarn.cc to build system. * liboctave/util/lo-array-errwarn.h, liboctave/util/lo-array-errwarn.cc: New header and .cc file with common errors and warnings for liboctave. * liboctave/util/module.mk: Add lo-array-errwarn.h, lo-array-errwarn.cc to build system. * lo-array-gripes.h: #include "lo-array-errwarn.h" for access to class index_exception. Remove const char *error_id_XXX prototypes. * lo-array-gripes.cc: Remove const char *error_id_XXX initializations. Remove index_exception method definitions. * Cell.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, betainc.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, defaults.cc, det.cc, dirfns.cc, eig.cc, fft.cc, fft2.cc, fftn.cc, find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, graphics.in.h, help.cc, hess.cc, hex2num.cc, input.cc, inv.cc, jit-typeinfo.cc, load-save.cc, lookup.cc, ls-hdf5.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lsode.cc, lu.cc, luinc.cc, max.cc, mgorth.cc, oct-hist.cc, oct-procbuf.cc, oct-stream.cc, oct.h, pager.cc, pinv.cc, pr-output.cc, quad.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, syscalls.cc, typecast.cc, utils.cc, variables.cc, xdiv.cc, xnorm.cc, xpow.cc, __eigs__.cc, __glpk__.cc, __magick_read__.cc, __osmesa_print__.cc, audiodevinfo.cc, audioread.cc, chol.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-complex.cc, ov-complex.h, ov-cs-list.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-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-mex-fcn.cc, ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-struct.cc, ov-type-conv.h, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc, ov.cc, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dms-template.cc, op-double-conv.cc, op-fcdm-fcdm.cc, op-fcdm-fdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int-conv.cc, op-int.h, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.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-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.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-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, ops.h, lex.ll, pt-assign.cc, pt-eval.cc, pt-idx.cc, pt-loop.cc, pt-mat.cc, pt-stmt.cc, Array-util.cc, Array-util.h, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MDiagArray2.cc, MSparse.cc, PermMatrix.cc, Range.cc, Sparse.cc, dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc, CmplxGEPBAL.cc, dbleGEPBAL.cc, fCmplxGEPBAL.cc, floatGEPBAL.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h, Sparse-perm-op-defs.h, mx-inlines.cc, mx-op-defs.h, oct-binmap.h: Replace 'include "gripes.h"' with 'include "errwarn.h". Change all gripe_XXX to err_XXX or warn_XXX or errwarn_XXX.

author	Rik <rik@octave.org>
date	Mon, 18 Jan 2016 18:28:06 -0800
parents	77f5591878bf
children	bd1752782e56

comparison

equal deleted inserted replaced

-:52af4092f863
+:e39e05d90788
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 volatile double rcond_plus_one = rcond + 1.0;
 if (rcond_plus_one == 1.0 || xisnan (rcond))
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 (*current_liboctave_error_handler) ("incorrect matrix type");
 }
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 volatile double rcond_plus_one = rcond + 1.0;
 if (rcond_plus_one == 1.0 || xisnan (rcond))
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 (*current_liboctave_error_handler) ("incorrect matrix type");
 }
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 volatile double rcond_plus_one = rcond + 1.0;
 if (rcond_plus_one == 1.0 || xisnan (rcond))
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 (*current_liboctave_error_handler) ("incorrect matrix type");
 }
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 volatile double rcond_plus_one = rcond + 1.0;
 if (rcond_plus_one == 1.0 || xisnan (rcond))
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 (*current_liboctave_error_handler) ("incorrect matrix type");
 }
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 volatile double rcond_plus_one = rcond + 1.0;
 if (rcond_plus_one == 1.0 || xisnan (rcond))
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 (*current_liboctave_error_handler) ("incorrect matrix type");
 }
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 volatile double rcond_plus_one = rcond + 1.0;
 if (rcond_plus_one == 1.0 || xisnan (rcond))
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 (*current_liboctave_error_handler) ("incorrect matrix type");
 }
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 volatile double rcond_plus_one = rcond + 1.0;
 if (rcond_plus_one == 1.0 || xisnan (rcond))
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 (*current_liboctave_error_handler) ("incorrect matrix type");
 }
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 volatile double rcond_plus_one = rcond + 1.0;
 if (rcond_plus_one == 1.0 || xisnan (rcond))
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 (*current_liboctave_error_handler) ("incorrect matrix type");
 }
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix ();
+errwarn_singular_matrix ();
 }
 else
 rcond = 1.;
 }
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix ();
+errwarn_singular_matrix ();
 }
 else
 {
 char job = 'N';
 volatile octave_idx_type x_nz = b.nnz ();
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix ();
+errwarn_singular_matrix ();
 }
 }
 else if (typ != MatrixType::Tridiagonal_Hermitian)
 (*current_liboctave_error_handler) ("incorrect matrix type");
 }
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix ();
+errwarn_singular_matrix ();
 }
 else
 {
 rcond = 1.;
 char job = 'N';
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 rcond = 1.0;
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix ();
+errwarn_singular_matrix ();
 }
 else
 {
 if (calc_cond)
 {
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 rcond = 1.;
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 rcond = 1.0;
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix ();
+errwarn_singular_matrix ();
 }
 else
 {
 if (calc_cond)
 {
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 rcond = 1.;
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 rcond = 1.0;
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix ();
+errwarn_singular_matrix ();
 }
 else
 {
 if (calc_cond)
 {
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 rcond = 1.;
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 rcond = 1.0;
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix ();
+errwarn_singular_matrix ();
 }
 else
 {
 if (calc_cond)
 {
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 }
 else
 rcond = 1.;
 err = -2;
 if (sing_handler)
 sing_handler (rcond);
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 else if (status < 0)
 {
 (*current_liboctave_error_handler)
 ("SparseComplexMatrix::solve numeric factorization failed");
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 return retval;
 }
 cholmod_dense *X;
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 return retval;
 }
 cholmod_sparse *X;
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 return retval;
 }
 cholmod_dense *X;
 {
 sing_handler (rcond);
 mattype.mark_as_rectangular ();
 }
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 return retval;
 }
 cholmod_sparse *X;
 err = -2;
 if (sing_handler)
 sing_handler (rcond);
 else
-gripe_singular_matrix (rcond);
+errwarn_singular_matrix (rcond);
 }
 UMFPACK_ZNAME (report_info) (control, info);
 UMFPACK_ZNAME (free_numeric) (&Numeric);
 // unary operations
 SparseBoolMatrix
 SparseComplexMatrix::operator ! (void) const
 {
 if (any_element_is_nan ())
-gripe_nan_to_logical_conversion ();
+err_nan_to_logical_conversion ();
 octave_idx_type nr = rows ();
 octave_idx_type nc = cols ();
 octave_idx_type nz1 = nnz ();
 octave_idx_type nz2 = nr*nc - nz1;
 if (a_nr == 0 || a_nc == 0)
 r.resize (a_nr, a_nc);
 else if (b_nr == 0 || b_nc == 0)
 r.resize (b_nr, b_nc);
 else
-gripe_nonconformant ("min", a_nr, a_nc, b_nr, b_nc);
+err_nonconformant ("min", a_nr, a_nc, b_nr, b_nc);
 }
 return r;
 }
 if (a_nr == 0 || a_nc == 0)
 r.resize (a_nr, a_nc);
 else if (b_nr == 0 || b_nc == 0)
 r.resize (b_nr, b_nc);
 else
-gripe_nonconformant ("max", a_nr, a_nc, b_nr, b_nc);
+err_nonconformant ("max", a_nr, a_nc, b_nr, b_nc);
 }
 return r;
 }

Mercurial > octave

comparison liboctave/array/CSparse.cc @ 21100:e39e05d90788