Mercurial > octave
comparison libinterp/octave-value/ov-re-sparse.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 | 6176560b03d9 |
| children | dfcb9d74b253 |
comparison
equal
deleted
inserted
replaced
| 21099:52af4092f863 | 21100:e39e05d90788 |
|---|---|
| 34 #include "oct-locbuf.h" | 34 #include "oct-locbuf.h" |
| 35 | 35 |
| 36 #include "mxarray.h" | 36 #include "mxarray.h" |
| 37 #include "ov-base.h" | 37 #include "ov-base.h" |
| 38 #include "ov-scalar.h" | 38 #include "ov-scalar.h" |
| 39 #include "gripes.h" | 39 #include "errwarn.h" |
| 40 | 40 |
| 41 #include "oct-hdf5.h" | 41 #include "oct-hdf5.h" |
| 42 #include "ls-hdf5.h" | 42 #include "ls-hdf5.h" |
| 43 | 43 |
| 44 #include "ov-re-sparse.h" | 44 #include "ov-re-sparse.h" |
| 60 if (matrix.numel () == matrix.nnz ()) | 60 if (matrix.numel () == matrix.nnz ()) |
| 61 return idx_vector (array_value ()); | 61 return idx_vector (array_value ()); |
| 62 else | 62 else |
| 63 { | 63 { |
| 64 std::string nm = "<" + type_name () + ">"; | 64 std::string nm = "<" + type_name () + ">"; |
| 65 gripe_invalid_index (nm.c_str ()); | 65 err_invalid_index (nm.c_str ()); |
| 66 } | 66 } |
| 67 } | 67 } |
| 68 | 68 |
| 69 octave_base_value * | 69 octave_base_value * |
| 70 octave_sparse_matrix::try_narrowing_conversion (void) | 70 octave_sparse_matrix::try_narrowing_conversion (void) |
| 98 double retval = lo_ieee_nan_value (); | 98 double retval = lo_ieee_nan_value (); |
| 99 | 99 |
| 100 if (numel () > 0) | 100 if (numel () > 0) |
| 101 { | 101 { |
| 102 if (numel () > 1) | 102 if (numel () > 1) |
| 103 gripe_implicit_conversion ("Octave:array-to-scalar", | 103 warn_implicit_conversion ("Octave:array-to-scalar", |
| 104 "real sparse matrix", "real scalar"); | 104 "real sparse matrix", "real scalar"); |
| 105 | 105 |
| 106 retval = matrix (0, 0); | 106 retval = matrix (0, 0); |
| 107 } | 107 } |
| 108 else | 108 else |
| 109 gripe_invalid_conversion ("real sparse matrix", "real scalar"); | 109 err_invalid_conversion ("real sparse matrix", "real scalar"); |
| 110 | 110 |
| 111 return retval; | 111 return retval; |
| 112 } | 112 } |
| 113 | 113 |
| 114 Complex | 114 Complex |
| 120 | 120 |
| 121 // FIXME: maybe this should be a function, valid_as_scalar() | 121 // FIXME: maybe this should be a function, valid_as_scalar() |
| 122 if (rows () > 0 && columns () > 0) | 122 if (rows () > 0 && columns () > 0) |
| 123 { | 123 { |
| 124 if (numel () > 1) | 124 if (numel () > 1) |
| 125 gripe_implicit_conversion ("Octave:array-to-scalar", | 125 warn_implicit_conversion ("Octave:array-to-scalar", |
| 126 "real sparse matrix", "complex scalar"); | 126 "real sparse matrix", "complex scalar"); |
| 127 | 127 |
| 128 retval = matrix (0, 0); | 128 retval = matrix (0, 0); |
| 129 } | 129 } |
| 130 else | 130 else |
| 131 gripe_invalid_conversion ("real sparse matrix", "complex scalar"); | 131 err_invalid_conversion ("real sparse matrix", "complex scalar"); |
| 132 | 132 |
| 133 return retval; | 133 return retval; |
| 134 } | 134 } |
| 135 | 135 |
| 136 Matrix | 136 Matrix |
| 143 octave_sparse_matrix::bool_array_value (bool warn) const | 143 octave_sparse_matrix::bool_array_value (bool warn) const |
| 144 { | 144 { |
| 145 NDArray m = matrix.matrix_value (); | 145 NDArray m = matrix.matrix_value (); |
| 146 | 146 |
| 147 if (m.any_element_is_nan ()) | 147 if (m.any_element_is_nan ()) |
| 148 gripe_nan_to_logical_conversion (); | 148 err_nan_to_logical_conversion (); |
| 149 else if (warn && m.any_element_not_one_or_zero ()) | 149 else if (warn && m.any_element_not_one_or_zero ()) |
| 150 gripe_logical_conversion (); | 150 warn_logical_conversion (); |
| 151 | 151 |
| 152 return boolNDArray (m); | 152 return boolNDArray (m); |
| 153 } | 153 } |
| 154 | 154 |
| 155 charNDArray | 155 charNDArray |
| 186 | 186 |
| 187 SparseBoolMatrix | 187 SparseBoolMatrix |
| 188 octave_sparse_matrix::sparse_bool_matrix_value (bool warn) const | 188 octave_sparse_matrix::sparse_bool_matrix_value (bool warn) const |
| 189 { | 189 { |
| 190 if (matrix.any_element_is_nan ()) | 190 if (matrix.any_element_is_nan ()) |
| 191 gripe_nan_to_logical_conversion (); | 191 err_nan_to_logical_conversion (); |
| 192 else if (warn && matrix.any_element_not_one_or_zero ()) | 192 else if (warn && matrix.any_element_not_one_or_zero ()) |
| 193 gripe_logical_conversion (); | 193 warn_logical_conversion (); |
| 194 | 194 |
| 195 return mx_el_ne (matrix, 0.0); | 195 return mx_el_ne (matrix, 0.0); |
| 196 } | 196 } |
| 197 | 197 |
| 198 octave_value | 198 octave_value |
| 222 octave_quit (); | 222 octave_quit (); |
| 223 | 223 |
| 224 double d = matrix.data (i); | 224 double d = matrix.data (i); |
| 225 | 225 |
| 226 if (xisnan (d)) | 226 if (xisnan (d)) |
| 227 gripe_nan_to_character_conversion (); | 227 err_nan_to_character_conversion (); |
| 228 else | 228 else |
| 229 { | 229 { |
| 230 int ival = NINT (d); | 230 int ival = NINT (d); |
| 231 | 231 |
| 232 if (ival < 0 | 232 if (ival < 0 |