Mercurial > octave
annotate libinterp/operators/op-sm-cm.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 | 384ff5aa9437 |
children | e39e05d90788 |
rev | line source |
---|---|
5164 | 1 /* |
2 | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
3 Copyright (C) 2004-2015 David Bateman |
11523 | 4 Copyright (C) 1998-2004 Andy Adler |
7016 | 5 |
6 This file is part of Octave. | |
5164 | 7 |
8 Octave is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
11 option) any later version. | |
5164 | 12 |
13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
7016 | 19 along with Octave; see the file COPYING. If not, see |
20 <http://www.gnu.org/licenses/>. | |
5164 | 21 |
22 */ | |
23 | |
24 #ifdef HAVE_CONFIG_H | |
25 #include <config.h> | |
26 #endif | |
27 | |
28 #include "gripes.h" | |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
29 #include "ovl.h" |
5164 | 30 #include "ov.h" |
31 #include "ov-typeinfo.h" | |
32 #include "ov-cx-mat.h" | |
33 #include "ops.h" | |
34 #include "xdiv.h" | |
35 | |
36 #include "sparse-xpow.h" | |
37 #include "sparse-xdiv.h" | |
38 #include "smx-sm-cm.h" | |
39 #include "smx-cm-sm.h" | |
40 #include "ov-re-sparse.h" | |
41 | |
42 // sparse matrix by complex matrix ops. | |
43 | |
44 DEFBINOP_OP (add, sparse_matrix, complex_matrix, +) | |
45 DEFBINOP_OP (sub, sparse_matrix, complex_matrix, -) | |
46 | |
5429 | 47 DEFBINOP_OP (mul, sparse_matrix, complex_matrix, *) |
5164 | 48 |
49 DEFBINOP (div, sparse_matrix, complex_matrix) | |
50 { | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
51 CAST_BINOP_ARGS (const octave_sparse_matrix&, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
52 const octave_complex_matrix&); |
5785 | 53 MatrixType typ = v2.matrix_type (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
54 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
55 ComplexMatrix ret = xdiv (v1.matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
56 v2.complex_matrix_value (), typ); |
5785 | 57 |
58 v2.matrix_type (typ); | |
59 return ret; | |
5164 | 60 } |
61 | |
62 DEFBINOPX (pow, sparse_matrix, complex_matrix) | |
63 { | |
64 error ("can't do A ^ B for A and B both matrices"); | |
65 } | |
66 | |
67 DEFBINOP (ldiv, sparse_matrix, complex_matrix) | |
68 { | |
5760 | 69 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_complex_matrix&); |
6221 | 70 |
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
71 if (v1.rows () == 1 && v1.columns () == 1) |
6221 | 72 { |
73 double d = v1.scalar_value (); | |
74 | |
75 if (d == 0.0) | |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
76 gripe_divide_by_zero (); |
5322 | 77 |
6221 | 78 return octave_value (v2.complex_array_value () / d); |
79 } | |
80 else | |
81 { | |
82 MatrixType typ = v1.matrix_type (); | |
5322 | 83 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
84 ComplexMatrix ret = xleftdiv (v1.sparse_matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
85 v2.complex_matrix_value (), typ); |
6221 | 86 |
87 v1.matrix_type (typ); | |
88 return ret; | |
89 } | |
5164 | 90 } |
91 | |
92 DEFBINOP_FN (lt, sparse_matrix, complex_matrix, mx_el_lt) | |
93 DEFBINOP_FN (le, sparse_matrix, complex_matrix, mx_el_le) | |
94 DEFBINOP_FN (eq, sparse_matrix, complex_matrix, mx_el_eq) | |
95 DEFBINOP_FN (ge, sparse_matrix, complex_matrix, mx_el_ge) | |
96 DEFBINOP_FN (gt, sparse_matrix, complex_matrix, mx_el_gt) | |
97 DEFBINOP_FN (ne, sparse_matrix, complex_matrix, mx_el_ne) | |
98 | |
99 DEFBINOP_FN (el_mul, sparse_matrix, complex_matrix, product) | |
100 DEFBINOP_FN (el_div, sparse_matrix, complex_matrix, quotient) | |
101 | |
102 DEFBINOP (el_pow, sparse_matrix, complex_matrix) | |
103 { | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
104 CAST_BINOP_ARGS (const octave_sparse_matrix&, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
105 const octave_complex_matrix&); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
106 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
107 return octave_value |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
108 (elem_xpow (v1.sparse_matrix_value (), SparseComplexMatrix |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
109 (v2.complex_matrix_value ()))); |
5164 | 110 } |
111 | |
112 DEFBINOP (el_ldiv, sparse_matrix, complex_matrix) | |
113 { | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
114 CAST_BINOP_ARGS (const octave_sparse_matrix&, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
115 const octave_complex_matrix&); |
5164 | 116 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
117 return octave_value |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
118 (quotient (v2.complex_matrix_value (), v1.sparse_matrix_value ())); |
5164 | 119 } |
120 | |
121 DEFBINOP_FN (el_and, sparse_matrix, complex_matrix, mx_el_and) | |
122 DEFBINOP_FN (el_or, sparse_matrix, complex_matrix, mx_el_or) | |
123 | |
124 DEFCATOP (sm_cm, sparse_matrix, complex_matrix) | |
125 { | |
126 CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_complex_matrix&); | |
127 SparseComplexMatrix tmp (v2.complex_matrix_value ()); | |
128 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); | |
129 } | |
130 | |
131 DEFCONV (sparse_complex_matrix_conv, sparse_matrix, sparse_complex_matrix) | |
132 { | |
133 CAST_CONV_ARG (const octave_sparse_matrix&); | |
134 return new octave_complex_matrix (v.complex_matrix_value ()); | |
135 } | |
136 | |
137 void | |
138 install_sm_cm_ops (void) | |
139 { | |
140 INSTALL_BINOP (op_add, octave_sparse_matrix, octave_complex_matrix, add); | |
141 INSTALL_BINOP (op_sub, octave_sparse_matrix, octave_complex_matrix, sub); | |
142 INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_complex_matrix, mul); | |
143 INSTALL_BINOP (op_div, octave_sparse_matrix, octave_complex_matrix, div); | |
144 INSTALL_BINOP (op_pow, octave_sparse_matrix, octave_complex_matrix, pow); | |
145 INSTALL_BINOP (op_ldiv, octave_sparse_matrix, octave_complex_matrix, ldiv); | |
146 INSTALL_BINOP (op_lt, octave_sparse_matrix, octave_complex_matrix, lt); | |
147 INSTALL_BINOP (op_le, octave_sparse_matrix, octave_complex_matrix, le); | |
148 INSTALL_BINOP (op_eq, octave_sparse_matrix, octave_complex_matrix, eq); | |
149 INSTALL_BINOP (op_ge, octave_sparse_matrix, octave_complex_matrix, ge); | |
150 INSTALL_BINOP (op_gt, octave_sparse_matrix, octave_complex_matrix, gt); | |
151 INSTALL_BINOP (op_ne, octave_sparse_matrix, octave_complex_matrix, ne); | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
152 INSTALL_BINOP (op_el_mul, octave_sparse_matrix, octave_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
153 el_mul); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
154 INSTALL_BINOP (op_el_div, octave_sparse_matrix, octave_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
155 el_div); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
156 INSTALL_BINOP (op_el_pow, octave_sparse_matrix, octave_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
157 el_pow); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
158 INSTALL_BINOP (op_el_ldiv, octave_sparse_matrix, octave_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
159 el_ldiv); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
160 INSTALL_BINOP (op_el_and, octave_sparse_matrix, octave_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
161 el_and); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
162 INSTALL_BINOP (op_el_or, octave_sparse_matrix, octave_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
163 el_or); |
5164 | 164 |
165 INSTALL_CATOP (octave_sparse_matrix, octave_complex_matrix, sm_cm); | |
166 | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
167 INSTALL_ASSIGNCONV (octave_sparse_matrix, octave_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
168 octave_sparse_complex_matrix); |
5164 | 169 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
170 INSTALL_WIDENOP (octave_sparse_matrix, octave_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
171 sparse_complex_matrix_conv); |
5164 | 172 } |