Mercurial > octave
view libinterp/operators/op-cm-cm.cc @ 24540:46440078d73b
don't use singleton for octave_value_typeinfo
* ov-typeinfo.h, ov-typeinfo.cc (type_info): New class containing the
functionaity provided by the non-static functions in the
octave_value_typeinfo class. Define in octave namespace.
(octave_value_typeinfo): Now a namespace containing global functions
instead of a class containing all static functions. Provided for
backward compatibility, so all functions are tagged as deprecated.
* ops.h (INSTALL_UNOP_TI, INSTALL_NCUNOP_TI, INSTALL_BINOP_TI,
INSTALL_CATOP_TI, INSTALL_ASSIGNOP_TI, INSTALL_ASSIGNANYOP_TI,
INSTALL_ASSIGNCONV_TI, INSTALL_WIDENOP_TI): New macros.
(install_ops): Accept reference to type_info object as
an argument.
* mk-ops.sh: Generate function decls and calls that pass reference
to type_info object as an argument.
* op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc,
op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc,
op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc,
op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc,
op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc,
op-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc,
op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc,
op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc,
op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc,
op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc,
op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int.h, op-m-cm.cc,
op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc,
op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc,
op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc,
op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc,
op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc,
op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc,
op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc,
op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc,
op-ui8-ui8.cc): Use new _T1 macros. Update install_TYPE_ops function
for each type to accept reference to type_info object as argument.
* interpreter.h, interpreter.cc (interpreter::m_type_info):
New member variable.
(interpreter::get_type_info): New function.
(interpreter::interpreter): Initialize m_type_info before
m_symbol_table. Don't call install_types or install ops. That is now
handled by the in type_info constructor. Don't call m_cdef_manager.
That is now handled by the cdef_manager constructor.
* interpreter-private.h, interpreter-private.cc (__get_type_info__):
New function. Use where necessary to get reference to
interpreter::m_type_info object.
* ov-classdef.cc, ov-classdef.h (octave_classdef::octave_classdef):
Handle all initialization here.
(octave_classdef::initialize): Delete unused function.
* ov.h, ov.cc (install_types): Accept reference to type_info object as
argument. Pass on to individual register_type functions.
* ov-base.h, ov-base.cc (DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA): Update
to define additional register_type functions that accepts reference to
type_info object.
(install_base_type_conversions): Update to use new *_TI macros.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 05 Jan 2018 18:44:53 -0500 |
parents | 194eb4bd202b |
children | 6652d3823428 |
line wrap: on
line source
/* Copyright (C) 1996-2017 John W. Eaton This file is part of Octave. Octave is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <https://www.gnu.org/licenses/>. */ #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include "errwarn.h" #include "ovl.h" #include "ov.h" #include "ov-cx-mat.h" #include "ov-flt-cx-mat.h" #include "ov-typeinfo.h" #include "ov-null-mat.h" #include "ops.h" #include "xdiv.h" #include "xpow.h" // unary complex matrix ops. DEFNDUNOP_OP (not, complex_matrix, complex_array, !) DEFNDUNOP_OP (uplus, complex_matrix, complex_array, /* no-op */) DEFNDUNOP_OP (uminus, complex_matrix, complex_array, -) DEFUNOP (transpose, complex_matrix) { const octave_complex_matrix& v = dynamic_cast<const octave_complex_matrix&> (a); if (v.ndims () > 2) error ("transpose not defined for N-D objects"); return octave_value (v.complex_matrix_value ().transpose ()); } DEFUNOP (hermitian, complex_matrix) { const octave_complex_matrix& v = dynamic_cast<const octave_complex_matrix&> (a); if (v.ndims () > 2) error ("complex-conjugate transpose not defined for N-D objects"); return octave_value (v.complex_matrix_value ().hermitian ()); } DEFNCUNOP_METHOD (incr, complex_matrix, increment) DEFNCUNOP_METHOD (decr, complex_matrix, decrement) DEFNCUNOP_METHOD (changesign, complex_matrix, changesign) // complex matrix by complex matrix ops. DEFNDBINOP_OP (add, complex_matrix, complex_matrix, complex_array, complex_array, +) DEFNDBINOP_OP (sub, complex_matrix, complex_matrix, complex_array, complex_array, -) DEFBINOP_OP (mul, complex_matrix, complex_matrix, *) DEFBINOP (div, complex_matrix, complex_matrix) { const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.complex_matrix_value (), v2.complex_matrix_value (), typ); v2.matrix_type (typ); return ret; } DEFBINOPX (pow, complex_matrix, complex_matrix) { error ("can't do A ^ B for A and B both matrices"); } DEFBINOP (ldiv, complex_matrix, complex_matrix) { const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), v2.complex_matrix_value (), typ); v1.matrix_type (typ); return ret; } DEFBINOP (trans_mul, complex_matrix, complex_matrix) { const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); return octave_value(xgemm (v1.complex_matrix_value (), v2.complex_matrix_value (), blas_trans, blas_no_trans)); } DEFBINOP (mul_trans, complex_matrix, complex_matrix) { const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); return octave_value(xgemm (v1.complex_matrix_value (), v2.complex_matrix_value (), blas_no_trans, blas_trans)); } DEFBINOP (herm_mul, complex_matrix, complex_matrix) { const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); return octave_value(xgemm (v1.complex_matrix_value (), v2.complex_matrix_value (), blas_conj_trans, blas_no_trans)); } DEFBINOP (mul_herm, complex_matrix, complex_matrix) { const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); return octave_value(xgemm (v1.complex_matrix_value (), v2.complex_matrix_value (), blas_no_trans, blas_conj_trans)); } DEFBINOP (trans_ldiv, complex_matrix, complex_matrix) { const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), v2.complex_matrix_value (), typ, blas_trans); v1.matrix_type (typ); return ret; } DEFBINOP (herm_ldiv, complex_matrix, complex_matrix) { const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), v2.complex_matrix_value (), typ, blas_conj_trans); v1.matrix_type (typ); return ret; } DEFNDCMPLXCMPOP_FN (lt, complex_matrix, complex_matrix, complex_array, complex_array, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, complex_matrix, complex_matrix, complex_array, complex_array, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, complex_matrix, complex_matrix, complex_array, complex_array, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, complex_matrix, complex_matrix, complex_array, complex_array, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, complex_matrix, complex_matrix, complex_array, complex_array, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, complex_matrix, complex_matrix, complex_array, complex_array, mx_el_ne) DEFNDBINOP_FN (el_mul, complex_matrix, complex_matrix, complex_array, complex_array, product) DEFNDBINOP_FN (el_div, complex_matrix, complex_matrix, complex_array, complex_array, quotient) DEFNDBINOP_FN (el_pow, complex_matrix, complex_matrix, complex_array, complex_array, elem_xpow) DEFBINOP (el_ldiv, complex_matrix, complex_matrix) { const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); return octave_value (quotient (v2.complex_array_value (), v1.complex_array_value ())); } DEFNDBINOP_FN (el_and, complex_matrix, complex_matrix, complex_array, complex_array, mx_el_and) DEFNDBINOP_FN (el_or, complex_matrix, complex_matrix, complex_array, complex_array, mx_el_or) DEFNDCATOP_FN (cm_cm, complex_matrix, complex_matrix, complex_array, complex_array, concat) DEFNDASSIGNOP_FN (assign, complex_matrix, complex_matrix, complex_array, assign) DEFNULLASSIGNOP_FN (null_assign, complex_matrix, delete_elements) DEFNDASSIGNOP_OP (assign_add, complex_matrix, complex_matrix, complex_array, +=) DEFNDASSIGNOP_OP (assign_sub, complex_matrix, complex_matrix, complex_array, -=) DEFNDASSIGNOP_FNOP (assign_el_mul, complex_matrix, complex_matrix, complex_array, product_eq) DEFNDASSIGNOP_FNOP (assign_el_div, complex_matrix, complex_matrix, complex_array, quotient_eq) void install_cm_cm_ops (octave::type_info& ti) { INSTALL_UNOP_TI (ti, op_not, octave_complex_matrix, not); INSTALL_UNOP_TI (ti, op_uplus, octave_complex_matrix, uplus); INSTALL_UNOP_TI (ti, op_uminus, octave_complex_matrix, uminus); INSTALL_UNOP_TI (ti, op_transpose, octave_complex_matrix, transpose); INSTALL_UNOP_TI (ti, op_hermitian, octave_complex_matrix, hermitian); INSTALL_NCUNOP_TI (ti, op_incr, octave_complex_matrix, incr); INSTALL_NCUNOP_TI (ti, op_decr, octave_complex_matrix, decr); INSTALL_NCUNOP_TI (ti, op_uminus, octave_complex_matrix, changesign); INSTALL_BINOP_TI (ti, op_add, octave_complex_matrix, octave_complex_matrix, add); INSTALL_BINOP_TI (ti, op_sub, octave_complex_matrix, octave_complex_matrix, sub); INSTALL_BINOP_TI (ti, op_mul, octave_complex_matrix, octave_complex_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_complex_matrix, octave_complex_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_complex_matrix, octave_complex_matrix, pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_matrix, octave_complex_matrix, ldiv); INSTALL_BINOP_TI (ti, op_trans_mul, octave_complex_matrix, octave_complex_matrix, trans_mul); INSTALL_BINOP_TI (ti, op_mul_trans, octave_complex_matrix, octave_complex_matrix, mul_trans); INSTALL_BINOP_TI (ti, op_herm_mul, octave_complex_matrix, octave_complex_matrix, herm_mul); INSTALL_BINOP_TI (ti, op_mul_herm, octave_complex_matrix, octave_complex_matrix, mul_herm); INSTALL_BINOP_TI (ti, op_trans_ldiv, octave_complex_matrix, octave_complex_matrix, trans_ldiv); INSTALL_BINOP_TI (ti, op_herm_ldiv, octave_complex_matrix, octave_complex_matrix, herm_ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_complex_matrix, octave_complex_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_complex_matrix, octave_complex_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_complex_matrix, octave_complex_matrix, eq); INSTALL_BINOP_TI (ti, op_ge, octave_complex_matrix, octave_complex_matrix, ge); INSTALL_BINOP_TI (ti, op_gt, octave_complex_matrix, octave_complex_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_complex_matrix, octave_complex_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_complex_matrix, octave_complex_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_complex_matrix, octave_complex_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_complex_matrix, octave_complex_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex_matrix, octave_complex_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_complex_matrix, octave_complex_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_complex_matrix, octave_complex_matrix, el_or); INSTALL_CATOP_TI (ti, octave_complex_matrix, octave_complex_matrix, cm_cm); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_complex_matrix, assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_null_matrix, null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_null_str, null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_null_sq_str, null_assign); INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_complex_matrix, octave_complex_matrix, assign_add); INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_complex_matrix, octave_complex_matrix, assign_sub); INSTALL_ASSIGNOP_TI (ti, op_el_mul_eq, octave_complex_matrix, octave_complex_matrix, assign_el_mul); INSTALL_ASSIGNOP_TI (ti, op_el_div_eq, octave_complex_matrix, octave_complex_matrix, assign_el_div); }