Mercurial > octave
view libinterp/operators/op-pm-scm.cc @ 21647:66cae7a6dc47
eliminate some macros for operator definitions
* ops.h (CAST_UNOP_ARG, CAST_BINOP_ARGS, CAST_CONV_ARG, ASSIGNOPDECL,
NULLASSIGNOPDECL, ASSIGNANYOPDECL, DEFASSIGNOP, DEFASSIGNOP_FN,
UNOPDECL, BINOPDECL, CATOPDECL): Delete macros.
* make_int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-flt-cx-diag.cc,
ov-flt-re-diag.cc, ov-lazy-idx.cc, ov-null-mat.cc, ov-perm.cc,
ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc,
op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-bm.cc, op-bm-sbm.cc,
op-cdm-cdm.cc, op-cell.cc, op-chm.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-int-conv.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, ops.h:
Expand eliminated macros in place.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 27 Apr 2016 16:13:40 -0400 |
parents | 40de9f8f23a6 |
children | aba2e6293dd8 |
line wrap: on
line source
/* Copyright (C) 2009-2015 Jason Riedy 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 <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include "errwarn.h" #include "ovl.h" #include "ov.h" #include "ov-typeinfo.h" #include "ops.h" #include "ov-perm.h" #include "ov-cx-sparse.h" // permutation matrix by sparse matrix ops DEFBINOP (mul_pm_scm, perm_matrix, sparse_complex_matrix) { const octave_perm_matrix& v1 = dynamic_cast<const octave_perm_matrix&> (a1); const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2); if (v2.rows () == 1 && v2.columns () == 1) { std::complex<double> d = v2.complex_value (); return octave_value (v1.sparse_matrix_value () * d); } else if (v1.rows () == 1 && v1.columns () == 1) return octave_value (v2.sparse_complex_matrix_value ()); else return v1.perm_matrix_value () * v2.sparse_complex_matrix_value (); } DEFBINOP (ldiv_pm_scm, perm_matrix, sparse_complex_matrix) { const octave_perm_matrix& v1 = dynamic_cast<const octave_perm_matrix&> (a1); const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2); return v1.perm_matrix_value ().inverse () * v2.sparse_complex_matrix_value (); } // sparse matrix by diagonal matrix ops DEFBINOP (mul_scm_pm, sparse_complex_matrix, perm_matrix) { const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1); const octave_perm_matrix& v2 = dynamic_cast<const octave_perm_matrix&> (a2); if (v1.rows () == 1 && v1.columns () == 1) { std::complex<double> d = v1.scalar_value (); return octave_value (d * v2.sparse_matrix_value ()); } else if (v2.rows () == 1 && v2.columns () == 1) return octave_value (v1.sparse_complex_matrix_value ()); else return v1.sparse_complex_matrix_value () * v2.perm_matrix_value (); } DEFBINOP (div_scm_pm, sparse_complex_matrix, perm_matrix) { const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1); const octave_perm_matrix& v2 = dynamic_cast<const octave_perm_matrix&> (a2); return v1.sparse_complex_matrix_value () * v2.perm_matrix_value ().inverse (); } void install_pm_scm_ops (void) { INSTALL_BINOP (op_mul, octave_perm_matrix, octave_sparse_complex_matrix, mul_pm_scm); INSTALL_BINOP (op_ldiv, octave_perm_matrix, octave_sparse_complex_matrix, ldiv_pm_scm); INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, octave_perm_matrix, mul_scm_pm); INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_perm_matrix, div_scm_pm); }