Mercurial > octave
annotate libinterp/operators/op-m-s.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 | 48b2ad5ee801 |
children | fcac5dbbf9ed |
rev | line source |
---|---|
2928 | 1 /* |
2 | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
2928 | 4 |
5 This file is part of Octave. | |
6 | |
7 Octave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
10 option) any later version. | |
2928 | 11 |
12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 along with Octave; see the file COPYING. If not, see |
19 <http://www.gnu.org/licenses/>. | |
2928 | 20 |
21 */ | |
22 | |
23 #ifdef HAVE_CONFIG_H | |
24 #include <config.h> | |
25 #endif | |
26 | |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
27 #include "errwarn.h" |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
28 #include "ovl.h" |
2928 | 29 #include "ov.h" |
30 #include "ov-re-mat.h" | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
31 #include "ov-flt-re-mat.h" |
13160
6abc581bf2c9
Define missing real double -> float complex assignment operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
11523
diff
changeset
|
32 #include "ov-flt-cx-mat.h" |
2928 | 33 #include "ov-scalar.h" |
34 #include "ov-typeinfo.h" | |
35 #include "ops.h" | |
36 #include "xdiv.h" | |
37 #include "xpow.h" | |
38 | |
39 // matrix by scalar ops. | |
40 | |
4543 | 41 DEFNDBINOP_OP (add, matrix, scalar, array, scalar, +) |
42 DEFNDBINOP_OP (sub, matrix, scalar, array, scalar, -) | |
43 DEFNDBINOP_OP (mul, matrix, scalar, array, scalar, *) | |
2928 | 44 |
45 DEFBINOP (div, matrix, scalar) | |
46 { | |
47 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); | |
48 | |
49 double d = v2.double_value (); | |
50 | |
51 if (d == 0.0) | |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
52 warn_divide_by_zero (); |
2928 | 53 |
4543 | 54 return octave_value (v1.array_value () / d); |
2928 | 55 } |
56 | |
57 DEFBINOP_FN (pow, matrix, scalar, xpow) | |
58 | |
59 DEFBINOP (ldiv, matrix, scalar) | |
60 { | |
3766 | 61 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); |
62 | |
63 Matrix m1 = v1.matrix_value (); | |
64 Matrix m2 = v2.matrix_value (); | |
5785 | 65 MatrixType typ = v1.matrix_type (); |
3766 | 66 |
5785 | 67 Matrix ret = xleftdiv (m1, m2, typ); |
68 | |
69 v1.matrix_type (typ); | |
70 return ret; | |
2928 | 71 } |
72 | |
4543 | 73 DEFNDBINOP_FN (lt, matrix, scalar, array, scalar, mx_el_lt) |
74 DEFNDBINOP_FN (le, matrix, scalar, array, scalar, mx_el_le) | |
75 DEFNDBINOP_FN (eq, matrix, scalar, array, scalar, mx_el_eq) | |
76 DEFNDBINOP_FN (ge, matrix, scalar, array, scalar, mx_el_ge) | |
77 DEFNDBINOP_FN (gt, matrix, scalar, array, scalar, mx_el_gt) | |
78 DEFNDBINOP_FN (ne, matrix, scalar, array, scalar, mx_el_ne) | |
2928 | 79 |
4543 | 80 DEFNDBINOP_OP (el_mul, matrix, scalar, array, scalar, *) |
2928 | 81 |
82 DEFBINOP (el_div, matrix, scalar) | |
83 { | |
84 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); | |
85 | |
86 double d = v2.double_value (); | |
87 | |
88 if (d == 0.0) | |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
89 warn_divide_by_zero (); |
2928 | 90 |
4543 | 91 return octave_value (v1.array_value () / d); |
2928 | 92 } |
93 | |
4543 | 94 DEFNDBINOP_FN (el_pow, matrix, scalar, array, scalar, elem_xpow) |
2928 | 95 |
96 DEFBINOP (el_ldiv, matrix, scalar) | |
97 { | |
98 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); | |
99 | |
4543 | 100 return x_el_div (v2.double_value (), v1.array_value ()); |
2928 | 101 } |
102 | |
4543 | 103 DEFNDBINOP_FN (el_and, matrix, scalar, array, scalar, mx_el_and) |
104 DEFNDBINOP_FN (el_or, matrix, scalar, array, scalar, mx_el_or) | |
2928 | 105 |
4915 | 106 DEFNDCATOP_FN (m_s, matrix, scalar, array, array, concat) |
107 | |
8679
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
108 DEFNDASSIGNOP_FN (assign, matrix, scalar, scalar, assign) |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
109 DEFNDASSIGNOP_FN (sgl_assign, float_matrix, scalar, float_scalar, assign) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
110 DEFNDASSIGNOP_FN (clx_sgl_assign, float_complex_matrix, scalar, float_complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
111 assign) |
2928 | 112 |
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
113 DEFNDASSIGNOP_OP (assign_add, matrix, scalar, scalar, +=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
114 DEFNDASSIGNOP_OP (assign_sub, matrix, scalar, scalar, -=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
115 DEFNDASSIGNOP_OP (assign_mul, matrix, scalar, scalar, *=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
116 DEFNDASSIGNOP_OP (assign_div, matrix, scalar, scalar, /=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
117 |
2928 | 118 void |
119 install_m_s_ops (void) | |
120 { | |
3538 | 121 INSTALL_BINOP (op_add, octave_matrix, octave_scalar, add); |
122 INSTALL_BINOP (op_sub, octave_matrix, octave_scalar, sub); | |
123 INSTALL_BINOP (op_mul, octave_matrix, octave_scalar, mul); | |
124 INSTALL_BINOP (op_div, octave_matrix, octave_scalar, div); | |
125 INSTALL_BINOP (op_pow, octave_matrix, octave_scalar, pow); | |
126 INSTALL_BINOP (op_ldiv, octave_matrix, octave_scalar, ldiv); | |
4543 | 127 |
128 // INSTALL_BINOP (op_lt, octave_matrix, octave_scalar, lt); | |
129 | |
130 octave_value_typeinfo::register_binary_op | |
131 (octave_value::op_lt, octave_matrix::static_type_id (), | |
132 octave_scalar::static_type_id (), oct_binop_lt); | |
133 | |
3538 | 134 INSTALL_BINOP (op_le, octave_matrix, octave_scalar, le); |
135 INSTALL_BINOP (op_eq, octave_matrix, octave_scalar, eq); | |
136 INSTALL_BINOP (op_ge, octave_matrix, octave_scalar, ge); | |
137 INSTALL_BINOP (op_gt, octave_matrix, octave_scalar, gt); | |
138 INSTALL_BINOP (op_ne, octave_matrix, octave_scalar, ne); | |
139 INSTALL_BINOP (op_el_mul, octave_matrix, octave_scalar, el_mul); | |
140 INSTALL_BINOP (op_el_div, octave_matrix, octave_scalar, el_div); | |
141 INSTALL_BINOP (op_el_pow, octave_matrix, octave_scalar, el_pow); | |
142 INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_scalar, el_ldiv); | |
143 INSTALL_BINOP (op_el_and, octave_matrix, octave_scalar, el_and); | |
144 INSTALL_BINOP (op_el_or, octave_matrix, octave_scalar, el_or); | |
2928 | 145 |
4915 | 146 INSTALL_CATOP (octave_matrix, octave_scalar, m_s); |
147 | |
3538 | 148 INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_scalar, assign); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
149 INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_scalar, sgl_assign); |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
150 INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_scalar, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
151 clx_sgl_assign); |
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
152 |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
153 INSTALL_ASSIGNOP (op_add_eq, octave_matrix, octave_scalar, assign_add); |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
154 INSTALL_ASSIGNOP (op_sub_eq, octave_matrix, octave_scalar, assign_sub); |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
155 INSTALL_ASSIGNOP (op_mul_eq, octave_matrix, octave_scalar, assign_mul); |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
156 INSTALL_ASSIGNOP (op_div_eq, octave_matrix, octave_scalar, assign_div); |
2928 | 157 } |