octave: libinterp/operators/op-sm-s.cc annotate

annotate libinterp/operators/op-sm-s.cc @ 29845:2ef9080ca017

allow more mixed-type assignments to work for sparse matrices (bug #60859) This change allows indexed assignment to work when the LHS is a sparse matrix (real or complex) and the RHS is a single precision scalar or matrix (real or complex). * ov-base-sparse.h, ov-base-sparse.cc (octave_base_sparse<T>::assign): Declare RHS as a template type separate from the type of the sparse array itself. Move implementation to header file so that instantiation will work automatically. * Sparse.cc, Sparse.h (Sparse<T>::assign): Provide versions for scalar RHS. * op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc: Use DEFNDASSIGNOP_FN to define functions for assignment. Define and install mixed-type assignment operations for float and float complex scalar and array assignments to complex and double sparse arrays. * test/sparse-assign.tst: New tests. * test/module.mk: Update.

author	John W. Eaton <jwe@octave.org>
date	Wed, 30 Jun 2021 17:52:03 -0400
parents	7854d5752dd2
children	b260322f6730

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 //
29358 0a5b15007766 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	3 // Copyright (C) 1998-2021 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 ////////////////////////////////////////////////////////////////////////
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe 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"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	28 #endif
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	29
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 19697 diff changeset	30 #include "ovl.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	31 #include "ov.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	32 #include "ov-typeinfo.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	33 #include "ov-scalar.h"
29845 2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	34 #include "ov-float.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	35 #include "ops.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	36 #include "xpow.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	37
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	38 #include "sparse-xpow.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	39 #include "sparse-xdiv.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	40 #include "ov-re-sparse.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	41
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	42 // sparse matrix by scalar ops.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	43
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	44 DEFBINOP_OP (add, sparse_matrix, scalar, +)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	45 DEFBINOP_OP (sub, sparse_matrix, scalar, -)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	46 DEFBINOP_OP (mul, sparse_matrix, scalar, *)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	47
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	48 DEFBINOP (div, sparse_matrix, scalar)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	49 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	50 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	51 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	52
26596 cc0d942d0e20 Remove inconsistent warning "Octave:divide-by-zero" (bug #46650). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26376 diff changeset	53 return octave_value (v1.sparse_matrix_value () / v2.double_value ());
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	54 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	55
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	56 DEFBINOP (pow, sparse_matrix, scalar)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	57 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	58 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	59 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	60
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	61 double tmp = v2.scalar_value ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	62 if (static_cast<int> (tmp) == tmp)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	63 return xpow (v1.sparse_matrix_value (), tmp);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	64 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	65 return xpow (v1.matrix_value (), tmp);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	66 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	67
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	68 DEFBINOP (ldiv, sparse_matrix, scalar)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	69 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	70 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	71 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	72
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	73 if (v1.rows () == 1 && v1.columns () == 1)
26596 cc0d942d0e20 Remove inconsistent warning "Octave:divide-by-zero" (bug #46650). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26376 diff changeset	74 return octave_value (SparseMatrix(1, 1, v2.scalar_value () / v1.scalar_value ()));
6221 8e0f1eda266b [project @ 2007-01-03 17:23:33 by jwe] jwe parents: 5785 diff changeset	75 else
8e0f1eda266b [project @ 2007-01-03 17:23:33 by jwe] jwe parents: 5785 diff changeset	76 {
8e0f1eda266b [project @ 2007-01-03 17:23:33 by jwe] jwe parents: 5785 diff changeset	77 MatrixType typ = v1.matrix_type ();
8e0f1eda266b [project @ 2007-01-03 17:23:33 by jwe] jwe parents: 5785 diff changeset	78 SparseMatrix m1 = v1.sparse_matrix_value ();
8e0f1eda266b [project @ 2007-01-03 17:23:33 by jwe] jwe parents: 5785 diff changeset	79 Matrix m2 = Matrix (1, 1, v2.scalar_value ());
8e0f1eda266b [project @ 2007-01-03 17:23:33 by jwe] jwe parents: 5785 diff changeset	80 Matrix ret = xleftdiv (m1, m2, typ);
8e0f1eda266b [project @ 2007-01-03 17:23:33 by jwe] jwe parents: 5785 diff changeset	81 v1.matrix_type (typ);
8e0f1eda266b [project @ 2007-01-03 17:23:33 by jwe] jwe parents: 5785 diff changeset	82 return ret;
8e0f1eda266b [project @ 2007-01-03 17:23:33 by jwe] jwe parents: 5785 diff changeset	83 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	84 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	85
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	86 DEFBINOP_FN (lt, sparse_matrix, scalar, mx_el_lt)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	87 DEFBINOP_FN (le, sparse_matrix, scalar, mx_el_le)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	88 DEFBINOP_FN (eq, sparse_matrix, scalar, mx_el_eq)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	89 DEFBINOP_FN (ge, sparse_matrix, scalar, mx_el_ge)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	90 DEFBINOP_FN (gt, sparse_matrix, scalar, mx_el_gt)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	91 DEFBINOP_FN (ne, sparse_matrix, scalar, mx_el_ne)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	92
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	93 DEFBINOP_OP (el_mul, sparse_matrix, scalar, *)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	94
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	95 DEFBINOP (el_div, sparse_matrix, scalar)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	96 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	97 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	98 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	99
26596 cc0d942d0e20 Remove inconsistent warning "Octave:divide-by-zero" (bug #46650). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26376 diff changeset	100 return octave_value (v1.sparse_matrix_value () / v2.double_value ());
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	101 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	102
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	103 DEFBINOP_FN (el_pow, sparse_matrix, scalar, elem_xpow)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	104
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	105 DEFBINOP (el_ldiv, sparse_matrix, scalar)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	106 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	107 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	108 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	109
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	110 return octave_value
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	111 (x_el_div (v2.complex_value (), v1.sparse_matrix_value ()));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	112 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	113
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	114 DEFBINOP_FN (el_and, sparse_matrix, scalar, mx_el_and)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	115 DEFBINOP_FN (el_or, sparse_matrix, scalar, mx_el_or)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	116
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	117 DEFCATOP (sm_s, sparse_matrix, scalar)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	118 {
28630 35f974bab4c8 fix constness of cat op args John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	119 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	120 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	121 SparseMatrix tmp (1, 1, v2.scalar_value ());
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	122 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx));
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	123 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	124
29845 2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	125 DEFNDASSIGNOP_FN (assign, sparse_matrix, scalar, scalar, assign);
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	126 DEFNDASSIGNOP_FN (sgl_assign, sparse_matrix, float_scalar, scalar, assign);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	127
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	128 void
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	129 install_sm_s_ops (octave::type_info& ti)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	130 {
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	131 INSTALL_BINOP_TI (ti, op_add, octave_sparse_matrix, octave_scalar, add);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	132 INSTALL_BINOP_TI (ti, op_sub, octave_sparse_matrix, octave_scalar, sub);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	133 INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_scalar, mul);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	134 INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_scalar, div);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	135 INSTALL_BINOP_TI (ti, op_pow, octave_sparse_matrix, octave_scalar, pow);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	136 INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_matrix, octave_scalar, ldiv);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	137
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	138 INSTALL_BINOP_TI (ti, op_lt, octave_sparse_matrix, octave_scalar, lt);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	139 INSTALL_BINOP_TI (ti, op_le, octave_sparse_matrix, octave_scalar, le);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	140 INSTALL_BINOP_TI (ti, op_eq, octave_sparse_matrix, octave_scalar, eq);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	141 INSTALL_BINOP_TI (ti, op_ge, octave_sparse_matrix, octave_scalar, ge);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	142 INSTALL_BINOP_TI (ti, op_gt, octave_sparse_matrix, octave_scalar, gt);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	143 INSTALL_BINOP_TI (ti, op_ne, octave_sparse_matrix, octave_scalar, ne);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	144 INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_matrix, octave_scalar, el_mul);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	145 INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_matrix, octave_scalar, el_div);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	146 INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_matrix, octave_scalar, el_pow);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	147 INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_matrix, octave_scalar, el_ldiv);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	148 INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_matrix, octave_scalar, el_and);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	149 INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_matrix, octave_scalar, el_or);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	150
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	151 INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_scalar, sm_s);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	152
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	153 INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_scalar,
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	154 assign);
29845 2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	155 INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_float_scalar,
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	156 sgl_assign);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	157 }

Mercurial > octave

annotate libinterp/operators/op-sm-s.cc @ 29845:2ef9080ca017