octave: libinterp/operators/op-dm-scm.cc annotate

annotate libinterp/operators/op-dm-scm.cc @ 31605:e88a07dec498 stable

maint: Use macros to begin/end C++ namespaces. * oct-conf-post-public.in.h: Define two macros (OCTAVE_BEGIN_NAMESPACE, OCTAVE_END_NAMESPACE) that can be used to start/end a namespace. * mk-opts.pl, build-env.h, build-env.in.cc, __betainc__.cc, __contourc__.cc, __dsearchn__.cc, __eigs__.cc, __expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, auto-shlib.cc, auto-shlib.h, balance.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, data.h, debug.cc, defaults.cc, defaults.h, defun-int.h, defun.cc, det.cc, dirfns.cc, display.cc, display.h, dlmread.cc, dmperm.cc, dot.cc, dynamic-ld.cc, dynamic-ld.h, eig.cc, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gsvd.cc, gtk-manager.cc, gtk-manager.h, hash.cc, help.cc, help.h, hess.cc, hex2num.cc, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, kron.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-ascii-helper.cc, ls-ascii-helper.h, ls-oct-text.cc, ls-utils.cc, ls-utils.h, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex-private.h, mex.cc, mgorth.cc, nproc.cc, oct-fstrm.cc, oct-fstrm.h, oct-hdf5-types.cc, oct-hdf5-types.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, oct-tex-parser.yy, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-flt-fmt.cc, pr-output.cc, procstream.cc, procstream.h, psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xdiv.cc, sparse-xdiv.h, sparse-xpow.cc, sparse-xpow.h, sparse.cc, spparms.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symbfact.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, syscalls.cc, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, xdiv.h, xnorm.cc, xnorm.h, xpow.cc, xpow.h, __delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc, audioread.cc, convhulln.cc, fftw.cc, gzip.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-builtin.h, ov-cell.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-java.cc, ov-java.h, ov-mex-fcn.h, ov-null-mat.cc, ov-oncleanup.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, octave.cc, octave.h, mk-ops.sh, 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, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-vm-eval.cc, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h : Use new macros to begin/end C++ namespaces.

