Mercurial > octave

comparison src/OPERATORS/op-scm-sm.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
59 return octave_value (v1.sparse_complex_matrix_value () / d); 59 return octave_value (v1.sparse_complex_matrix_value () / d);
60 } 60 }
61 else 61 else
62 { 62 {
63 MatrixType typ = v2.matrix_type (); 63 MatrixType typ = v2.matrix_type ();
64 SparseComplexMatrix ret = xdiv (v1.sparse_complex_matrix_value (), 64 SparseComplexMatrix ret = xdiv (v1.sparse_complex_matrix_value (),
65 v2.sparse_matrix_value (), typ); 65 v2.sparse_matrix_value (), typ);
66 66
67 v2.matrix_type (typ); 67 v2.matrix_type (typ);
68 return ret; 68 return ret;
69 } 69 }
70 } 70 }
71 71
90 } 90 }
91 else 91 else
92 { 92 {
93 MatrixType typ = v1.matrix_type (); 93 MatrixType typ = v1.matrix_type ();
94 94
95 SparseComplexMatrix ret = xleftdiv (v1.sparse_complex_matrix_value (), 95 SparseComplexMatrix ret = xleftdiv (v1.sparse_complex_matrix_value (),
96 v2.sparse_matrix_value (), typ); 96 v2.sparse_matrix_value (), typ);
97 97
98 v1.matrix_type (typ); 98 v1.matrix_type (typ);
99 return ret; 99 return ret;
100 } 100 }
111 DEFBINOP_FN (el_div, sparse_complex_matrix, sparse_matrix, quotient) 111 DEFBINOP_FN (el_div, sparse_complex_matrix, sparse_matrix, quotient)
112 DEFBINOP_FN (el_pow, sparse_complex_matrix, sparse_matrix, elem_xpow) 112 DEFBINOP_FN (el_pow, sparse_complex_matrix, sparse_matrix, elem_xpow)
113 113
114 DEFBINOP (el_ldiv, sparse_complex_matrix, sparse_matrix) 114 DEFBINOP (el_ldiv, sparse_complex_matrix, sparse_matrix)
115 { 115 {
116 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, 116 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&,
117 const octave_sparse_matrix&); 117 const octave_sparse_matrix&);
118 118
119 return octave_value 119 return octave_value
120 (quotient (v2.sparse_matrix_value (), v1.sparse_complex_matrix_value ())); 120 (quotient (v2.sparse_matrix_value (), v1.sparse_complex_matrix_value ()));
121 } 121 }
140 div); 140 div);
141 INSTALL_BINOP (op_pow, octave_sparse_complex_matrix, octave_sparse_matrix, 141 INSTALL_BINOP (op_pow, octave_sparse_complex_matrix, octave_sparse_matrix,
142 pow); 142 pow);
143 INSTALL_BINOP (op_ldiv, octave_sparse_complex_matrix, octave_sparse_matrix, 143 INSTALL_BINOP (op_ldiv, octave_sparse_complex_matrix, octave_sparse_matrix,
144 ldiv); 144 ldiv);
145 INSTALL_BINOP (op_lt, octave_sparse_complex_matrix, octave_sparse_matrix, 145 INSTALL_BINOP (op_lt, octave_sparse_complex_matrix, octave_sparse_matrix,
146 lt); 146 lt);
147 INSTALL_BINOP (op_le, octave_sparse_complex_matrix, octave_sparse_matrix, 147 INSTALL_BINOP (op_le, octave_sparse_complex_matrix, octave_sparse_matrix,
148 le); 148 le);
149 INSTALL_BINOP (op_eq, octave_sparse_complex_matrix, octave_sparse_matrix, 149 INSTALL_BINOP (op_eq, octave_sparse_complex_matrix, octave_sparse_matrix,
150 eq); 150 eq);
151 INSTALL_BINOP (op_ge, octave_sparse_complex_matrix, octave_sparse_matrix, 151 INSTALL_BINOP (op_ge, octave_sparse_complex_matrix, octave_sparse_matrix,
152 ge); 152 ge);
153 INSTALL_BINOP (op_gt, octave_sparse_complex_matrix, octave_sparse_matrix, 153 INSTALL_BINOP (op_gt, octave_sparse_complex_matrix, octave_sparse_matrix,
154 gt); 154 gt);
155 INSTALL_BINOP (op_ne, octave_sparse_complex_matrix, octave_sparse_matrix, 155 INSTALL_BINOP (op_ne, octave_sparse_complex_matrix, octave_sparse_matrix,
156 ne); 156 ne);
157 INSTALL_BINOP (op_el_mul, octave_sparse_complex_matrix, 157 INSTALL_BINOP (op_el_mul, octave_sparse_complex_matrix,
158 octave_sparse_matrix, el_mul); 158 octave_sparse_matrix, el_mul);
159 INSTALL_BINOP (op_el_div, octave_sparse_complex_matrix, 159 INSTALL_BINOP (op_el_div, octave_sparse_complex_matrix,
160 octave_sparse_matrix, el_div); 160 octave_sparse_matrix, el_div);
161 INSTALL_BINOP (op_el_pow, octave_sparse_complex_matrix, 161 INSTALL_BINOP (op_el_pow, octave_sparse_complex_matrix,
162 octave_sparse_matrix, el_pow); 162 octave_sparse_matrix, el_pow);
163 INSTALL_BINOP (op_el_ldiv, octave_sparse_complex_matrix, 163 INSTALL_BINOP (op_el_ldiv, octave_sparse_complex_matrix,
164 octave_sparse_matrix, el_ldiv); 164 octave_sparse_matrix, el_ldiv);
165 INSTALL_BINOP (op_el_and, octave_sparse_complex_matrix, 165 INSTALL_BINOP (op_el_and, octave_sparse_complex_matrix,
166 octave_sparse_matrix, el_and); 166 octave_sparse_matrix, el_and);
167 INSTALL_BINOP (op_el_or, octave_sparse_complex_matrix, 167 INSTALL_BINOP (op_el_or, octave_sparse_complex_matrix,
168 octave_sparse_matrix, el_or); 168 octave_sparse_matrix, el_or);
169 169
170 INSTALL_CATOP (octave_sparse_complex_matrix, octave_sparse_matrix, scm_sm); 170 INSTALL_CATOP (octave_sparse_complex_matrix, octave_sparse_matrix, scm_sm);
171 171
172 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, 172 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix,
173 octave_sparse_matrix, assign); 173 octave_sparse_matrix, assign);
174 } 174 }