Mercurial > octave
view libinterp/operators/op-sm-m.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) 2004-2017 David Bateman Copyright (C) 1998-2004 Andy Adler 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-typeinfo.h" #include "ov-re-mat.h" #include "ops.h" #include "xdiv.h" #include "sparse-xpow.h" #include "sparse-xdiv.h" #include "smx-sm-m.h" #include "smx-m-sm.h" #include "ov-re-sparse.h" // sparse matrix by matrix ops. DEFBINOP_OP (add, sparse_matrix, matrix, +) DEFBINOP_OP (sub, sparse_matrix, matrix, -) DEFBINOP_OP (mul, sparse_matrix, matrix, *) DEFBINOP (div, sparse_matrix, matrix) { const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); MatrixType typ = v2.matrix_type (); Matrix ret = xdiv (v1.matrix_value (), v2.matrix_value (), typ); v2.matrix_type (typ); return ret; } DEFBINOPX (pow, sparse_matrix, matrix) { error ("can't do A ^ B for A and B both matrices"); } DEFBINOP (ldiv, sparse_matrix, matrix) { const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); if (v1.rows () == 1 && v1.columns () == 1) { double d = v1.scalar_value (); if (d == 0.0) warn_divide_by_zero (); return octave_value (v2.array_value () / d); } else { MatrixType typ = v1.matrix_type (); Matrix ret = xleftdiv (v1.sparse_matrix_value (), v2.matrix_value (), typ); v1.matrix_type (typ); return ret; } } DEFBINOP_FN (trans_mul, sparse_matrix, matrix, trans_mul); DEFBINOP_FN (lt, sparse_matrix, matrix, mx_el_lt) DEFBINOP_FN (le, sparse_matrix, matrix, mx_el_le) DEFBINOP_FN (eq, sparse_matrix, matrix, mx_el_eq) DEFBINOP_FN (ge, sparse_matrix, matrix, mx_el_ge) DEFBINOP_FN (gt, sparse_matrix, matrix, mx_el_gt) DEFBINOP_FN (ne, sparse_matrix, matrix, mx_el_ne) DEFBINOP_FN (el_mul, sparse_matrix, matrix, product) DEFBINOP_FN (el_div, sparse_matrix, matrix, quotient) DEFBINOP (el_pow, sparse_matrix, matrix) { const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); return octave_value (elem_xpow (v1.sparse_matrix_value (), SparseMatrix (v2.matrix_value ()))); } DEFBINOP (el_ldiv, sparse_matrix, matrix) { const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); return octave_value (quotient (v2.matrix_value (), v1.sparse_matrix_value ())); } DEFBINOP_FN (el_and, sparse_matrix, matrix, mx_el_and) DEFBINOP_FN (el_or, sparse_matrix, matrix, mx_el_or) DEFCATOP (sm_m, sparse_matrix, matrix) { octave_sparse_matrix& v1 = dynamic_cast<octave_sparse_matrix&> (a1); const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); SparseMatrix tmp (v2.matrix_value ()); return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); } DEFASSIGNOP (assign, sparse_matrix, matrix) { octave_sparse_matrix& v1 = dynamic_cast<octave_sparse_matrix&> (a1); const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); SparseMatrix tmp (v2.matrix_value ()); v1.assign (idx, tmp); return octave_value (); } void install_sm_m_ops (octave::type_info& ti) { INSTALL_BINOP_TI (ti, op_add, octave_sparse_matrix, octave_matrix, add); INSTALL_BINOP_TI (ti, op_sub, octave_sparse_matrix, octave_matrix, sub); INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_sparse_matrix, octave_matrix, pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_matrix, octave_matrix, ldiv); INSTALL_BINOP_TI (ti, op_trans_mul, octave_sparse_matrix, octave_matrix, trans_mul); INSTALL_BINOP_TI (ti, op_herm_mul, octave_sparse_matrix, octave_matrix, trans_mul); INSTALL_BINOP_TI (ti, op_lt, octave_sparse_matrix, octave_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_sparse_matrix, octave_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_matrix, octave_matrix, eq); INSTALL_BINOP_TI (ti, op_ge, octave_sparse_matrix, octave_matrix, ge); INSTALL_BINOP_TI (ti, op_gt, octave_sparse_matrix, octave_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_matrix, octave_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_matrix, octave_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_matrix, octave_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_matrix, octave_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_matrix, octave_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_matrix, octave_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_matrix, octave_matrix, el_or); INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_matrix, sm_m); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_matrix, assign); }