comparison src/OPERATORS/op-m-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 1a446f28ce68
comparison
equal deleted inserted replaced
7288:1885f4c7e4b3 7289:e5055ed23f52
127 { 127 {
128 CAST_CONV_ARG (const octave_matrix&); 128 CAST_CONV_ARG (const octave_matrix&);
129 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ())); 129 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ()));
130 } 130 }
131 131
132 DEFNDASSIGNOP_FN (assign, matrix, sparse_matrix, array, assign)
133
132 void 134 void
133 install_m_sm_ops (void) 135 install_m_sm_ops (void)
134 { 136 {
135 INSTALL_BINOP (op_add, octave_matrix, octave_sparse_matrix, add); 137 INSTALL_BINOP (op_add, octave_matrix, octave_sparse_matrix, add);
136 INSTALL_BINOP (op_sub, octave_matrix, octave_sparse_matrix, sub); 138 INSTALL_BINOP (op_sub, octave_matrix, octave_sparse_matrix, sub);
151 INSTALL_BINOP (op_el_and, octave_matrix, octave_sparse_matrix, el_and); 153 INSTALL_BINOP (op_el_and, octave_matrix, octave_sparse_matrix, el_and);
152 INSTALL_BINOP (op_el_or, octave_matrix, octave_sparse_matrix, el_or); 154 INSTALL_BINOP (op_el_or, octave_matrix, octave_sparse_matrix, el_or);
153 155
154 INSTALL_CATOP (octave_matrix, octave_sparse_matrix, m_sm); 156 INSTALL_CATOP (octave_matrix, octave_sparse_matrix, m_sm);
155 157
156 INSTALL_ASSIGNCONV (octave_matrix, octave_sparse_matrix, 158 INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_sparse_matrix, assign)
157 octave_sparse_matrix); 159 INSTALL_ASSIGNCONV (octave_matrix, octave_sparse_matrix, octave_matrix)
158 160
159 INSTALL_WIDENOP (octave_matrix, octave_sparse_matrix, 161 INSTALL_WIDENOP (octave_matrix, octave_sparse_matrix,
160 sparse_matrix_conv); 162 sparse_matrix_conv);
161 } 163 }
162 164