Mercurial > octave
annotate libinterp/operators/op-sm-s.cc @ 20940:48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
* libinterp/corefcn/oct-obj.h: Replaced. Contains a #warning issued if used in
compilation and includes "ovl.h" instead. Original file renamed to
libinterp/octave-value/ovl.h
* libinterp/corefcn/oct-obj.cc: Renamed to libinterp/octave-value/ovl.cc.
* oct-obj.cc (ovl ()): Added new function to return empty octave_value_list.
* libinterp/corefcn/module.mk: Remove oct-obj.cc from build system.
* libinterp/octave-value/module.mk: Add ovl.h and ovl.cc to build system.
* mk-opts.pl, annotation-dialog.h, Cell.cc, __contourc__.cc, __dsearchn__.cc,
__lin_interpn__.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc,
betainc.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
debug.cc, defaults.cc, defun.cc, det.cc, dirfns.cc, dlmread.cc, eig.cc,
error.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc,
gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc,
graphics.cc, gripes.cc, help.cc, hess.cc, hex2num.cc, hook-fcn.h, input.cc,
input.h, inv.cc, kron.cc, load-save.cc, lookup.cc, ls-hdf5.cc, ls-mat-ascii.cc,
ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lsode.cc, lu.cc,
luinc.cc, max.cc, mex.cc, oct-hist.cc, oct-lvalue.cc, oct-lvalue.h, oct-map.h,
oct-stream.cc, oct.h, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, quad.cc,
quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sparse-xpow.cc,
strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.h, syscalls.cc, sysdep.cc,
time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, urlwrite.cc, utils.cc,
variables.cc, xpow.cc, __delaunayn__.cc, __glpk__.cc, __voronoi__.cc,
audiodevinfo.cc, audioread.cc, chol.cc, convhulln.cc, dmperm.cc, qr.cc,
symbfact.cc, mkbuiltins, ov-base-diag.h, ov-base-int.cc, ov-base-mat.cc,
ov-base-mat.h, ov-base-scalar.cc, ov-base-sparse.cc, ov-base-sparse.h,
ov-base.cc, ov-bool-mat.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-colon.cc,
ov-complex.cc, ov-cs-list.h, ov-cx-mat.cc, ov-dld-fcn.cc, ov-fcn.cc, ov-fcn.h,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc,
ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.h, ov-mex-fcn.cc,
ov-perm.h, ov-range.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, octave.cc, 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-double-conv.cc, op-fcdm-fcdm.cc,
op-fcdm-fdm.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-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc,
op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc,
op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc,
op-int-conv.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-pm-pm.cc, op-pm-scm.cc, op-pm-sm.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,
parse.h, pt-arg-list.cc, pt-assign.cc, pt-binop.cc, pt-cbinop.cc, pt-cell.cc,
pt-colon.cc, pt-const.cc, pt-eval.h, pt-fcn-handle.cc, pt-funcall.h, pt-id.cc,
pt-idx.cc, pt-jump.cc, pt-mat.cc, pt-select.cc, pt-unop.cc, token.cc,
Array-sym.cc: replace '#include "oct-obj.h"' with '#include "ovl.h"'.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 18 Dec 2015 16:04:56 -0800 |
| parents | 4197fc428c7d |
| children | e39e05d90788 |
| rev | line source |
|---|---|
| 5164 | 1 /* |
| 2 | |
|
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
3 Copyright (C) 2004-2015 David Bateman |
| 11523 | 4 Copyright (C) 1998-2004 Andy Adler |
| 7016 | 5 |
| 6 This file is part of Octave. | |
| 5164 | 7 |
| 8 Octave is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
| 11 option) any later version. | |
| 5164 | 12 |
| 13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 7016 | 19 along with Octave; see the file COPYING. If not, see |
| 20 <http://www.gnu.org/licenses/>. | |
| 5164 | 21 |
| 22 */ | |
| 23 | |
| 24 #ifdef HAVE_CONFIG_H | |
| 25 #include <config.h> | |
| 26 #endif | |
| 27 | |
| 28 #include "gripes.h" | |
|
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
29 #include "ovl.h" |
| 5164 | 30 #include "ov.h" |
| 31 #include "ov-typeinfo.h" | |
| 32 #include "ov-scalar.h" | |
| 33 #include "ops.h" | |
| 34 #include "xpow.h" | |
| 35 | |
| 36 #include "sparse-xpow.h" | |
| 37 #include "sparse-xdiv.h" | |
| 38 #include "ov-re-sparse.h" | |
| 39 | |
| 40 // sparse matrix by scalar ops. | |
| 41 | |
| 42 DEFBINOP_OP (add, sparse_matrix, scalar, +) | |
| 43 DEFBINOP_OP (sub, sparse_matrix, scalar, -) | |
| 44 DEFBINOP_OP (mul, sparse_matrix, scalar, *) | |
| 45 | |
| 46 DEFBINOP (div, sparse_matrix, scalar) | |
| 47 { | |
| 48 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_scalar&); | |
| 49 | |
| 50 double d = v2.double_value (); | |
| 51 octave_value retval; | |
| 52 | |
| 53 if (d == 0.0) | |
|
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
54 gripe_divide_by_zero (); |
| 5164 | 55 |
|
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
56 retval = octave_value (v1.sparse_matrix_value () / d); |
| 5164 | 57 |
| 58 return retval; | |
| 59 } | |
| 60 | |
| 61 DEFBINOP (pow, sparse_matrix, scalar) | |
| 62 { | |
| 63 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_scalar&); | |
| 64 | |
| 65 double tmp = v2.scalar_value (); | |
| 66 if (static_cast<int> (tmp) == tmp) | |
| 67 return xpow (v1.sparse_matrix_value (), tmp); | |
| 68 else | |
| 69 return xpow (v1.matrix_value (), tmp); | |
| 70 } | |
| 71 | |
| 72 DEFBINOP (ldiv, sparse_matrix, scalar) | |
| 73 { | |
| 5760 | 74 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_scalar&); |
| 5164 | 75 |
|
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
|
76 if (v1.rows () == 1 && v1.columns () == 1) |
| 6221 | 77 { |
| 78 double d = v1.scalar_value (); | |
| 79 | |
| 80 if (d == 0.0) | |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
81 gripe_divide_by_zero (); |
| 5164 | 82 |
|
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
83 return octave_value (SparseMatrix(1, 1, v2.scalar_value () / d)); |
| 6221 | 84 } |
| 85 else | |
| 86 { | |
| 87 MatrixType typ = v1.matrix_type (); | |
| 88 SparseMatrix m1 = v1.sparse_matrix_value (); | |
| 89 Matrix m2 = Matrix (1, 1, v2.scalar_value ()); | |
| 90 Matrix ret = xleftdiv (m1, m2, typ); | |
| 91 v1.matrix_type (typ); | |
| 92 return ret; | |
| 93 } | |
| 5164 | 94 } |
| 95 | |
| 96 DEFBINOP_FN (lt, sparse_matrix, scalar, mx_el_lt) | |
| 97 DEFBINOP_FN (le, sparse_matrix, scalar, mx_el_le) | |
| 98 DEFBINOP_FN (eq, sparse_matrix, scalar, mx_el_eq) | |
| 99 DEFBINOP_FN (ge, sparse_matrix, scalar, mx_el_ge) | |
| 100 DEFBINOP_FN (gt, sparse_matrix, scalar, mx_el_gt) | |
| 101 DEFBINOP_FN (ne, sparse_matrix, scalar, mx_el_ne) | |
| 102 | |
| 103 DEFBINOP_OP (el_mul, sparse_matrix, scalar, *) | |
| 104 | |
| 105 DEFBINOP (el_div, sparse_matrix, scalar) | |
| 106 { | |
| 107 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_scalar&); | |
| 108 | |
| 109 double d = v2.double_value (); | |
| 110 octave_value retval; | |
| 111 | |
| 112 if (d == 0.0) | |
|
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
113 gripe_divide_by_zero (); |
| 5164 | 114 |
|
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
115 retval = octave_value (v1.sparse_matrix_value () / d); |
| 5164 | 116 |
| 117 return retval; | |
| 118 } | |
| 119 | |
| 120 DEFBINOP_FN (el_pow, sparse_matrix, scalar, elem_xpow) | |
| 121 | |
| 122 DEFBINOP (el_ldiv, sparse_matrix, scalar) | |
| 123 { | |
| 124 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_scalar&); | |
| 125 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
126 return octave_value |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
127 (x_el_div (v2.complex_value (), v1.sparse_matrix_value ())); |
| 5164 | 128 } |
| 129 | |
| 130 DEFBINOP_FN (el_and, sparse_matrix, scalar, mx_el_and) | |
| 131 DEFBINOP_FN (el_or, sparse_matrix, scalar, mx_el_or) | |
| 132 | |
| 133 DEFCATOP (sm_s, sparse_matrix, scalar) | |
| 134 { | |
| 135 CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_scalar&); | |
| 136 SparseMatrix tmp (1, 1, v2.scalar_value ()); | |
| 137 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); | |
| 138 } | |
| 139 | |
| 140 DEFASSIGNOP (assign, sparse_matrix, scalar) | |
| 141 { | |
| 142 CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_scalar&); | |
| 143 | |
| 144 SparseMatrix tmp (1, 1, v2.scalar_value ()); | |
| 145 v1.assign (idx, tmp); | |
| 146 return octave_value (); | |
| 147 } | |
| 148 | |
| 149 void | |
| 150 install_sm_s_ops (void) | |
| 151 { | |
| 152 INSTALL_BINOP (op_add, octave_sparse_matrix, octave_scalar, add); | |
| 153 INSTALL_BINOP (op_sub, octave_sparse_matrix, octave_scalar, sub); | |
| 154 INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_scalar, mul); | |
| 155 INSTALL_BINOP (op_div, octave_sparse_matrix, octave_scalar, div); | |
| 156 INSTALL_BINOP (op_pow, octave_sparse_matrix, octave_scalar, pow); | |
| 157 INSTALL_BINOP (op_ldiv, octave_sparse_matrix, octave_scalar, ldiv); | |
| 158 | |
| 159 INSTALL_BINOP (op_lt, octave_sparse_matrix, octave_scalar, lt); | |
| 160 INSTALL_BINOP (op_le, octave_sparse_matrix, octave_scalar, le); | |
| 161 INSTALL_BINOP (op_eq, octave_sparse_matrix, octave_scalar, eq); | |
| 162 INSTALL_BINOP (op_ge, octave_sparse_matrix, octave_scalar, ge); | |
| 163 INSTALL_BINOP (op_gt, octave_sparse_matrix, octave_scalar, gt); | |
| 164 INSTALL_BINOP (op_ne, octave_sparse_matrix, octave_scalar, ne); | |
| 165 INSTALL_BINOP (op_el_mul, octave_sparse_matrix, octave_scalar, el_mul); | |
| 166 INSTALL_BINOP (op_el_div, octave_sparse_matrix, octave_scalar, el_div); | |
| 167 INSTALL_BINOP (op_el_pow, octave_sparse_matrix, octave_scalar, el_pow); | |
| 168 INSTALL_BINOP (op_el_ldiv, octave_sparse_matrix, octave_scalar, el_ldiv); | |
| 169 INSTALL_BINOP (op_el_and, octave_sparse_matrix, octave_scalar, el_and); | |
| 170 INSTALL_BINOP (op_el_or, octave_sparse_matrix, octave_scalar, el_or); | |
| 171 | |
| 172 INSTALL_CATOP (octave_sparse_matrix, octave_scalar, sm_s); | |
| 173 | |
| 174 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_scalar, assign); | |
| 175 } |