author	Rik <rik@octave.org>
date	Thu, 01 Dec 2022 14:23:45 -0800
parents	796f54d4ddbf
children	597f3ee61a48

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 29989 diff changeset	3 // Copyright (C) 2009-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21647 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	27 # include "config.h"
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	28 #endif
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	29
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	30 #include "mx-cm-s.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	31 #include "mx-s-cm.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	32
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	33 #include "mx-dm-cs.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	34 #include "mx-cs-dm.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	35
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	36 #include "mx-m-cs.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	37 #include "mx-cs-m.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	38
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 19697 diff changeset	39 #include "ovl.h"
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	40 #include "ov.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	41 #include "ov-typeinfo.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	42 #include "ops.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	43
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	44 #include "ov-re-diag.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	45 #include "ov-cx-diag.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	46 #include "ov-re-sparse.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	47 #include "ov-cx-sparse.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	48
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	49 #include "sparse-xdiv.h"
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	50
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30564 diff changeset	51 OCTAVE_BEGIN_NAMESPACE(octave)
29989 b260322f6730 move xdiv, xnorm, and xpow inside octave namespace John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	52
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	53 // diagonal matrix by sparse matrix ops
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	54
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	55 DEFBINOP (mul_dm_scm, diag_matrix, sparse_complex_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	56 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	57 const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	58 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	59 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	60
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	61 if (v2.rows () == 1 && v2.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	62 // If v2 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	63 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	64 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	65 std::complex<double> d = v2.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	66
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	67 return octave_value (v1.diag_matrix_value () * d);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	68 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	69 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	70 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	71 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	72 SparseComplexMatrix ret = v1.diag_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	73 v2.sparse_complex_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	74 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	75 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	76 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	77 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	78 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	79 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	80
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	81 DEFBINOP (mul_cdm_sm, complex_diag_matrix, sparse_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	82 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	83 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	84 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	85 const octave_sparse_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	86 = dynamic_cast<const octave_sparse_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	87
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	88 if (v2.rows () == 1 && v2.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	89 // If v2 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	90 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	91 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	92 std::complex<double> d = v2.scalar_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	93
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	94 return octave_value (v1.complex_diag_matrix_value () * d);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	95 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	96 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	97 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	98 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	99 SparseComplexMatrix ret = v1.complex_diag_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	100 v2.sparse_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	101 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	102 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	103 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	104 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	105 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	106 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	107
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	108 DEFBINOP (mul_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	109 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	110 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	111 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	112 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	113 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	114
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	115 if (v2.rows () == 1 && v2.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	116 // If v2 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	117 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	118 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	119 std::complex<double> d = v2.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	120
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	121 return octave_value (v1.complex_diag_matrix_value () * d);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	122 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	123 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	124 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	125 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	126 SparseComplexMatrix ret = v1.complex_diag_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	127 v2.sparse_complex_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	128 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	129 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	130 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	131 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	132 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	133 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	134
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	135 DEFBINOP (ldiv_dm_scm, diag_matrix, sparse_complex_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	136 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	137 const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	138 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	139 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	140
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	141 MatrixType typ = v2.matrix_type ();
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	142 return xleftdiv (v1.diag_matrix_value (), v2.sparse_complex_matrix_value (),
9931 fb6b6fcafa62 untabify files in src/OPERATORS directory John W. Eaton <jwe@octave.org> parents: 9732 diff changeset	143 typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	144 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	145
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	146 DEFBINOP (ldiv_cdm_sm, complex_diag_matrix, sparse_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	147 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	148 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	149 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	150 const octave_sparse_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	151 = dynamic_cast<const octave_sparse_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	152
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	153 MatrixType typ = v2.matrix_type ();
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	154 return xleftdiv (v1.complex_diag_matrix_value (), v2.sparse_matrix_value (),
9931 fb6b6fcafa62 untabify files in src/OPERATORS directory John W. Eaton <jwe@octave.org> parents: 9732 diff changeset	155 typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	156 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	157
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	158 DEFBINOP (ldiv_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	159 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	160 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	161 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	162 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	163 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	164
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	165 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	166 return xleftdiv (v1.complex_diag_matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	167 v2.sparse_complex_matrix_value (),
9931 fb6b6fcafa62 untabify files in src/OPERATORS directory John W. Eaton <jwe@octave.org> parents: 9732 diff changeset	168 typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	169 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	170
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	171 DEFBINOP (add_dm_scm, diag_matrix, sparse_complex_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	172 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	173 const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	174 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	175 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	176
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	177 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	178 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	179 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	180 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	181 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	182
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	183 return octave_value (v1.matrix_value () + d);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	184 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	185 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	186 return v1.diag_matrix_value () + v2.sparse_complex_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	187 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	188
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	189 DEFBINOP (add_cdm_sm, complex_diag_matrix, sparse_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	190 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	191 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	192 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	193 const octave_sparse_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	194 = dynamic_cast<const octave_sparse_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	195
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	196 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	197 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	198 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	199 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	200 double d = v2.scalar_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	201
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	202 return octave_value (v1.complex_matrix_value () + d);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	203 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	204 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	205 return v1.complex_diag_matrix_value () + v2.sparse_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	206 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	207
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	208 DEFBINOP (add_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	209 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	210 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	211 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	212 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	213 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	214
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	215 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	216 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	217 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	218 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	219 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	220
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	221 return octave_value (v1.complex_matrix_value () + d);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	222 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	223 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	224 return v1.complex_diag_matrix_value () + v2.sparse_complex_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	225 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	226
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	227 DEFBINOP (sub_dm_scm, diag_matrix, sparse_complex_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	228 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	229 const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	230 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	231 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	232
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	233 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	234 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	235 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	236 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	237 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	238
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	239 return octave_value (v1.matrix_value () + (-d));
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	240 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	241 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	242 return v1.diag_matrix_value () - v2.sparse_complex_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	243 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	244
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	245 DEFBINOP (sub_cdm_sm, complex_diag_matrix, sparse_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	246 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	247 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	248 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	249 const octave_sparse_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	250 = dynamic_cast<const octave_sparse_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	251
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	252 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	253 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	254 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	255 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	256 double d = v2.scalar_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	257
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	258 return octave_value (v1.complex_matrix_value () + (-d));
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	259 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	260 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	261 return v1.complex_diag_matrix_value () - v2.sparse_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	262 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	263
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	264 DEFBINOP (sub_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	265 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	266 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	267 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	268 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	269 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	270
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	271 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	272 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	273 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	274 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	275 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	276
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	277 return octave_value (v1.complex_matrix_value () + (-d));
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	278 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	279 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	280 return v1.complex_diag_matrix_value () - v2.sparse_complex_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	281 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	282
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	283 // sparse matrix by diagonal matrix ops
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	284
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	285 DEFBINOP (mul_scm_dm, sparse_complex_matrix, diag_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	286 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	287 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	288 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	289 const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	290
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	291 if (v1.rows () == 1 && v1.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	292 // If v1 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	293 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	294 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	295 std::complex<double> d = v1.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	296
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	297 return octave_value (d * v2.diag_matrix_value ());
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	298 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	299 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	300 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	301 MatrixType typ = v1.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	302 SparseComplexMatrix ret = v1.sparse_complex_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	303 v2.diag_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	304 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	305 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	306 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	307 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	308 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	309 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	310
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	311 DEFBINOP (mul_sm_cdm, sparse_matrix, complex_diag_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	312 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	313 const octave_sparse_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	314 = dynamic_cast<const octave_sparse_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	315 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	316 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	317
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	318 if (v1.rows () == 1 && v1.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	319 // If v1 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	320 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	321 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	322 std::complex<double> d = v1.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	323
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	324 return octave_value (d * v2.complex_diag_matrix_value ());
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	325 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	326 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	327 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	328 MatrixType typ = v1.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	329 SparseComplexMatrix ret = v1.sparse_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	330 v2.complex_diag_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	331 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	332 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	333 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	334 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	335 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	336 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	337
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	338 DEFBINOP (mul_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	339 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	340 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	341 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	342 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	343 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	344
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	345 if (v1.rows () == 1 && v1.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	346 // If v1 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	347 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	348 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	349 std::complex<double> d = v1.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	350
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	351 return octave_value (d * v2.complex_diag_matrix_value ());
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	352 }
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	353 else if (v2.rows () == 1 && v2.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	354 // If v2 is a scalar in disguise, don't bother with further dispatching.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	355 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	356 std::complex<double> d = v2.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	357
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	358 return octave_value (v1.sparse_complex_matrix_value () * d);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	359 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	360 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	361 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	362 MatrixType typ = v1.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	363 SparseComplexMatrix ret = v1.sparse_complex_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	364 v2.complex_diag_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	365 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	366 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	367 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	368 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	369 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	370 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	371
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	372 DEFBINOP (div_scm_dm, sparse_complex_matrix, diag_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	373 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	374 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	375 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	376 const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	377
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	378 if (v2.rows () == 1 && v2.columns () == 1)
26596 cc0d942d0e20 Remove inconsistent warning "Octave:divide-by-zero" (bug #46650). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26376 diff changeset	379 return octave_value (v1.sparse_complex_matrix_value () / v2.scalar_value ());
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	380 else
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	381 {
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	382 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	383 return xdiv (v1.sparse_complex_matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	384 v2.diag_matrix_value (), typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	385 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	386 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	387
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	388 DEFBINOP (div_sm_cdm, sparse_matrix, complex_diag_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	389 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	390 const octave_sparse_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	391 = dynamic_cast<const octave_sparse_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	392 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	393 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	394
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	395 if (v2.rows () == 1 && v2.columns () == 1)
26596 cc0d942d0e20 Remove inconsistent warning "Octave:divide-by-zero" (bug #46650). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26376 diff changeset	396 return octave_value (v1.sparse_matrix_value () / v2.complex_value ());
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	397 else
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	398 {
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	399 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	400 return xdiv (v1.sparse_matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	401 v2.complex_diag_matrix_value (), typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	402 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	403 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	404
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	405 DEFBINOP (div_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	406 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	407 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	408 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	409 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	410 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	411
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	412 if (v2.rows () == 1 && v2.columns () == 1)
26596 cc0d942d0e20 Remove inconsistent warning "Octave:divide-by-zero" (bug #46650). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26376 diff changeset	413 return octave_value (v1.sparse_complex_matrix_value () / v2.complex_value ());
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	414 else
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	415 {
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	416 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	417 return xdiv (v1.sparse_complex_matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	418 v2.complex_diag_matrix_value (), typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	419 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	420 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	421
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	422 DEFBINOP (add_sm_cdm, sparse_matrix, complex_diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	423 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	424 const octave_sparse_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	425 = dynamic_cast<const octave_sparse_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	426 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	427 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	428
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	429 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	430 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	431 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	432 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	433 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	434
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	435 return octave_value (v1.sparse_matrix_value () + d);
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	436 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	437 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	438 return v1.sparse_matrix_value () + v2.complex_diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	439 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	440
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	441 DEFBINOP (add_scm_dm, sparse_complex_matrix, diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	442 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	443 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	444 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	445 const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	446
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	447 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	448 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	449 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	450 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	451 double d = v2.scalar_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	452
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	453 return octave_value (v1.sparse_complex_matrix_value () + d);
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	454 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	455 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	456 return v1.sparse_complex_matrix_value () + v2.diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	457 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	458
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	459 DEFBINOP (add_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	460 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	461 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	462 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	463 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	464 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	465
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	466 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	467 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	468 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	469 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	470 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	471
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	472 return octave_value (v1.sparse_complex_matrix_value () + d);
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	473 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	474 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	475 return v1.sparse_complex_matrix_value () + v2.complex_diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	476 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	477
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	478 DEFBINOP (sub_sm_cdm, sparse_matrix, complex_diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	479 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	480 const octave_sparse_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	481 = dynamic_cast<const octave_sparse_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	482 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	483 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	484
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	485 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	486 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	487 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	488 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	489 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	490
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	491 return octave_value (v1.sparse_matrix_value () + (-d));
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	492 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	493 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	494 return v1.sparse_matrix_value () - v2.complex_diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	495 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	496
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	497 DEFBINOP (sub_scm_dm, sparse_complex_matrix, diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	498 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	499 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	500 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	501 const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	502
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	503 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	504 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	505 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	506 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	507 double d = v2.scalar_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	508
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	509 return octave_value (v1.sparse_complex_matrix_value () + (-d));
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	510 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	511 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	512 return v1.sparse_complex_matrix_value () - v2.diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	513 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	514
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	515 DEFBINOP (sub_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	516 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	517 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	518 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	519 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	520 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	521
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	522 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	523 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	524 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	525 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	526 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	527
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	528 return octave_value (v1.sparse_complex_matrix_value () + (-d));
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	529 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	530 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	531 return v1.sparse_complex_matrix_value () - v2.complex_diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	532 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	533
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	534 void
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	535 install_dm_scm_ops (octave::type_info& ti)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	536 {
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	537 INSTALL_BINOP_TI (ti, op_mul, octave_diag_matrix, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	538 mul_dm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	539 INSTALL_BINOP_TI (ti, op_mul, octave_complex_diag_matrix, octave_sparse_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	540 mul_cdm_sm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	541 INSTALL_BINOP_TI (ti, op_mul, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	542 octave_sparse_complex_matrix, mul_cdm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	543 INSTALL_BINOP_TI (ti, op_ldiv, octave_diag_matrix, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	544 ldiv_dm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	545 INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_diag_matrix, octave_sparse_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	546 ldiv_cdm_sm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	547 INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	548 octave_sparse_complex_matrix, ldiv_cdm_scm);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	549
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	550 INSTALL_BINOP_TI (ti, op_add, octave_diag_matrix, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	551 add_dm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	552 INSTALL_BINOP_TI (ti, op_add, octave_complex_diag_matrix, octave_sparse_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	553 add_cdm_sm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	554 INSTALL_BINOP_TI (ti, op_add, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	555 octave_sparse_complex_matrix, add_cdm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	556 INSTALL_BINOP_TI (ti, op_sub, octave_diag_matrix, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	557 sub_dm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	558 INSTALL_BINOP_TI (ti, op_sub, octave_complex_diag_matrix, octave_sparse_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	559 sub_cdm_sm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	560 INSTALL_BINOP_TI (ti, op_sub, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	561 octave_sparse_complex_matrix, sub_cdm_scm);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	562
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	563 INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, octave_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	564 mul_scm_dm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	565 INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	566 mul_sm_cdm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	567 INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	568 octave_complex_diag_matrix, mul_scm_cdm);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	569
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	570 INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, octave_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	571 div_scm_dm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	572 INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	573 div_sm_cdm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	574 INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	575 octave_complex_diag_matrix, div_scm_cdm);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	576
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	577 INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix, octave_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	578 add_scm_dm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	579 INSTALL_BINOP_TI (ti, op_add, octave_sparse_matrix, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	580 add_sm_cdm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	581 INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	582 octave_complex_diag_matrix, add_scm_cdm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	583 INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix, octave_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	584 sub_scm_dm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	585 INSTALL_BINOP_TI (ti, op_sub, octave_sparse_matrix, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	586 sub_sm_cdm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	587 INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	588 octave_complex_diag_matrix, sub_scm_cdm);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	589 }
29989 b260322f6730 move xdiv, xnorm, and xpow inside octave namespace John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	590
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30564 diff changeset	591 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libinterp/operators/op-dm-scm.cc @ 31605:e88a07dec498 stable