Mercurial > octave-nkf

comparison src/OPERATORS/op-cs-scm.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
68 } 68 }
69 } 69 }
70 70
71 DEFBINOP (pow, complex, sparse_complex_matrix) 71 DEFBINOP (pow, complex, sparse_complex_matrix)
72 { 72 {
73 CAST_BINOP_ARGS (const octave_complex&, 73 CAST_BINOP_ARGS (const octave_complex&,
74 const octave_sparse_complex_matrix&); 74 const octave_sparse_complex_matrix&);
75 return xpow (v1.complex_value (), v2.complex_matrix_value ()); 75 return xpow (v1.complex_value (), v2.complex_matrix_value ());
76 } 76 }
77 77
78 DEFBINOP (ldiv, complex, sparse_complex_matrix) 78 DEFBINOP (ldiv, complex, sparse_complex_matrix)
119 119
120 DEFCATOP (cs_scm, complex, sparse_complex_matrix) 120 DEFCATOP (cs_scm, complex, sparse_complex_matrix)
121 { 121 {
122 CAST_BINOP_ARGS (octave_complex&, const octave_sparse_complex_matrix&); 122 CAST_BINOP_ARGS (octave_complex&, const octave_sparse_complex_matrix&);
123 SparseComplexMatrix tmp (1, 1, v1.complex_value ()); 123 SparseComplexMatrix tmp (1, 1, v1.complex_value ());
124 return octave_value (tmp. concat (v2.sparse_complex_matrix_value (), 124 return octave_value (tmp. concat (v2.sparse_complex_matrix_value (),
125 ra_idx)); 125 ra_idx));
126 } 126 }
127 127
128 DEFCONV (sparse_complex_matrix_conv, complex, sparse_complex_matrix) 128 DEFCONV (sparse_complex_matrix_conv, complex, sparse_complex_matrix)
129 { 129 {
130 CAST_CONV_ARG (const octave_complex&); 130 CAST_CONV_ARG (const octave_complex&);
131 131
132 return new octave_sparse_complex_matrix 132 return new octave_sparse_complex_matrix
133 (SparseComplexMatrix (v.complex_matrix_value ())); 133 (SparseComplexMatrix (v.complex_matrix_value ()));
134 } 134 }
135 135
136 void 136 void
137 install_cs_scm_ops (void) 137 install_cs_scm_ops (void)
139 INSTALL_BINOP (op_add, octave_complex, octave_sparse_complex_matrix, add); 139 INSTALL_BINOP (op_add, octave_complex, octave_sparse_complex_matrix, add);
140 INSTALL_BINOP (op_sub, octave_complex, octave_sparse_complex_matrix, sub); 140 INSTALL_BINOP (op_sub, octave_complex, octave_sparse_complex_matrix, sub);
141 INSTALL_BINOP (op_mul, octave_complex, octave_sparse_complex_matrix, mul); 141 INSTALL_BINOP (op_mul, octave_complex, octave_sparse_complex_matrix, mul);
142 INSTALL_BINOP (op_div, octave_complex, octave_sparse_complex_matrix, div); 142 INSTALL_BINOP (op_div, octave_complex, octave_sparse_complex_matrix, div);
143 INSTALL_BINOP (op_pow, octave_complex, octave_sparse_complex_matrix, pow); 143 INSTALL_BINOP (op_pow, octave_complex, octave_sparse_complex_matrix, pow);
144 INSTALL_BINOP (op_ldiv, octave_complex, octave_sparse_complex_matrix, 144 INSTALL_BINOP (op_ldiv, octave_complex, octave_sparse_complex_matrix,
145 ldiv); 145 ldiv);
146 INSTALL_BINOP (op_lt, octave_complex, octave_sparse_complex_matrix, lt); 146 INSTALL_BINOP (op_lt, octave_complex, octave_sparse_complex_matrix, lt);
147 INSTALL_BINOP (op_le, octave_complex, octave_sparse_complex_matrix, le); 147 INSTALL_BINOP (op_le, octave_complex, octave_sparse_complex_matrix, le);
148 INSTALL_BINOP (op_eq, octave_complex, octave_sparse_complex_matrix, eq); 148 INSTALL_BINOP (op_eq, octave_complex, octave_sparse_complex_matrix, eq);
149 INSTALL_BINOP (op_ge, octave_complex, octave_sparse_complex_matrix, ge); 149 INSTALL_BINOP (op_ge, octave_complex, octave_sparse_complex_matrix, ge);
150 INSTALL_BINOP (op_gt, octave_complex, octave_sparse_complex_matrix, gt); 150 INSTALL_BINOP (op_gt, octave_complex, octave_sparse_complex_matrix, gt);
151 INSTALL_BINOP (op_ne, octave_complex, octave_sparse_complex_matrix, ne); 151 INSTALL_BINOP (op_ne, octave_complex, octave_sparse_complex_matrix, ne);
152 INSTALL_BINOP (op_el_mul, octave_complex, octave_sparse_complex_matrix, 152 INSTALL_BINOP (op_el_mul, octave_complex, octave_sparse_complex_matrix,
153 el_mul); 153 el_mul);
154 INSTALL_BINOP (op_el_div, octave_complex, octave_sparse_complex_matrix, 154 INSTALL_BINOP (op_el_div, octave_complex, octave_sparse_complex_matrix,
155 el_div); 155 el_div);
156 INSTALL_BINOP (op_el_pow, octave_complex, octave_sparse_complex_matrix, 156 INSTALL_BINOP (op_el_pow, octave_complex, octave_sparse_complex_matrix,
157 el_pow); 157 el_pow);
158 INSTALL_BINOP (op_el_ldiv, octave_complex, octave_sparse_complex_matrix, 158 INSTALL_BINOP (op_el_ldiv, octave_complex, octave_sparse_complex_matrix,
159 el_ldiv); 159 el_ldiv);
160 INSTALL_BINOP (op_el_and, octave_complex, octave_sparse_complex_matrix, 160 INSTALL_BINOP (op_el_and, octave_complex, octave_sparse_complex_matrix,
161 el_and); 161 el_and);
162 INSTALL_BINOP (op_el_or, octave_complex, octave_sparse_complex_matrix, 162 INSTALL_BINOP (op_el_or, octave_complex, octave_sparse_complex_matrix,
163 el_or); 163 el_or);
164 164
165 INSTALL_CATOP (octave_complex, octave_sparse_complex_matrix, cs_scm); 165 INSTALL_CATOP (octave_complex, octave_sparse_complex_matrix, cs_scm);
166 166
167 INSTALL_ASSIGNCONV (octave_complex, octave_sparse_complex_matrix, 167 INSTALL_ASSIGNCONV (octave_complex, octave_sparse_complex_matrix,
168 octave_complex_matrix); 168 octave_complex_matrix);
169 169
170 INSTALL_WIDENOP (octave_complex, octave_sparse_complex_matrix, 170 INSTALL_WIDENOP (octave_complex, octave_sparse_complex_matrix,
171 sparse_complex_matrix_conv); 171 sparse_complex_matrix_conv);
172 } 172 }