Mercurial > octave

comparison libinterp/octave-value/ov-flt-re-mat.cc @ 21100:e39e05d90788

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
38 #include "mx-base.h" 38 #include "mx-base.h"
39 #include "quit.h" 39 #include "quit.h"
40 #include "oct-locbuf.h" 40 #include "oct-locbuf.h"
41 41
42 #include "defun.h" 42 #include "defun.h"
43 #include "gripes.h" 43 #include "errwarn.h"
44 #include "mxarray.h" 44 #include "mxarray.h"
45 #include "ovl.h" 45 #include "ovl.h"
46 #include "oct-lvalue.h" 46 #include "oct-lvalue.h"
47 #include "oct-hdf5.h" 47 #include "oct-hdf5.h"
48 #include "oct-stream.h" 48 #include "oct-stream.h"
91 { 91 {
92 double retval = lo_ieee_nan_value (); 92 double retval = lo_ieee_nan_value ();
93 93
94 if (numel () > 0) 94 if (numel () > 0)
95 { 95 {
96 gripe_implicit_conversion ("Octave:array-to-scalar", 96 warn_implicit_conversion ("Octave:array-to-scalar",
97 "real matrix", "real scalar"); 97 "real matrix", "real scalar");
98 98
99 retval = matrix (0, 0); 99 retval = matrix (0, 0);
100 } 100 }
101 else 101 else
102 gripe_invalid_conversion ("real matrix", "real scalar"); 102 err_invalid_conversion ("real matrix", "real scalar");
103 103
104 return retval; 104 return retval;
105 } 105 }
106 106
107 float 107 float
109 { 109 {
110 float retval = lo_ieee_float_nan_value (); 110 float retval = lo_ieee_float_nan_value ();
111 111
112 if (numel () > 0) 112 if (numel () > 0)
113 { 113 {
114 gripe_implicit_conversion ("Octave:array-to-scalar", 114 warn_implicit_conversion ("Octave:array-to-scalar",
115 "real matrix", "real scalar"); 115 "real matrix", "real scalar");
116 116
117 retval = matrix (0, 0); 117 retval = matrix (0, 0);
118 } 118 }
119 else 119 else
120 gripe_invalid_conversion ("real matrix", "real scalar"); 120 err_invalid_conversion ("real matrix", "real scalar");
121 121
122 return retval; 122 return retval;
123 } 123 }
124 124
125 // FIXME 125 // FIXME
143 143
144 Complex retval (tmp, tmp); 144 Complex retval (tmp, tmp);
145 145
146 if (rows () > 0 && columns () > 0) 146 if (rows () > 0 && columns () > 0)
147 { 147 {
148 gripe_implicit_conversion ("Octave:array-to-scalar", 148 warn_implicit_conversion ("Octave:array-to-scalar",
149 "real matrix", "complex scalar"); 149 "real matrix", "complex scalar");
150 150
151 retval = matrix (0, 0); 151 retval = matrix (0, 0);
152 } 152 }
153 else 153 else
154 gripe_invalid_conversion ("real matrix", "complex scalar"); 154 err_invalid_conversion ("real matrix", "complex scalar");
155 155
156 return retval; 156 return retval;
157 } 157 }
158 158
159 FloatComplex 159 FloatComplex
163 163
164 FloatComplex retval (tmp, tmp); 164 FloatComplex retval (tmp, tmp);
165 165
166 if (rows () > 0 && columns () > 0) 166 if (rows () > 0 && columns () > 0)
167 { 167 {
168 gripe_implicit_conversion ("Octave:array-to-scalar", 168 warn_implicit_conversion ("Octave:array-to-scalar",
169 "real matrix", "complex scalar"); 169 "real matrix", "complex scalar");
170 170
171 retval = matrix (0, 0); 171 retval = matrix (0, 0);
172 } 172 }
173 else 173 else
174 gripe_invalid_conversion ("real matrix", "complex scalar"); 174 err_invalid_conversion ("real matrix", "complex scalar");
175 175
176 return retval; 176 return retval;
177 } 177 }
178 178
179 // FIXME 179 // FIXME
210 210
211 boolNDArray 211 boolNDArray
212 octave_float_matrix::bool_array_value (bool warn) const 212 octave_float_matrix::bool_array_value (bool warn) const
213 { 213 {
214 if (matrix.any_element_is_nan ()) 214 if (matrix.any_element_is_nan ())
215 gripe_nan_to_logical_conversion (); 215 err_nan_to_logical_conversion ();
216 else if (warn && matrix.any_element_not_one_or_zero ()) 216 else if (warn && matrix.any_element_not_one_or_zero ())
217 gripe_logical_conversion (); 217 warn_logical_conversion ();
218 218
219 return boolNDArray (matrix); 219 return boolNDArray (matrix);
220 } 220 }
221 221
222 charNDArray 222 charNDArray
288 octave_quit (); 288 octave_quit ();
289 289
290 float d = matrix (i); 290 float d = matrix (i);
291 291
292 if (xisnan (d)) 292 if (xisnan (d))
293 gripe_nan_to_character_conversion (); 293 err_nan_to_character_conversion ();
294 else 294 else
295 { 295 {
296 int ival = NINT (d); 296 int ival = NINT (d);
297 297
298 if (ival < 0 || ival > std::numeric_limits<unsigned char>::max ()) 298 if (ival < 0 || ival > std::numeric_limits<unsigned char>::max ())