Mercurial > octave
annotate src/OPERATORS/op-cs-scm.cc @ 8835:1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
author | David Bateman <dbateman@free.fr> |
---|---|
date | Sat, 21 Feb 2009 01:27:23 +0100 |
parents | e5055ed23f52 |
children | eb63fbe60fab |
rev | line source |
---|---|
5164 | 1 /* |
2 | |
7017 | 3 Copyright (C) 2004, 2005, 2006, 2007 David Bateman |
7016 | 4 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler |
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" | |
29 #include "oct-obj.h" | |
30 #include "ov.h" | |
31 #include "ov-typeinfo.h" | |
32 #include "ov-cx-mat.h" | |
33 #include "ov-complex.h" | |
34 #include "ops.h" | |
35 #include "xpow.h" | |
36 | |
37 #include "sparse-xpow.h" | |
38 #include "sparse-xdiv.h" | |
39 #include "ov-cx-sparse.h" | |
40 | |
41 // complex scalar by sparse complex matrix ops. | |
42 | |
43 DEFBINOP_OP (add, complex, sparse_complex_matrix, +) | |
44 DEFBINOP_OP (sub, complex, sparse_complex_matrix, -) | |
45 DEFBINOP_OP (mul, complex, sparse_complex_matrix, *) | |
46 | |
47 DEFBINOP (div, complex, sparse_complex_matrix) | |
48 { | |
5760 | 49 CAST_BINOP_ARGS (const octave_complex&, const octave_sparse_complex_matrix&); |
5164 | 50 |
6221 | 51 if (v2.rows() == 1 && v2.columns() == 1) |
52 { | |
53 Complex d = v2.complex_value (); | |
54 | |
55 if (d == 0.0) | |
56 gripe_divide_by_zero (); | |
5164 | 57 |
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7289
diff
changeset
|
58 return octave_value (SparseComplexMatrix (1, 1, v1.complex_value () / d)); |
6221 | 59 } |
60 else | |
61 { | |
62 MatrixType typ = v2.matrix_type (); | |
63 ComplexMatrix m1 = ComplexMatrix (1, 1, v1.complex_value ()); | |
64 SparseComplexMatrix m2 = v2.sparse_complex_matrix_value (); | |
65 ComplexMatrix ret = xdiv (m1, m2, typ); | |
66 v2.matrix_type (typ); | |
67 return ret; | |
68 } | |
5164 | 69 } |
70 | |
71 DEFBINOP (pow, complex, sparse_complex_matrix) | |
72 { | |
73 CAST_BINOP_ARGS (const octave_complex&, | |
74 const octave_sparse_complex_matrix&); | |
75 return xpow (v1.complex_value (), v2.complex_matrix_value ()); | |
76 } | |
77 | |
78 DEFBINOP (ldiv, complex, sparse_complex_matrix) | |
79 { | |
80 CAST_BINOP_ARGS (const octave_complex&, const octave_sparse_complex_matrix&); | |
81 | |
82 Complex d = v1.complex_value (); | |
83 | |
84 if (d == 0.0) | |
85 gripe_divide_by_zero (); | |
86 | |
87 return octave_value (v2.sparse_complex_matrix_value () / d); | |
88 } | |
89 | |
90 DEFBINOP_FN (lt, complex, sparse_complex_matrix, mx_el_lt) | |
91 DEFBINOP_FN (le, complex, sparse_complex_matrix, mx_el_le) | |
92 DEFBINOP_FN (eq, complex, sparse_complex_matrix, mx_el_eq) | |
93 DEFBINOP_FN (ge, complex, sparse_complex_matrix, mx_el_ge) | |
94 DEFBINOP_FN (gt, complex, sparse_complex_matrix, mx_el_gt) | |
95 DEFBINOP_FN (ne, complex, sparse_complex_matrix, mx_el_ne) | |
96 | |
97 DEFBINOP_OP (el_mul, complex, sparse_complex_matrix, *) | |
98 DEFBINOP_FN (el_div, complex, sparse_complex_matrix, x_el_div) | |
99 | |
100 DEFBINOP_FN (el_pow, complex, sparse_complex_matrix, elem_xpow) | |
101 | |
102 DEFBINOP (el_ldiv, complex, sparse_complex_matrix) | |
103 { | |
104 CAST_BINOP_ARGS (const octave_complex&, const octave_sparse_complex_matrix&); | |
105 | |
106 Complex d = v1.complex_value (); | |
107 octave_value retval; | |
108 | |
109 if (d == 0.0) | |
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7289
diff
changeset
|
110 gripe_divide_by_zero (); |
5164 | 111 |
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7289
diff
changeset
|
112 retval = octave_value (v2.sparse_complex_matrix_value () / d); |
5164 | 113 |
114 return retval; | |
115 } | |
116 | |
117 DEFBINOP_FN (el_and, complex, sparse_complex_matrix, mx_el_and) | |
118 DEFBINOP_FN (el_or, complex, sparse_complex_matrix, mx_el_or) | |
119 | |
120 DEFCATOP (cs_scm, complex, sparse_complex_matrix) | |
121 { | |
122 CAST_BINOP_ARGS (octave_complex&, const octave_sparse_complex_matrix&); | |
123 SparseComplexMatrix tmp (1, 1, v1.complex_value ()); | |
124 return octave_value (tmp. concat (v2.sparse_complex_matrix_value (), | |
125 ra_idx)); | |
126 } | |
127 | |
128 DEFCONV (sparse_complex_matrix_conv, complex, sparse_complex_matrix) | |
129 { | |
130 CAST_CONV_ARG (const octave_complex&); | |
131 | |
132 return new octave_sparse_complex_matrix | |
133 (SparseComplexMatrix (v.complex_matrix_value ())); | |
134 } | |
135 | |
136 void | |
137 install_cs_scm_ops (void) | |
138 { | |
139 INSTALL_BINOP (op_add, octave_complex, octave_sparse_complex_matrix, add); | |
140 INSTALL_BINOP (op_sub, octave_complex, octave_sparse_complex_matrix, sub); | |
141 INSTALL_BINOP (op_mul, octave_complex, octave_sparse_complex_matrix, mul); | |
142 INSTALL_BINOP (op_div, octave_complex, octave_sparse_complex_matrix, div); | |
143 INSTALL_BINOP (op_pow, octave_complex, octave_sparse_complex_matrix, pow); | |
144 INSTALL_BINOP (op_ldiv, octave_complex, octave_sparse_complex_matrix, | |
145 ldiv); | |
146 INSTALL_BINOP (op_lt, octave_complex, octave_sparse_complex_matrix, lt); | |
147 INSTALL_BINOP (op_le, octave_complex, octave_sparse_complex_matrix, le); | |
148 INSTALL_BINOP (op_eq, octave_complex, octave_sparse_complex_matrix, eq); | |
149 INSTALL_BINOP (op_ge, octave_complex, octave_sparse_complex_matrix, ge); | |
150 INSTALL_BINOP (op_gt, octave_complex, octave_sparse_complex_matrix, gt); | |
151 INSTALL_BINOP (op_ne, octave_complex, octave_sparse_complex_matrix, ne); | |
152 INSTALL_BINOP (op_el_mul, octave_complex, octave_sparse_complex_matrix, | |
153 el_mul); | |
154 INSTALL_BINOP (op_el_div, octave_complex, octave_sparse_complex_matrix, | |
155 el_div); | |
156 INSTALL_BINOP (op_el_pow, octave_complex, octave_sparse_complex_matrix, | |
157 el_pow); | |
158 INSTALL_BINOP (op_el_ldiv, octave_complex, octave_sparse_complex_matrix, | |
159 el_ldiv); | |
160 INSTALL_BINOP (op_el_and, octave_complex, octave_sparse_complex_matrix, | |
161 el_and); | |
162 INSTALL_BINOP (op_el_or, octave_complex, octave_sparse_complex_matrix, | |
163 el_or); | |
164 | |
165 INSTALL_CATOP (octave_complex, octave_sparse_complex_matrix, cs_scm); | |
166 | |
167 INSTALL_ASSIGNCONV (octave_complex, octave_sparse_complex_matrix, | |
7289 | 168 octave_complex_matrix); |
5164 | 169 |
170 INSTALL_WIDENOP (octave_complex, octave_sparse_complex_matrix, | |
171 sparse_complex_matrix_conv); | |
172 } | |
173 | |
174 /* | |
175 ;;; Local Variables: *** | |
176 ;;; mode: C++ *** | |
177 ;;; End: *** | |
178 */ |