Mercurial > octave-nkf

comparison src/OPERATORS/op-fm-fcm.cc @ 11586:12df7854fa7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip trailing whitespace from source files
author John W. Eaton <jwe@octave.org>
date Thu, 20 Jan 2011 17:24:59 -0500
parents fd0a3ac60b0e
children 72c96de7a403
comparison
equal deleted inserted replaced
11585:1473d0cf86d2 11586:12df7854fa7c
41 #include "xdiv.h" 41 #include "xdiv.h"
42 #include "xpow.h" 42 #include "xpow.h"
43 43
44 // matrix by complex matrix ops. 44 // matrix by complex matrix ops.
45 45
46 DEFNDBINOP_OP (add, float_matrix, float_complex_matrix, float_array, 46 DEFNDBINOP_OP (add, float_matrix, float_complex_matrix, float_array,
47 float_complex_array, +) 47 float_complex_array, +)
48 DEFNDBINOP_OP (sub, float_matrix, float_complex_matrix, float_array, 48 DEFNDBINOP_OP (sub, float_matrix, float_complex_matrix, float_array,
49 float_complex_array, -) 49 float_complex_array, -)
50 50
51 DEFBINOP_OP (mul, float_matrix, float_complex_matrix, *) 51 DEFBINOP_OP (mul, float_matrix, float_complex_matrix, *)
52 52
53 DEFBINOP (trans_mul, float_matrix, float_complex_matrix) 53 DEFBINOP (trans_mul, float_matrix, float_complex_matrix)
61 xgemm (m1, imag (m2), blas_trans, blas_no_trans)); 61 xgemm (m1, imag (m2), blas_trans, blas_no_trans));
62 } 62 }
63 63
64 DEFBINOP (div, float_matrix, float_complex_matrix) 64 DEFBINOP (div, float_matrix, float_complex_matrix)
65 { 65 {
66 CAST_BINOP_ARGS (const octave_float_matrix&, 66 CAST_BINOP_ARGS (const octave_float_matrix&,
67 const octave_float_complex_matrix&); 67 const octave_float_complex_matrix&);
68 MatrixType typ = v2.matrix_type (); 68 MatrixType typ = v2.matrix_type ();
69 69
70 FloatComplexMatrix ret = xdiv (v1.float_matrix_value (), 70 FloatComplexMatrix ret = xdiv (v1.float_matrix_value (),
71 v2.float_complex_matrix_value (), typ); 71 v2.float_complex_matrix_value (), typ);
72 72
73 v2.matrix_type (typ); 73 v2.matrix_type (typ);
74 return ret; 74 return ret;
75 } 75 }
80 return octave_value (); 80 return octave_value ();
81 } 81 }
82 82
83 DEFBINOP (ldiv, float_matrix, float_complex_matrix) 83 DEFBINOP (ldiv, float_matrix, float_complex_matrix)
84 { 84 {
85 CAST_BINOP_ARGS (const octave_float_matrix&, 85 CAST_BINOP_ARGS (const octave_float_matrix&,
86 const octave_float_complex_matrix&); 86 const octave_float_complex_matrix&);
87 MatrixType typ = v1.matrix_type (); 87 MatrixType typ = v1.matrix_type ();
88 88
89 FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (), 89 FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (),
90 v2.float_complex_matrix_value (), typ); 90 v2.float_complex_matrix_value (), typ);
91 91
92 v1.matrix_type (typ); 92 v1.matrix_type (typ);
93 return ret; 93 return ret;
94 } 94 }
95 95
96 DEFBINOP (trans_ldiv, float_matrix, float_complex_matrix) 96 DEFBINOP (trans_ldiv, float_matrix, float_complex_matrix)
97 { 97 {
98 CAST_BINOP_ARGS (const octave_float_matrix&, 98 CAST_BINOP_ARGS (const octave_float_matrix&,
99 const octave_float_complex_matrix&); 99 const octave_float_complex_matrix&);
100 MatrixType typ = v1.matrix_type (); 100 MatrixType typ = v1.matrix_type ();
101 101
102 FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (), 102 FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (),
103 v2.float_complex_matrix_value (), typ, blas_trans); 103 v2.float_complex_matrix_value (), typ, blas_trans);
104 104
105 v1.matrix_type (typ); 105 v1.matrix_type (typ);
106 return ret; 106 return ret;
107 } 107 }
108 108
109 DEFNDCMPLXCMPOP_FN (lt, float_matrix, float_complex_matrix, float_array, 109 DEFNDCMPLXCMPOP_FN (lt, float_matrix, float_complex_matrix, float_array,
110 float_complex_array, mx_el_lt) 110 float_complex_array, mx_el_lt)
111 DEFNDCMPLXCMPOP_FN (le, float_matrix, float_complex_matrix, float_array, 111 DEFNDCMPLXCMPOP_FN (le, float_matrix, float_complex_matrix, float_array,
112 float_complex_array, mx_el_le) 112 float_complex_array, mx_el_le)
113 DEFNDCMPLXCMPOP_FN (eq, float_matrix, float_complex_matrix, float_array, 113 DEFNDCMPLXCMPOP_FN (eq, float_matrix, float_complex_matrix, float_array,
114 float_complex_array, mx_el_eq) 114 float_complex_array, mx_el_eq)
115 DEFNDCMPLXCMPOP_FN (ge, float_matrix, float_complex_matrix, float_array, 115 DEFNDCMPLXCMPOP_FN (ge, float_matrix, float_complex_matrix, float_array,
116 float_complex_array, mx_el_ge) 116 float_complex_array, mx_el_ge)
117 DEFNDCMPLXCMPOP_FN (gt, float_matrix, float_complex_matrix, float_array, 117 DEFNDCMPLXCMPOP_FN (gt, float_matrix, float_complex_matrix, float_array,
118 float_complex_array, mx_el_gt) 118 float_complex_array, mx_el_gt)
119 DEFNDCMPLXCMPOP_FN (ne, float_matrix, float_complex_matrix, float_array, 119 DEFNDCMPLXCMPOP_FN (ne, float_matrix, float_complex_matrix, float_array,
120 float_complex_array, mx_el_ne) 120 float_complex_array, mx_el_ne)
121 121
122 DEFNDBINOP_FN (el_mul, float_matrix, float_complex_matrix, float_array, 122 DEFNDBINOP_FN (el_mul, float_matrix, float_complex_matrix, float_array,
123 float_complex_array, product) 123 float_complex_array, product)
124 DEFNDBINOP_FN (el_div, float_matrix, float_complex_matrix, float_array, 124 DEFNDBINOP_FN (el_div, float_matrix, float_complex_matrix, float_array,
125 float_complex_array, quotient) 125 float_complex_array, quotient)
126 DEFNDBINOP_FN (el_pow, float_matrix, float_complex_matrix, float_array, 126 DEFNDBINOP_FN (el_pow, float_matrix, float_complex_matrix, float_array,
127 float_complex_array, elem_xpow) 127 float_complex_array, elem_xpow)
128 128
129 DEFBINOP (el_ldiv, float_matrix, float_complex_matrix) 129 DEFBINOP (el_ldiv, float_matrix, float_complex_matrix)
130 { 130 {
131 CAST_BINOP_ARGS (const octave_float_matrix&, 131 CAST_BINOP_ARGS (const octave_float_matrix&,
132 const octave_float_complex_matrix&); 132 const octave_float_complex_matrix&);
133 133
134 return quotient (v2.float_complex_array_value (), v1.float_array_value ()); 134 return quotient (v2.float_complex_array_value (), v1.float_array_value ());
135 } 135 }
136 136
137 DEFNDBINOP_FN (el_and, float_matrix, float_complex_matrix, float_array, 137 DEFNDBINOP_FN (el_and, float_matrix, float_complex_matrix, float_array,
138 float_complex_array, mx_el_and) 138 float_complex_array, mx_el_and)
139 DEFNDBINOP_FN (el_or, float_matrix, float_complex_matrix, float_array, 139 DEFNDBINOP_FN (el_or, float_matrix, float_complex_matrix, float_array,
140 float_complex_array, mx_el_or) 140 float_complex_array, mx_el_or)
141 141
142 DEFNDCATOP_FN (fm_fcm, float_matrix, float_complex_matrix, float_array, 142 DEFNDCATOP_FN (fm_fcm, float_matrix, float_complex_matrix, float_array,
143 float_complex_array, concat) 143 float_complex_array, concat)
144 144
145 DEFNDCATOP_FN (m_fcm, matrix, float_complex_matrix, float_array, 145 DEFNDCATOP_FN (m_fcm, matrix, float_complex_matrix, float_array,
146 float_complex_array, concat) 146 float_complex_array, concat)
147 147
148 DEFNDCATOP_FN (fm_cm, float_matrix, complex_matrix, float_array, 148 DEFNDCATOP_FN (fm_cm, float_matrix, complex_matrix, float_array,
149 float_complex_array, concat) 149 float_complex_array, concat)
150 150
151 DEFCONV (float_complex_matrix_conv, float_matrix, float_complex_matrix) 151 DEFCONV (float_complex_matrix_conv, float_matrix, float_complex_matrix)
152 { 152 {
153 CAST_CONV_ARG (const octave_float_matrix&); 153 CAST_CONV_ARG (const octave_float_matrix&);
161 INSTALL_BINOP (op_add, octave_float_matrix, octave_float_complex_matrix, add); 161 INSTALL_BINOP (op_add, octave_float_matrix, octave_float_complex_matrix, add);
162 INSTALL_BINOP (op_sub, octave_float_matrix, octave_float_complex_matrix, sub); 162 INSTALL_BINOP (op_sub, octave_float_matrix, octave_float_complex_matrix, sub);
163 INSTALL_BINOP (op_mul, octave_float_matrix, octave_float_complex_matrix, mul); 163 INSTALL_BINOP (op_mul, octave_float_matrix, octave_float_complex_matrix, mul);
164 INSTALL_BINOP (op_div, octave_float_matrix, octave_float_complex_matrix, div); 164 INSTALL_BINOP (op_div, octave_float_matrix, octave_float_complex_matrix, div);
165 INSTALL_BINOP (op_pow, octave_float_matrix, octave_float_complex_matrix, pow); 165 INSTALL_BINOP (op_pow, octave_float_matrix, octave_float_complex_matrix, pow);
166 INSTALL_BINOP (op_ldiv, octave_float_matrix, 166 INSTALL_BINOP (op_ldiv, octave_float_matrix,
167 octave_float_complex_matrix, ldiv); 167 octave_float_complex_matrix, ldiv);
168 INSTALL_BINOP (op_lt, octave_float_matrix, octave_float_complex_matrix, lt); 168 INSTALL_BINOP (op_lt, octave_float_matrix, octave_float_complex_matrix, lt);
169 INSTALL_BINOP (op_le, octave_float_matrix, octave_float_complex_matrix, le); 169 INSTALL_BINOP (op_le, octave_float_matrix, octave_float_complex_matrix, le);
170 INSTALL_BINOP (op_eq, octave_float_matrix, octave_float_complex_matrix, eq); 170 INSTALL_BINOP (op_eq, octave_float_matrix, octave_float_complex_matrix, eq);
171 INSTALL_BINOP (op_ge, octave_float_matrix, octave_float_complex_matrix, ge); 171 INSTALL_BINOP (op_ge, octave_float_matrix, octave_float_complex_matrix, ge);
172 INSTALL_BINOP (op_gt, octave_float_matrix, octave_float_complex_matrix, gt); 172 INSTALL_BINOP (op_gt, octave_float_matrix, octave_float_complex_matrix, gt);
173 INSTALL_BINOP (op_ne, octave_float_matrix, octave_float_complex_matrix, ne); 173 INSTALL_BINOP (op_ne, octave_float_matrix, octave_float_complex_matrix, ne);
174 INSTALL_BINOP (op_el_mul, octave_float_matrix, 174 INSTALL_BINOP (op_el_mul, octave_float_matrix,
175 octave_float_complex_matrix, el_mul); 175 octave_float_complex_matrix, el_mul);
176 INSTALL_BINOP (op_el_div, octave_float_matrix, 176 INSTALL_BINOP (op_el_div, octave_float_matrix,
177 octave_float_complex_matrix, el_div); 177 octave_float_complex_matrix, el_div);
178 INSTALL_BINOP (op_el_pow, octave_float_matrix, 178 INSTALL_BINOP (op_el_pow, octave_float_matrix,
179 octave_float_complex_matrix, el_pow); 179 octave_float_complex_matrix, el_pow);
180 INSTALL_BINOP (op_el_ldiv, octave_float_matrix, 180 INSTALL_BINOP (op_el_ldiv, octave_float_matrix,
181 octave_float_complex_matrix, el_ldiv); 181 octave_float_complex_matrix, el_ldiv);
182 INSTALL_BINOP (op_el_and, octave_float_matrix, 182 INSTALL_BINOP (op_el_and, octave_float_matrix,
183 octave_float_complex_matrix, el_and); 183 octave_float_complex_matrix, el_and);
184 INSTALL_BINOP (op_el_or, octave_float_matrix, 184 INSTALL_BINOP (op_el_or, octave_float_matrix,
185 octave_float_complex_matrix, el_or); 185 octave_float_complex_matrix, el_or);
186 INSTALL_BINOP (op_trans_mul, octave_float_matrix, 186 INSTALL_BINOP (op_trans_mul, octave_float_matrix,
187 octave_float_complex_matrix, trans_mul); 187 octave_float_complex_matrix, trans_mul);
188 INSTALL_BINOP (op_herm_mul, octave_float_matrix, 188 INSTALL_BINOP (op_herm_mul, octave_float_matrix,
189 octave_float_complex_matrix, trans_mul); 189 octave_float_complex_matrix, trans_mul);
190 INSTALL_BINOP (op_trans_ldiv, octave_float_matrix, 190 INSTALL_BINOP (op_trans_ldiv, octave_float_matrix,
191 octave_float_complex_matrix, trans_ldiv); 191 octave_float_complex_matrix, trans_ldiv);
192 INSTALL_BINOP (op_herm_ldiv, octave_float_matrix, 192 INSTALL_BINOP (op_herm_ldiv, octave_float_matrix,
193 octave_float_complex_matrix, trans_ldiv); 193 octave_float_complex_matrix, trans_ldiv);
194 194
195 INSTALL_CATOP (octave_float_matrix, octave_float_complex_matrix, fm_fcm); 195 INSTALL_CATOP (octave_float_matrix, octave_float_complex_matrix, fm_fcm);
196 INSTALL_CATOP (octave_matrix, octave_float_complex_matrix, m_fcm); 196 INSTALL_CATOP (octave_matrix, octave_float_complex_matrix, m_fcm);
197 INSTALL_CATOP (octave_float_matrix, octave_complex_matrix, fm_cm); 197 INSTALL_CATOP (octave_float_matrix, octave_complex_matrix, fm_cm);
198 198
199 INSTALL_ASSIGNCONV (octave_float_matrix, octave_float_complex_matrix, 199 INSTALL_ASSIGNCONV (octave_float_matrix, octave_float_complex_matrix,
200 octave_float_complex_matrix); 200 octave_float_complex_matrix);
201 INSTALL_ASSIGNCONV (octave_matrix, octave_float_complex_matrix, 201 INSTALL_ASSIGNCONV (octave_matrix, octave_float_complex_matrix,
202 octave_complex_matrix); 202 octave_complex_matrix);
203 203
204 INSTALL_WIDENOP (octave_float_matrix, octave_float_complex_matrix, 204 INSTALL_WIDENOP (octave_float_matrix, octave_float_complex_matrix,
205 float_complex_matrix_conv); 205 float_complex_matrix_conv);
206 } 206 }