Mercurial > octave
view libinterp/operators/op-s-sm.cc @ 29989:b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
* xdiv.h, xdiv.cc (elem_xdiv): Rename from x_el_div.
(elem_xdiv, xdiv): Move inside octave namespace. Change all uses.
Provide deprecated wrapper functions to preserve old names.
* xnorm.h, xnorm.cc (xnorm, xcolnorms, xrownorms, xfrobnorm): Move
inside octave namespace. Change all uses. Provide deprecated wrapper
functions to preserve old names.
* xpow.h, xpow.cc (elem_xpow, xpow): Move inside octave namespace.
Change all uses. Provide deprecated wrapper functions to preserve old
names.
* ov-base.cc (install_base_type_conversions): Move inside octave
namespace.
* ops.h: Don't declare install_ops function here.
* ov-typeinfo.cc: Declare install_ops in source file instead of
including ops.h.
* mk-ops.sh: Move generated code inside octave namespace.
* 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-m-cm.cc, op-m-cs.cc,
op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-mi.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:
Move operator functions inside octave namespace.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 16 Aug 2021 21:38:22 -0400 |
parents | 7854d5752dd2 |
children | b839c36fd106 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 1998-2021 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // 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 "ovl.h" #include "ov.h" #include "ov-typeinfo.h" #include "ov-scalar.h" #include "ops.h" #include "xpow.h" #include "sparse-xpow.h" #include "sparse-xdiv.h" #include "ov-re-sparse.h" OCTAVE_NAMESPACE_BEGIN // scalar by sparse matrix ops. DEFBINOP_OP (add, scalar, sparse_matrix, +) DEFBINOP_OP (sub, scalar, sparse_matrix, -) DEFBINOP_OP (mul, scalar, sparse_matrix, *) DEFBINOP (div, scalar, sparse_matrix) { const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); if (v2.rows () == 1 && v2.columns () == 1) return octave_value (SparseMatrix (1, 1, v1.scalar_value () / v2.scalar_value ())); else { MatrixType typ = v2.matrix_type (); Matrix m1 = Matrix (1, 1, v1.double_value ()); SparseMatrix m2 = v2.sparse_matrix_value (); Matrix ret = xdiv (m1, m2, typ); v2.matrix_type (typ); return ret; } } DEFBINOP (pow, scalar, sparse_matrix) { const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); return xpow (v1.scalar_value (), v2.matrix_value ()); } DEFBINOP (ldiv, scalar, sparse_matrix) { const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); return octave_value (v2.sparse_matrix_value () / v1.double_value ()); } DEFBINOP_FN (lt, scalar, sparse_matrix, mx_el_lt) DEFBINOP_FN (le, scalar, sparse_matrix, mx_el_le) DEFBINOP_FN (eq, scalar, sparse_matrix, mx_el_eq) DEFBINOP_FN (ge, scalar, sparse_matrix, mx_el_ge) DEFBINOP_FN (gt, scalar, sparse_matrix, mx_el_gt) DEFBINOP_FN (ne, scalar, sparse_matrix, mx_el_ne) DEFBINOP_OP (el_mul, scalar, sparse_matrix, *) DEFBINOP_FN (el_div, scalar, sparse_matrix, x_el_div) DEFBINOP_FN (el_pow, scalar, sparse_matrix, elem_xpow) DEFBINOP (el_ldiv, scalar, sparse_matrix) { const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); return octave_value (v2.sparse_matrix_value () / v1.double_value ()); } DEFBINOP_FN (el_and, scalar, sparse_matrix, mx_el_and) DEFBINOP_FN (el_or, scalar, sparse_matrix, mx_el_or) DEFCATOP (s_sm, scalar, sparse_matrix) { const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); SparseMatrix tmp (1, 1, v1.scalar_value ()); return octave_value (tmp.concat (v2.sparse_matrix_value (), ra_idx)); } DEFCONV (sparse_matrix_conv, scalar, sparse_matrix) { const octave_scalar& v = dynamic_cast<const octave_scalar&> (a); return new octave_sparse_matrix (SparseMatrix (v.matrix_value ())); } void install_s_sm_ops (octave::type_info& ti) { INSTALL_BINOP_TI (ti, op_add, octave_scalar, octave_sparse_matrix, add); INSTALL_BINOP_TI (ti, op_sub, octave_scalar, octave_sparse_matrix, sub); INSTALL_BINOP_TI (ti, op_mul, octave_scalar, octave_sparse_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_scalar, octave_sparse_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_scalar, octave_sparse_matrix, pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_scalar, octave_sparse_matrix, ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_scalar, octave_sparse_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_scalar, octave_sparse_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_scalar, octave_sparse_matrix, eq); INSTALL_BINOP_TI (ti, op_ge, octave_scalar, octave_sparse_matrix, ge); INSTALL_BINOP_TI (ti, op_gt, octave_scalar, octave_sparse_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_scalar, octave_sparse_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_scalar, octave_sparse_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_scalar, octave_sparse_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_scalar, octave_sparse_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_scalar, octave_sparse_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_scalar, octave_sparse_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_scalar, octave_sparse_matrix, el_or); INSTALL_CATOP_TI (ti, octave_scalar, octave_sparse_matrix, s_sm); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_sparse_matrix, octave_matrix); INSTALL_WIDENOP_TI (ti, octave_scalar, octave_sparse_matrix, sparse_matrix_conv); } OCTAVE_NAMESPACE_END