Mercurial > octave-nkf
comparison src/OPERATORS/op-cm-sm.cc @ 7289:e5055ed23f52
[project @ 2007-12-11 17:36:19 by jwe]
author | jwe |
---|---|
date | Tue, 11 Dec 2007 17:36:20 +0000 |
parents | a1dbe9d80eee |
children | fb6b6fcafa62 |
comparison
equal
deleted
inserted
replaced
7288:1885f4c7e4b3 | 7289:e5055ed23f52 |
---|---|
126 CAST_BINOP_ARGS (octave_complex_matrix&, const octave_sparse_matrix&); | 126 CAST_BINOP_ARGS (octave_complex_matrix&, const octave_sparse_matrix&); |
127 SparseComplexMatrix tmp (v1.complex_matrix_value ()); | 127 SparseComplexMatrix tmp (v1.complex_matrix_value ()); |
128 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); | 128 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); |
129 } | 129 } |
130 | 130 |
131 DEFNDASSIGNOP_FN (assign, complex_matrix, sparse_matrix, complex_array, assign) | |
132 | |
131 void | 133 void |
132 install_cm_sm_ops (void) | 134 install_cm_sm_ops (void) |
133 { | 135 { |
134 INSTALL_BINOP (op_add, octave_complex_matrix, octave_sparse_matrix, add); | 136 INSTALL_BINOP (op_add, octave_complex_matrix, octave_sparse_matrix, add); |
135 INSTALL_BINOP (op_sub, octave_complex_matrix, octave_sparse_matrix, sub); | 137 INSTALL_BINOP (op_sub, octave_complex_matrix, octave_sparse_matrix, sub); |
156 INSTALL_BINOP (op_el_or, octave_complex_matrix, octave_sparse_matrix, | 158 INSTALL_BINOP (op_el_or, octave_complex_matrix, octave_sparse_matrix, |
157 el_or); | 159 el_or); |
158 | 160 |
159 INSTALL_CATOP (octave_complex_matrix, octave_sparse_matrix, cm_sm); | 161 INSTALL_CATOP (octave_complex_matrix, octave_sparse_matrix, cm_sm); |
160 | 162 |
163 INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, octave_sparse_matrix, | |
164 assign); | |
165 INSTALL_ASSIGNCONV (octave_complex_matrix, octave_sparse_matrix, | |
166 octave_complex_matrix) | |
167 | |
161 } | 168 } |
162 | 169 |
163 /* | 170 /* |
164 ;;; Local Variables: *** | 171 ;;; Local Variables: *** |
165 ;;; mode: C++ *** | 172 ;;; mode: C++ *** |