Mercurial > octave

comparison libinterp/octave-value/ov-cx-sparse.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
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 "ov-complex.h" 39 #include "ov-complex.h"
40 #include "gripes.h" 40 #include "errwarn.h"
41 41
42 #include "oct-hdf5.h" 42 #include "oct-hdf5.h"
43 43
44 #include "ov-re-sparse.h" 44 #include "ov-re-sparse.h"
45 #include "ov-cx-sparse.h" 45 #include "ov-cx-sparse.h"
107 octave_sparse_complex_matrix::double_value (bool force_conversion) const 107 octave_sparse_complex_matrix::double_value (bool force_conversion) const
108 { 108 {
109 double retval = lo_ieee_nan_value (); 109 double retval = lo_ieee_nan_value ();
110 110
111 if (! force_conversion) 111 if (! force_conversion)
112 gripe_implicit_conversion ("Octave:imag-to-real", 112 warn_implicit_conversion ("Octave:imag-to-real",
113 "complex sparse matrix", "real scalar"); 113 "complex sparse matrix", "real scalar");
114 114
115 // FIXME: maybe this should be a function, valid_as_scalar() 115 // FIXME: maybe this should be a function, valid_as_scalar()
116 if (numel () > 0) 116 if (numel () > 0)
117 { 117 {
118 if (numel () > 1) 118 if (numel () > 1)
119 gripe_implicit_conversion ("Octave:array-to-scalar", 119 warn_implicit_conversion ("Octave:array-to-scalar",
120 "complex sparse matrix", "real scalar"); 120 "complex sparse matrix", "real scalar");
121 121
122 retval = std::real (matrix (0, 0)); 122 retval = std::real (matrix (0, 0));
123 } 123 }
124 else 124 else
125 gripe_invalid_conversion ("complex sparse matrix", "real scalar"); 125 err_invalid_conversion ("complex sparse matrix", "real scalar");
126 126
127 return retval; 127 return retval;
128 } 128 }
129 129
130 Matrix 130 Matrix
131 octave_sparse_complex_matrix::matrix_value (bool force_conversion) const 131 octave_sparse_complex_matrix::matrix_value (bool force_conversion) const
132 { 132 {
133 Matrix retval; 133 Matrix retval;
134 134
135 if (! force_conversion) 135 if (! force_conversion)
136 gripe_implicit_conversion ("Octave:imag-to-real", 136 warn_implicit_conversion ("Octave:imag-to-real",
137 "complex sparse matrix", "real matrix"); 137 "complex sparse matrix", "real matrix");
138 138
139 retval = ::real (matrix.matrix_value ()); 139 retval = ::real (matrix.matrix_value ());
140 140
141 return retval; 141 return retval;
142 } 142 }
150 150
151 // FIXME: maybe this should be a function, valid_as_scalar() 151 // FIXME: maybe this should be a function, valid_as_scalar()
152 if (numel () > 0) 152 if (numel () > 0)
153 { 153 {
154 if (numel () > 1) 154 if (numel () > 1)
155 gripe_implicit_conversion ("Octave:array-to-scalar", 155 warn_implicit_conversion ("Octave:array-to-scalar",
156 "complex sparse matrix", "real scalar"); 156 "complex sparse matrix", "real scalar");
157 157
158 retval = matrix (0, 0); 158 retval = matrix (0, 0);
159 } 159 }
160 else 160 else
161 gripe_invalid_conversion ("complex sparse matrix", "real scalar"); 161 err_invalid_conversion ("complex sparse matrix", "real scalar");
162 162
163 return retval; 163 return retval;
164 } 164 }
165 165
166 ComplexMatrix 166 ComplexMatrix
179 octave_sparse_complex_matrix::char_array_value (bool frc_str_conv) const 179 octave_sparse_complex_matrix::char_array_value (bool frc_str_conv) const
180 { 180 {
181 charNDArray retval; 181 charNDArray retval;
182 182
183 if (! frc_str_conv) 183 if (! frc_str_conv)
184 gripe_implicit_conversion ("Octave:num-to-str", 184 warn_implicit_conversion ("Octave:num-to-str",
185 "sparse complex matrix", "string"); 185 "sparse complex matrix", "string");
186 else 186 else
187 { 187 {
188 retval = charNDArray (dims (), 0); 188 retval = charNDArray (dims (), 0);
189 octave_idx_type nc = matrix.cols (); 189 octave_idx_type nc = matrix.cols ();
190 octave_idx_type nr = matrix.rows (); 190 octave_idx_type nr = matrix.rows ();
202 octave_sparse_complex_matrix::sparse_matrix_value (bool force_conversion) const 202 octave_sparse_complex_matrix::sparse_matrix_value (bool force_conversion) const
203 { 203 {
204 SparseMatrix retval; 204 SparseMatrix retval;
205 205
206 if (! force_conversion) 206 if (! force_conversion)
207 gripe_implicit_conversion ("Octave:imag-to-real", 207 warn_implicit_conversion ("Octave:imag-to-real",
208 "complex sparse matrix", 208 "complex sparse matrix",
209 "real sparse matrix"); 209 "real sparse matrix");
210 210
211 retval = ::real (matrix); 211 retval = ::real (matrix);
212 212
213 return retval; 213 return retval;
214 } 214 }
215 215
216 SparseBoolMatrix 216 SparseBoolMatrix
217 octave_sparse_complex_matrix::sparse_bool_matrix_value (bool warn) const 217 octave_sparse_complex_matrix::sparse_bool_matrix_value (bool warn) const
218 { 218 {
219 if (matrix.any_element_is_nan ()) 219 if (matrix.any_element_is_nan ())
220 gripe_nan_to_logical_conversion (); 220 err_nan_to_logical_conversion ();
221 else if (warn && (! matrix.all_elements_are_real () 221 else if (warn && (! matrix.all_elements_are_real ()
222 || real (matrix).any_element_not_one_or_zero ())) 222 || real (matrix).any_element_not_one_or_zero ()))
223 gripe_logical_conversion (); 223 warn_logical_conversion ();
224 224
225 return mx_el_ne (matrix, Complex (0.0)); 225 return mx_el_ne (matrix, Complex (0.0));
226 } 226 }
227 227
228 bool 228 bool