Mercurial > octave
comparison liboctave/array/fCMatrix.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 | 358aa7fcbd33 |
comparison
equal
deleted
inserted
replaced
| 21099:52af4092f863 | 21100:e39e05d90788 |
|---|---|
| 2003 info = -2; | 2003 info = -2; |
| 2004 | 2004 |
| 2005 if (sing_handler) | 2005 if (sing_handler) |
| 2006 sing_handler (rcon); | 2006 sing_handler (rcon); |
| 2007 else | 2007 else |
| 2008 gripe_singular_matrix (rcon); | 2008 errwarn_singular_matrix (rcon); |
| 2009 } | 2009 } |
| 2010 } | 2010 } |
| 2011 } | 2011 } |
| 2012 } | 2012 } |
| 2013 else | 2013 else |
| 2098 info = -2; | 2098 info = -2; |
| 2099 | 2099 |
| 2100 if (sing_handler) | 2100 if (sing_handler) |
| 2101 sing_handler (rcon); | 2101 sing_handler (rcon); |
| 2102 else | 2102 else |
| 2103 gripe_singular_matrix (rcon); | 2103 errwarn_singular_matrix (rcon); |
| 2104 } | 2104 } |
| 2105 } | 2105 } |
| 2106 } | 2106 } |
| 2107 } | 2107 } |
| 2108 else | 2108 else |
| 2183 info = -2; | 2183 info = -2; |
| 2184 | 2184 |
| 2185 if (sing_handler) | 2185 if (sing_handler) |
| 2186 sing_handler (rcon); | 2186 sing_handler (rcon); |
| 2187 else | 2187 else |
| 2188 gripe_singular_matrix (rcon); | 2188 errwarn_singular_matrix (rcon); |
| 2189 } | 2189 } |
| 2190 } | 2190 } |
| 2191 | 2191 |
| 2192 if (info == 0) | 2192 if (info == 0) |
| 2193 { | 2193 { |
| 2238 info = -2; | 2238 info = -2; |
| 2239 | 2239 |
| 2240 if (sing_handler) | 2240 if (sing_handler) |
| 2241 sing_handler (rcon); | 2241 sing_handler (rcon); |
| 2242 else | 2242 else |
| 2243 gripe_singular_matrix (); | 2243 errwarn_singular_matrix (); |
| 2244 | 2244 |
| 2245 mattype.mark_as_rectangular (); | 2245 mattype.mark_as_rectangular (); |
| 2246 } | 2246 } |
| 2247 else | 2247 else |
| 2248 { | 2248 { |
| 2266 info = -2; | 2266 info = -2; |
| 2267 | 2267 |
| 2268 if (sing_handler) | 2268 if (sing_handler) |
| 2269 sing_handler (rcon); | 2269 sing_handler (rcon); |
| 2270 else | 2270 else |
| 2271 gripe_singular_matrix (rcon); | 2271 errwarn_singular_matrix (rcon); |
| 2272 } | 2272 } |
| 2273 } | 2273 } |
| 2274 | 2274 |
| 2275 if (info == 0) | 2275 if (info == 0) |
| 2276 { | 2276 { |
| 3006 octave_idx_type a_nr = rows (); | 3006 octave_idx_type a_nr = rows (); |
| 3007 octave_idx_type a_nc = cols (); | 3007 octave_idx_type a_nc = cols (); |
| 3008 | 3008 |
| 3009 if (nr != a_nr || nc != a_nc) | 3009 if (nr != a_nr || nc != a_nc) |
| 3010 { | 3010 { |
| 3011 gripe_nonconformant ("operator +=", nr, nc, a_nr, a_nc); | 3011 err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); |
| 3012 return *this; | 3012 return *this; |
| 3013 } | 3013 } |
| 3014 | 3014 |
| 3015 for (octave_idx_type i = 0; i < a.length (); i++) | 3015 for (octave_idx_type i = 0; i < a.length (); i++) |
| 3016 elem (i, i) += a.elem (i, i); | 3016 elem (i, i) += a.elem (i, i); |
| 3027 octave_idx_type a_nr = rows (); | 3027 octave_idx_type a_nr = rows (); |
| 3028 octave_idx_type a_nc = cols (); | 3028 octave_idx_type a_nc = cols (); |
| 3029 | 3029 |
| 3030 if (nr != a_nr || nc != a_nc) | 3030 if (nr != a_nr || nc != a_nc) |
| 3031 { | 3031 { |
| 3032 gripe_nonconformant ("operator -=", nr, nc, a_nr, a_nc); | 3032 err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); |
| 3033 return *this; | 3033 return *this; |
| 3034 } | 3034 } |
| 3035 | 3035 |
| 3036 for (octave_idx_type i = 0; i < a.length (); i++) | 3036 for (octave_idx_type i = 0; i < a.length (); i++) |
| 3037 elem (i, i) -= a.elem (i, i); | 3037 elem (i, i) -= a.elem (i, i); |
| 3048 octave_idx_type a_nr = rows (); | 3048 octave_idx_type a_nr = rows (); |
| 3049 octave_idx_type a_nc = cols (); | 3049 octave_idx_type a_nc = cols (); |
| 3050 | 3050 |
| 3051 if (nr != a_nr || nc != a_nc) | 3051 if (nr != a_nr || nc != a_nc) |
| 3052 { | 3052 { |
| 3053 gripe_nonconformant ("operator +=", nr, nc, a_nr, a_nc); | 3053 err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); |
| 3054 return *this; | 3054 return *this; |
| 3055 } | 3055 } |
| 3056 | 3056 |
| 3057 for (octave_idx_type i = 0; i < a.length (); i++) | 3057 for (octave_idx_type i = 0; i < a.length (); i++) |
| 3058 elem (i, i) += a.elem (i, i); | 3058 elem (i, i) += a.elem (i, i); |
| 3069 octave_idx_type a_nr = rows (); | 3069 octave_idx_type a_nr = rows (); |
| 3070 octave_idx_type a_nc = cols (); | 3070 octave_idx_type a_nc = cols (); |
| 3071 | 3071 |
| 3072 if (nr != a_nr || nc != a_nc) | 3072 if (nr != a_nr || nc != a_nc) |
| 3073 { | 3073 { |
| 3074 gripe_nonconformant ("operator -=", nr, nc, a_nr, a_nc); | 3074 err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); |
| 3075 return *this; | 3075 return *this; |
| 3076 } | 3076 } |
| 3077 | 3077 |
| 3078 for (octave_idx_type i = 0; i < a.length (); i++) | 3078 for (octave_idx_type i = 0; i < a.length (); i++) |
| 3079 elem (i, i) -= a.elem (i, i); | 3079 elem (i, i) -= a.elem (i, i); |
| 3092 octave_idx_type a_nr = a.rows (); | 3092 octave_idx_type a_nr = a.rows (); |
| 3093 octave_idx_type a_nc = a.cols (); | 3093 octave_idx_type a_nc = a.cols (); |
| 3094 | 3094 |
| 3095 if (nr != a_nr || nc != a_nc) | 3095 if (nr != a_nr || nc != a_nc) |
| 3096 { | 3096 { |
| 3097 gripe_nonconformant ("operator +=", nr, nc, a_nr, a_nc); | 3097 err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); |
| 3098 return *this; | 3098 return *this; |
| 3099 } | 3099 } |
| 3100 | 3100 |
| 3101 if (nr == 0 || nc == 0) | 3101 if (nr == 0 || nc == 0) |
| 3102 return *this; | 3102 return *this; |
| 3116 octave_idx_type a_nr = a.rows (); | 3116 octave_idx_type a_nr = a.rows (); |
| 3117 octave_idx_type a_nc = a.cols (); | 3117 octave_idx_type a_nc = a.cols (); |
| 3118 | 3118 |
| 3119 if (nr != a_nr || nc != a_nc) | 3119 if (nr != a_nr || nc != a_nc) |
| 3120 { | 3120 { |
| 3121 gripe_nonconformant ("operator -=", nr, nc, a_nr, a_nc); | 3121 err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); |
| 3122 return *this; | 3122 return *this; |
| 3123 } | 3123 } |
| 3124 | 3124 |
| 3125 if (nr == 0 || nc == 0) | 3125 if (nr == 0 || nc == 0) |
| 3126 return *this; | 3126 return *this; |
| 3717 | 3717 |
| 3718 octave_idx_type b_nr = trb ? b.cols () : b.rows (); | 3718 octave_idx_type b_nr = trb ? b.cols () : b.rows (); |
| 3719 octave_idx_type b_nc = trb ? b.rows () : b.cols (); | 3719 octave_idx_type b_nc = trb ? b.rows () : b.cols (); |
| 3720 | 3720 |
| 3721 if (a_nc != b_nr) | 3721 if (a_nc != b_nr) |
| 3722 gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); | 3722 err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); |
| 3723 else | 3723 else |
| 3724 { | 3724 { |
| 3725 if (a_nr == 0 || a_nc == 0 || b_nc == 0) | 3725 if (a_nr == 0 || a_nc == 0 || b_nc == 0) |
| 3726 retval = FloatComplexMatrix (a_nr, b_nc, 0.0); | 3726 retval = FloatComplexMatrix (a_nr, b_nc, 0.0); |
| 3727 else if (a.data () == b.data () && a_nr == b_nc && tra != trb) | 3727 else if (a.data () == b.data () && a_nr == b_nc && tra != trb) |