Mercurial > hg > octave-nkf
diff src/OPERATORS/op-ui32-ui32.cc @ 4905:f7a337f3fd9e
[project @ 2004-06-17 04:11:50 by jwe]
author | jwe |
---|---|
date | Thu, 17 Jun 2004 04:14:36 +0000 |
parents | 35bfb4e0b96b |
children | 7a3a480e8645 |
line wrap: on
line diff
--- a/src/OPERATORS/op-ui32-ui32.cc +++ b/src/OPERATORS/op-ui32-ui32.cc @@ -37,99 +37,14 @@ #include "xdiv.h" #include "xpow.h" -// matrix unary ops. - -DEFNDUNOP_OP (not, uint32_matrix, uint32_array, !) -DEFNDUNOP_OP (uminus, uint32_matrix, uint32_array, -) - -DEFUNOP (transpose, uint32_matrix) -{ - CAST_UNOP_ARG (const octave_uint32_matrix&); - - if (v.ndims () > 2) - { - error ("transpose not defined for N-d objects"); - return octave_value (); - } - else - return octave_value (v.uint32_array_value().transpose ()); -} - -//DEFNCUNOP_METHOD (incr, uint32_matrix, increment) -//DEFNCUNOP_METHOD (decr, uint32_matrix, decrement) - -// matrix by matrix ops. - -DEFNDBINOP_OP (add, uint32_matrix, uint32_matrix, uint32_array, uint32_array, +) -DEFNDBINOP_OP (sub, uint32_matrix, uint32_matrix, uint32_array, uint32_array, -) - -//DEFBINOP_OP (mul, uint32_matrix, uint32_matrix, *) -//DEFBINOP_FN (div, uint32_matrix, uint32_matrix, xdiv) +#include "op-int.h" -DEFBINOPX (pow, uint32_matrix, uint32_matrix) -{ - error ("can't do A ^ B for A and B both matrices"); - return octave_value (); -} - -//DEFBINOP_FN (ldiv, uint32_matrix, uint32_matrix, xleftdiv) - -DEFNDBINOP_FN (lt, uint32_matrix, uint32_matrix, uint32_array, uint32_array, mx_el_lt) -DEFNDBINOP_FN (le, uint32_matrix, uint32_matrix, uint32_array, uint32_array, mx_el_le) -DEFNDBINOP_FN (eq, uint32_matrix, uint32_matrix, uint32_array, uint32_array, mx_el_eq) -DEFNDBINOP_FN (ge, uint32_matrix, uint32_matrix, uint32_array, uint32_array, mx_el_ge) -DEFNDBINOP_FN (gt, uint32_matrix, uint32_matrix, uint32_array, uint32_array, mx_el_gt) -DEFNDBINOP_FN (ne, uint32_matrix, uint32_matrix, uint32_array, uint32_array, mx_el_ne) - -DEFNDBINOP_FN (el_mul, uint32_matrix, uint32_matrix, uint32_array, uint32_array, product) - -DEFNDBINOP_FN (el_div, uint32_matrix, uint32_matrix, uint32_array, uint32_array, quotient) - -//DEFNDBINOP_FN (el_pow, uint32_matrix, uint32_matrix, uint32_array, uint32_array, elem_xpow) - -//DEFBINOP (el_ldiv, uint32_matrix, uint32_matrix) -//{ -// CAST_BINOP_ARGS (const octave_matrix&, const octave_matrix&); -// -// return octave_value (quotient (v2.array_value (), v1.array_value ())); -//} - -DEFNDBINOP_FN (el_and, uint32_matrix, uint32_matrix, uint32_array, uint32_array, mx_el_and) -DEFNDBINOP_FN (el_or, uint32_matrix, uint32_matrix, uint32_array, uint32_array, mx_el_or) - -DEFNDASSIGNOP_FN (assign, uint32_matrix, uint32_matrix, uint32_array, assign) +OCTAVE_INT_OPS (uint32) void install_ui32_ui32_ops (void) { - INSTALL_UNOP (op_not, octave_uint32_matrix, not); - INSTALL_UNOP (op_uminus, octave_uint32_matrix, uminus); - INSTALL_UNOP (op_transpose, octave_uint32_matrix, transpose); - INSTALL_UNOP (op_hermitian, octave_uint32_matrix, transpose); - - // INSTALL_NCUNOP (op_incr, octave_uint32_matrix, incr); - // INSTALL_NCUNOP (op_decr, octave_uint32_matrix, decr); - - INSTALL_BINOP (op_add, octave_uint32_matrix, octave_uint32_matrix, add); - INSTALL_BINOP (op_sub, octave_uint32_matrix, octave_uint32_matrix, sub); - // INSTALL_BINOP (op_mul, octave_uint32_matrix, octave_uint32_matrix, mul); - // INSTALL_BINOP (op_div, octave_uint32_matrix, octave_uint32_matrix, div); - // INSTALL_BINOP (op_pow, octave_uint32_matrix, octave_uint32_matrix, pow); - // INSTALL_BINOP (op_ldiv, octave_uint32_matrix, octave_uint32_matrix, ldiv); - INSTALL_BINOP (op_lt, octave_uint32_matrix, octave_uint32_matrix, lt); - INSTALL_BINOP (op_le, octave_uint32_matrix, octave_uint32_matrix, le); - INSTALL_BINOP (op_eq, octave_uint32_matrix, octave_uint32_matrix, eq); - INSTALL_BINOP (op_ge, octave_uint32_matrix, octave_uint32_matrix, ge); - INSTALL_BINOP (op_gt, octave_uint32_matrix, octave_uint32_matrix, gt); - INSTALL_BINOP (op_ne, octave_uint32_matrix, octave_uint32_matrix, ne); - INSTALL_BINOP (op_el_mul, octave_uint32_matrix, octave_uint32_matrix, el_mul); - INSTALL_BINOP (op_el_div, octave_uint32_matrix, octave_uint32_matrix, el_div); - // INSTALL_BINOP (op_el_pow, octave_uint32_matrix, octave_uint32_matrix, el_pow); - // INSTALL_BINOP (op_el_ldiv, octave_uint32_matrix, octave_uint32_matrix, el_ldiv); - INSTALL_BINOP (op_el_and, octave_uint32_matrix, octave_uint32_matrix, el_and); - INSTALL_BINOP (op_el_or, octave_uint32_matrix, octave_uint32_matrix, el_or); - - INSTALL_ASSIGNOP (op_asn_eq, octave_uint32_matrix, octave_uint32_matrix, assign); + OCTAVE_INSTALL_INT_OPS (uint32); } /*