Mercurial > hg > octave-nkf

comparison src/OPERATORS/op-s-cm.cc @ 4915:c638c144d4da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-07-23 19:01:22 by jwe]
author jwe
date Fri, 23 Jul 2004 19:01:23 +0000
parents 69a9b22a72a2
children 57077d0ddc8e
comparison
equal deleted inserted replaced
4914:1c0442da75fd 4915:c638c144d4da
109 CAST_BINOP_ARGS (const octave_scalar&, const octave_complex_matrix&); 109 CAST_BINOP_ARGS (const octave_scalar&, const octave_complex_matrix&);
110 110
111 return mx_el_or (v1.double_value (), v2.complex_array_value ()); 111 return mx_el_or (v1.double_value (), v2.complex_array_value ());
112 } 112 }
113 113
114 DEFNDCATOP_FN (s_cm, scalar, complex_matrix, array, complex_array, concat)
115
114 DEFCONV (complex_matrix_conv, scalar, complex_matrix) 116 DEFCONV (complex_matrix_conv, scalar, complex_matrix)
115 { 117 {
116 CAST_CONV_ARG (const octave_scalar&); 118 CAST_CONV_ARG (const octave_scalar&);
117 119
118 return new octave_complex_matrix (ComplexMatrix (v.matrix_value ())); 120 return new octave_complex_matrix (ComplexMatrix (v.matrix_value ()));
138 INSTALL_BINOP (op_el_pow, octave_scalar, octave_complex_matrix, el_pow); 140 INSTALL_BINOP (op_el_pow, octave_scalar, octave_complex_matrix, el_pow);
139 INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_complex_matrix, el_ldiv); 141 INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_complex_matrix, el_ldiv);
140 INSTALL_BINOP (op_el_and, octave_scalar, octave_complex_matrix, el_and); 142 INSTALL_BINOP (op_el_and, octave_scalar, octave_complex_matrix, el_and);
141 INSTALL_BINOP (op_el_or, octave_scalar, octave_complex_matrix, el_or); 143 INSTALL_BINOP (op_el_or, octave_scalar, octave_complex_matrix, el_or);
142 144
145 INSTALL_CATOP (octave_scalar, octave_complex_matrix, s_cm);
146
143 INSTALL_ASSIGNCONV (octave_scalar, octave_complex_matrix, octave_complex_matrix); 147 INSTALL_ASSIGNCONV (octave_scalar, octave_complex_matrix, octave_complex_matrix);
144 148
145 INSTALL_WIDENOP (octave_scalar, octave_complex_matrix, complex_matrix_conv); 149 INSTALL_WIDENOP (octave_scalar, octave_complex_matrix, complex_matrix_conv);
146 } 150 }
147 151