Mercurial > octave
annotate libinterp/operators/op-cm-cs.cc @ 20940:48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
* libinterp/corefcn/oct-obj.h: Replaced. Contains a #warning issued if used in
compilation and includes "ovl.h" instead. Original file renamed to
libinterp/octave-value/ovl.h
* libinterp/corefcn/oct-obj.cc: Renamed to libinterp/octave-value/ovl.cc.
* oct-obj.cc (ovl ()): Added new function to return empty octave_value_list.
* libinterp/corefcn/module.mk: Remove oct-obj.cc from build system.
* libinterp/octave-value/module.mk: Add ovl.h and ovl.cc to build system.
* mk-opts.pl, annotation-dialog.h, Cell.cc, __contourc__.cc, __dsearchn__.cc,
__lin_interpn__.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc,
betainc.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
debug.cc, defaults.cc, defun.cc, det.cc, dirfns.cc, dlmread.cc, eig.cc,
error.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc,
gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc,
graphics.cc, gripes.cc, help.cc, hess.cc, hex2num.cc, hook-fcn.h, input.cc,
input.h, inv.cc, kron.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, mex.cc, oct-hist.cc, oct-lvalue.cc, oct-lvalue.h, oct-map.h,
oct-stream.cc, oct.h, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, quad.cc,
quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sparse-xpow.cc,
strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.h, syscalls.cc, sysdep.cc,
time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, urlwrite.cc, utils.cc,
variables.cc, xpow.cc, __delaunayn__.cc, __glpk__.cc, __voronoi__.cc,
audiodevinfo.cc, audioread.cc, chol.cc, convhulln.cc, dmperm.cc, qr.cc,
symbfact.cc, mkbuiltins, ov-base-diag.h, ov-base-int.cc, ov-base-mat.cc,
ov-base-mat.h, ov-base-scalar.cc, ov-base-sparse.cc, ov-base-sparse.h,
ov-base.cc, ov-bool-mat.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-colon.cc,
ov-complex.cc, ov-cs-list.h, ov-cx-mat.cc, ov-dld-fcn.cc, ov-fcn.cc, ov-fcn.h,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc,
ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.h, ov-mex-fcn.cc,
ov-perm.h, ov-range.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, octave.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-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-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,
parse.h, pt-arg-list.cc, pt-assign.cc, pt-binop.cc, pt-cbinop.cc, pt-cell.cc,
pt-colon.cc, pt-const.cc, pt-eval.h, pt-fcn-handle.cc, pt-funcall.h, pt-id.cc,
pt-idx.cc, pt-jump.cc, pt-mat.cc, pt-select.cc, pt-unop.cc, token.cc,
Array-sym.cc: replace '#include "oct-obj.h"' with '#include "ovl.h"'.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 18 Dec 2015 16:04:56 -0800 |
parents | 4197fc428c7d |
children | e39e05d90788 |
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 | |
27 #include "gripes.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-cx-mat.h" | |
8679
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
31 #include "ov-flt-cx-mat.h" |
2928 | 32 #include "ov-complex.h" |
33 #include "ov-typeinfo.h" | |
34 #include "ops.h" | |
35 #include "xdiv.h" | |
36 #include "xpow.h" | |
37 | |
38 // complex matrix by complex scalar ops. | |
39 | |
4550 | 40 DEFNDBINOP_OP (add, complex_matrix, complex, complex_array, complex, +) |
41 DEFNDBINOP_OP (sub, complex_matrix, complex, complex_array, complex, -) | |
42 DEFNDBINOP_OP (mul, complex_matrix, complex, complex_array, complex, *) | |
2928 | 43 |
44 DEFBINOP (div, complex_matrix, complex) | |
45 { | |
46 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_complex&); | |
47 | |
48 Complex d = v2.complex_value (); | |
49 | |
50 if (d == 0.0) | |
51 gripe_divide_by_zero (); | |
52 | |
4550 | 53 return octave_value (v1.complex_array_value () / d); |
2928 | 54 } |
55 | |
56 DEFBINOP_FN (pow, complex_matrix, complex, xpow) | |
57 | |
58 DEFBINOP (ldiv, complex_matrix, complex) | |
59 { | |
3766 | 60 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_complex&); |
61 | |
62 ComplexMatrix m1 = v1.complex_matrix_value (); | |
63 ComplexMatrix m2 = v2.complex_matrix_value (); | |
5785 | 64 MatrixType typ = v1.matrix_type (); |
3766 | 65 |
5785 | 66 ComplexMatrix ret = xleftdiv (m1, m2, typ); |
67 v1.matrix_type (typ); | |
68 return ret; | |
2928 | 69 } |
70 | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
71 DEFNDCMPLXCMPOP_FN (lt, complex_matrix, complex, complex_array, complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
72 mx_el_lt) |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
73 DEFNDCMPLXCMPOP_FN (le, complex_matrix, complex, complex_array, complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
74 mx_el_le) |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
75 DEFNDCMPLXCMPOP_FN (eq, complex_matrix, complex, complex_array, complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
76 mx_el_eq) |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
77 DEFNDCMPLXCMPOP_FN (ge, complex_matrix, complex, complex_array, complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
78 mx_el_ge) |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
79 DEFNDCMPLXCMPOP_FN (gt, complex_matrix, complex, complex_array, complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
80 mx_el_gt) |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
81 DEFNDCMPLXCMPOP_FN (ne, complex_matrix, complex, complex_array, complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
82 mx_el_ne) |
2928 | 83 |
4550 | 84 DEFNDBINOP_OP (el_mul, complex_matrix, complex, complex_array, complex, *) |
2928 | 85 |
86 DEFBINOP (el_div, complex_matrix, complex) | |
87 { | |
88 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_complex&); | |
89 | |
90 Complex d = v2.complex_value (); | |
91 | |
92 if (d == 0.0) | |
93 gripe_divide_by_zero (); | |
94 | |
4550 | 95 return octave_value (v1.complex_array_value () / d); |
2928 | 96 } |
97 | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
98 DEFNDBINOP_FN (el_pow, complex_matrix, complex, complex_array, complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
99 elem_xpow) |
2928 | 100 |
101 DEFBINOP (el_ldiv, complex_matrix, complex) | |
102 { | |
103 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_complex&); | |
104 | |
4550 | 105 return x_el_div (v2.complex_value (), v1.complex_array_value ()); |
2928 | 106 } |
107 | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
108 DEFNDBINOP_FN (el_and, complex_matrix, complex, complex_array, complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
109 mx_el_and) |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
110 DEFNDBINOP_FN (el_or, complex_matrix, complex, complex_array, complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
111 mx_el_or) |
2928 | 112 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
113 DEFNDCATOP_FN (cm_cs, complex_matrix, complex, complex_array, complex_array, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
114 concat) |
4915 | 115 |
8679
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
116 DEFNDASSIGNOP_FN (assign, complex_matrix, complex, complex, assign) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
117 DEFNDASSIGNOP_FN (sgl_assign, float_complex_matrix, complex, float_complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
118 assign) |
2928 | 119 |
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
120 DEFNDASSIGNOP_OP (assign_add, complex_matrix, complex_scalar, complex, +=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
121 DEFNDASSIGNOP_OP (assign_sub, complex_matrix, complex_scalar, complex, -=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
122 DEFNDASSIGNOP_OP (assign_mul, complex_matrix, complex_scalar, complex, *=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
123 DEFNDASSIGNOP_OP (assign_div, complex_matrix, complex_scalar, complex, /=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
124 |
2928 | 125 void |
126 install_cm_cs_ops (void) | |
127 { | |
3538 | 128 INSTALL_BINOP (op_add, octave_complex_matrix, octave_complex, add); |
129 INSTALL_BINOP (op_sub, octave_complex_matrix, octave_complex, sub); | |
130 INSTALL_BINOP (op_mul, octave_complex_matrix, octave_complex, mul); | |
131 INSTALL_BINOP (op_div, octave_complex_matrix, octave_complex, div); | |
132 INSTALL_BINOP (op_pow, octave_complex_matrix, octave_complex, pow); | |
133 INSTALL_BINOP (op_ldiv, octave_complex_matrix, octave_complex, ldiv); | |
134 INSTALL_BINOP (op_lt, octave_complex_matrix, octave_complex, lt); | |
135 INSTALL_BINOP (op_le, octave_complex_matrix, octave_complex, le); | |
136 INSTALL_BINOP (op_eq, octave_complex_matrix, octave_complex, eq); | |
137 INSTALL_BINOP (op_ge, octave_complex_matrix, octave_complex, ge); | |
138 INSTALL_BINOP (op_gt, octave_complex_matrix, octave_complex, gt); | |
139 INSTALL_BINOP (op_ne, octave_complex_matrix, octave_complex, ne); | |
140 INSTALL_BINOP (op_el_mul, octave_complex_matrix, octave_complex, el_mul); | |
141 INSTALL_BINOP (op_el_div, octave_complex_matrix, octave_complex, el_div); | |
142 INSTALL_BINOP (op_el_pow, octave_complex_matrix, octave_complex, el_pow); | |
143 INSTALL_BINOP (op_el_ldiv, octave_complex_matrix, octave_complex, el_ldiv); | |
144 INSTALL_BINOP (op_el_and, octave_complex_matrix, octave_complex, el_and); | |
145 INSTALL_BINOP (op_el_or, octave_complex_matrix, octave_complex, el_or); | |
2928 | 146 |
4915 | 147 INSTALL_CATOP (octave_complex_matrix, octave_complex, cm_cs); |
148 | |
3538 | 149 INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, octave_complex, 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_complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
151 sgl_assign); |
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
152 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
153 INSTALL_ASSIGNOP (op_add_eq, octave_complex_matrix, octave_complex_scalar, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
154 assign_add); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
155 INSTALL_ASSIGNOP (op_sub_eq, octave_complex_matrix, octave_complex_scalar, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
156 assign_sub); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
157 INSTALL_ASSIGNOP (op_mul_eq, octave_complex_matrix, octave_complex_scalar, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
158 assign_mul); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
159 INSTALL_ASSIGNOP (op_div_eq, octave_complex_matrix, octave_complex_scalar, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
160 assign_div); |
2928 | 161 } |