Mercurial > octave
diff src/OPERATORS/op-fm-fs.cc @ 7814:87865ed7405f
Second set of single precision test code and fix of resulting bugs
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Mon, 02 Jun 2008 16:57:45 +0200 |
| parents | 82be108cc558 |
| children | 280fae940bb0 |
line wrap: on
line diff
--- a/src/OPERATORS/op-fm-fs.cc Thu May 22 22:00:26 2008 +0200 +++ b/src/OPERATORS/op-fm-fs.cc Mon Jun 02 16:57:45 2008 +0200 @@ -30,6 +30,7 @@ #include "ov.h" #include "ov-flt-re-mat.h" #include "ov-float.h" +#include "ov-scalar.h" #include "ov-typeinfo.h" #include "ops.h" #include "xdiv.h" @@ -114,6 +115,10 @@ DEFNDCATOP_FN (fm_fs, float_matrix, float_scalar, float_array, float_array, concat) +DEFNDCATOP_FN (m_fs, matrix, float_scalar, float_array, float_array, concat) + +DEFNDCATOP_FN (fm_s, float_matrix, scalar, float_array, float_array, concat) + DEFNDASSIGNOP_FN (assign, float_matrix, float_scalar, float_array, assign) DEFNDASSIGNOP_FN (dbl_assign, matrix, float_scalar, array, assign) @@ -140,6 +145,8 @@ INSTALL_BINOP (op_el_or, octave_float_matrix, octave_float_scalar, el_or); INSTALL_CATOP (octave_float_matrix, octave_float_scalar, fm_fs); + INSTALL_CATOP (octave_matrix, octave_float_scalar, m_fs); + INSTALL_CATOP (octave_float_matrix, octave_scalar, fm_s); INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_float_scalar, assign); INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_float_scalar, dbl_assign);