Mercurial > octave

comparison libinterp/octave-value/ov-cx-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 ebc439187d29
children dfcb9d74b253
comparison
equal deleted inserted replaced
21099:52af4092f863 21100:e39e05d90788
34 #include "lo-mappers.h" 34 #include "lo-mappers.h"
35 #include "mx-base.h" 35 #include "mx-base.h"
36 #include "mach-info.h" 36 #include "mach-info.h"
37 #include "oct-locbuf.h" 37 #include "oct-locbuf.h"
38 38
39 #include "gripes.h" 39 #include "errwarn.h"
40 #include "mxarray.h" 40 #include "mxarray.h"
41 #include "ovl.h" 41 #include "ovl.h"
42 #include "oct-hdf5.h" 42 #include "oct-hdf5.h"
43 #include "oct-stream.h" 43 #include "oct-stream.h"
44 #include "ops.h" 44 #include "ops.h"
103 octave_complex_matrix::double_value (bool force_conversion) const 103 octave_complex_matrix::double_value (bool force_conversion) const
104 { 104 {
105 double retval = lo_ieee_nan_value (); 105 double retval = lo_ieee_nan_value ();
106 106
107 if (! force_conversion) 107 if (! force_conversion)
108 gripe_implicit_conversion ("Octave:imag-to-real", 108 warn_implicit_conversion ("Octave:imag-to-real",
109 "complex matrix", "real scalar"); 109 "complex matrix", "real scalar");
110 110
111 if (rows () > 0 && columns () > 0) 111 if (rows () > 0 && columns () > 0)
112 { 112 {
113 gripe_implicit_conversion ("Octave:array-to-scalar", 113 warn_implicit_conversion ("Octave:array-to-scalar",
114 "complex matrix", "real scalar"); 114 "complex matrix", "real scalar");
115 115
116 retval = std::real (matrix (0, 0)); 116 retval = std::real (matrix (0, 0));
117 } 117 }
118 else 118 else
119 gripe_invalid_conversion ("complex matrix", "real scalar"); 119 err_invalid_conversion ("complex matrix", "real scalar");
120 120
121 return retval; 121 return retval;
122 } 122 }
123 123
124 float 124 float
125 octave_complex_matrix::float_value (bool force_conversion) const 125 octave_complex_matrix::float_value (bool force_conversion) const
126 { 126 {
127 float retval = lo_ieee_float_nan_value (); 127 float retval = lo_ieee_float_nan_value ();
128 128
129 if (! force_conversion) 129 if (! force_conversion)
130 gripe_implicit_conversion ("Octave:imag-to-real", 130 warn_implicit_conversion ("Octave:imag-to-real",
131 "complex matrix", "real scalar"); 131 "complex matrix", "real scalar");
132 132
133 if (rows () > 0 && columns () > 0) 133 if (rows () > 0 && columns () > 0)
134 { 134 {
135 gripe_implicit_conversion ("Octave:array-to-scalar", 135 warn_implicit_conversion ("Octave:array-to-scalar",
136 "complex matrix", "real scalar"); 136 "complex matrix", "real scalar");
137 137
138 retval = std::real (matrix (0, 0)); 138 retval = std::real (matrix (0, 0));
139 } 139 }
140 else 140 else
141 gripe_invalid_conversion ("complex matrix", "real scalar"); 141 err_invalid_conversion ("complex matrix", "real scalar");
142 142
143 return retval; 143 return retval;
144 } 144 }
145 145
146 NDArray 146 NDArray
147 octave_complex_matrix::array_value (bool force_conversion) const 147 octave_complex_matrix::array_value (bool force_conversion) const
148 { 148 {
149 NDArray retval; 149 NDArray retval;
150 150
151 if (! force_conversion) 151 if (! force_conversion)
152 gripe_implicit_conversion ("Octave:imag-to-real", 152 warn_implicit_conversion ("Octave:imag-to-real",
153 "complex matrix", "real matrix"); 153 "complex matrix", "real matrix");
154 154
155 retval = ::real (matrix); 155 retval = ::real (matrix);
156 156
157 return retval; 157 return retval;
161 octave_complex_matrix::matrix_value (bool force_conversion) const 161 octave_complex_matrix::matrix_value (bool force_conversion) const
162 { 162 {
163 Matrix retval; 163 Matrix retval;
164 164
165 if (! force_conversion) 165 if (! force_conversion)
166 gripe_implicit_conversion ("Octave:imag-to-real", 166 warn_implicit_conversion ("Octave:imag-to-real",
167 "complex matrix", "real matrix"); 167 "complex matrix", "real matrix");
168 168
169 retval = ::real (ComplexMatrix (matrix)); 169 retval = ::real (ComplexMatrix (matrix));
170 170
171 return retval; 171 return retval;
175 octave_complex_matrix::float_matrix_value (bool force_conversion) const 175 octave_complex_matrix::float_matrix_value (bool force_conversion) const
176 { 176 {
177 FloatMatrix retval; 177 FloatMatrix retval;
178 178
179 if (! force_conversion) 179 if (! force_conversion)
180 gripe_implicit_conversion ("Octave:imag-to-real", 180 warn_implicit_conversion ("Octave:imag-to-real",
181 "complex matrix", "real matrix"); 181 "complex matrix", "real matrix");
182 182
183 retval = ::real (ComplexMatrix (matrix)); 183 retval = ::real (ComplexMatrix (matrix));
184 184
185 return retval; 185 return retval;
192 192
193 Complex retval (tmp, tmp); 193 Complex retval (tmp, tmp);
194 194
195 if (rows () > 0 && columns () > 0) 195 if (rows () > 0 && columns () > 0)
196 { 196 {
197 gripe_implicit_conversion ("Octave:array-to-scalar", 197 warn_implicit_conversion ("Octave:array-to-scalar",
198 "complex matrix", "complex scalar"); 198 "complex matrix", "complex scalar");
199 199
200 retval = matrix (0, 0); 200 retval = matrix (0, 0);
201 } 201 }
202 else 202 else
203 gripe_invalid_conversion ("complex matrix", "complex scalar"); 203 err_invalid_conversion ("complex matrix", "complex scalar");
204 204
205 return retval; 205 return retval;
206 } 206 }
207 207
208 FloatComplex 208 FloatComplex
212 212
213 FloatComplex retval (tmp, tmp); 213 FloatComplex retval (tmp, tmp);
214 214
215 if (rows () > 0 && columns () > 0) 215 if (rows () > 0 && columns () > 0)
216 { 216 {
217 gripe_implicit_conversion ("Octave:array-to-scalar", 217 warn_implicit_conversion ("Octave:array-to-scalar",
218 "complex matrix", "complex scalar"); 218 "complex matrix", "complex scalar");
219 219
220 retval = matrix (0, 0); 220 retval = matrix (0, 0);
221 } 221 }
222 else 222 else
223 gripe_invalid_conversion ("complex matrix", "complex scalar"); 223 err_invalid_conversion ("complex matrix", "complex scalar");
224 224
225 return retval; 225 return retval;
226 } 226 }
227 227
228 ComplexMatrix 228 ComplexMatrix
239 239
240 boolNDArray 240 boolNDArray
241 octave_complex_matrix::bool_array_value (bool warn) const 241 octave_complex_matrix::bool_array_value (bool warn) const
242 { 242 {
243 if (matrix.any_element_is_nan ()) 243 if (matrix.any_element_is_nan ())
244 gripe_nan_to_logical_conversion (); 244 err_nan_to_logical_conversion ();
245 else if (warn && (! matrix.all_elements_are_real () 245 else if (warn && (! matrix.all_elements_are_real ()
246 || real (matrix).any_element_not_one_or_zero ())) 246 || real (matrix).any_element_not_one_or_zero ()))
247 gripe_logical_conversion (); 247 warn_logical_conversion ();
248 248
249 return mx_el_ne (matrix, Complex (0.0)); 249 return mx_el_ne (matrix, Complex (0.0));
250 } 250 }
251 251
252 charNDArray 252 charNDArray
253 octave_complex_matrix::char_array_value (bool frc_str_conv) const 253 octave_complex_matrix::char_array_value (bool frc_str_conv) const
254 { 254 {
255 charNDArray retval; 255 charNDArray retval;
256 256
257 if (! frc_str_conv) 257 if (! frc_str_conv)
258 gripe_implicit_conversion ("Octave:num-to-str", 258 warn_implicit_conversion ("Octave:num-to-str",
259 "complex matrix", "string"); 259 "complex matrix", "string");
260 else 260 else
261 { 261 {
262 retval = charNDArray (dims ()); 262 retval = charNDArray (dims ());
263 octave_idx_type nel = numel (); 263 octave_idx_type nel = numel ();
279 octave_complex_matrix::sparse_matrix_value (bool force_conversion) const 279 octave_complex_matrix::sparse_matrix_value (bool force_conversion) const
280 { 280 {
281 SparseMatrix retval; 281 SparseMatrix retval;
282 282
283 if (! force_conversion) 283 if (! force_conversion)
284 gripe_implicit_conversion ("Octave:imag-to-real", 284 warn_implicit_conversion ("Octave:imag-to-real",
285 "complex matrix", "real matrix"); 285 "complex matrix", "real matrix");
286 286
287 retval = SparseMatrix (::real (ComplexMatrix (matrix))); 287 retval = SparseMatrix (::real (ComplexMatrix (matrix)));
288 288
289 return retval; 289 return retval;