Mercurial > octave-nkf
annotate libinterp/operators/op-s-sm.cc @ 20614:10ec79b47808
use new string_value method to handle value extraction errors
* __voronoi__.cc, chol.cc, colamd.cc, fftw.cc:
Use new string_value method.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 08 Oct 2015 18:15:56 -0400 |
| parents | 4197fc428c7d |
| children |
| rev | line source |
|---|---|
| 5164 | 1 /* |
| 2 | |
|
19731
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17744
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" | |
| 29 #include "oct-obj.h" | |
| 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 // scalar by sparse matrix ops. | |
| 41 | |
| 42 DEFBINOP_OP (add, scalar, sparse_matrix, +) | |
| 43 DEFBINOP_OP (sub, scalar, sparse_matrix, -) | |
| 44 DEFBINOP_OP (mul, scalar, sparse_matrix, *) | |
| 45 | |
| 46 DEFBINOP (div, scalar, sparse_matrix) | |
| 47 { | |
| 5760 | 48 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_matrix&); |
| 5164 | 49 |
|
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
|
50 if (v2.rows () == 1 && v2.columns () == 1) |
| 6221 | 51 { |
| 52 double d = v2.scalar_value (); | |
| 53 | |
| 54 if (d == 0.0) | |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
55 gripe_divide_by_zero (); |
| 5164 | 56 |
|
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
57 return octave_value (SparseMatrix (1, 1, v1.scalar_value () / d)); |
| 6221 | 58 } |
| 59 else | |
| 60 { | |
| 61 MatrixType typ = v2.matrix_type (); | |
| 62 Matrix m1 = Matrix (1, 1, v1.double_value ()); | |
| 63 SparseMatrix m2 = v2.sparse_matrix_value (); | |
| 64 Matrix ret = xdiv (m1, m2, typ); | |
| 65 v2.matrix_type (typ); | |
| 66 return ret; | |
| 67 } | |
| 5164 | 68 } |
| 69 | |
| 70 DEFBINOP (pow, scalar, sparse_matrix) | |
| 71 { | |
| 72 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_matrix&); | |
| 73 return xpow (v1.scalar_value (), v2.matrix_value ()); | |
| 74 } | |
| 75 | |
| 76 DEFBINOP (ldiv, scalar, sparse_matrix) | |
| 77 { | |
| 78 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_matrix&); | |
| 79 | |
| 80 double d = v1.double_value (); | |
| 81 octave_value retval; | |
| 82 | |
| 83 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
|
84 gripe_divide_by_zero (); |
| 5164 | 85 |
|
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
86 retval = octave_value (v2.sparse_matrix_value () / d); |
| 5164 | 87 |
| 88 return retval; | |
| 89 } | |
| 90 | |
| 91 DEFBINOP_FN (lt, scalar, sparse_matrix, mx_el_lt) | |
| 92 DEFBINOP_FN (le, scalar, sparse_matrix, mx_el_le) | |
| 93 DEFBINOP_FN (eq, scalar, sparse_matrix, mx_el_eq) | |
| 94 DEFBINOP_FN (ge, scalar, sparse_matrix, mx_el_ge) | |
| 95 DEFBINOP_FN (gt, scalar, sparse_matrix, mx_el_gt) | |
| 96 DEFBINOP_FN (ne, scalar, sparse_matrix, mx_el_ne) | |
| 97 | |
| 98 DEFBINOP_OP (el_mul, scalar, sparse_matrix, *) | |
| 99 DEFBINOP_FN (el_div, scalar, sparse_matrix, x_el_div) | |
| 100 DEFBINOP_FN (el_pow, scalar, sparse_matrix, elem_xpow) | |
| 101 | |
| 102 DEFBINOP (el_ldiv, scalar, sparse_matrix) | |
| 103 { | |
| 104 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_matrix&); | |
| 105 | |
| 106 double d = v1.double_value (); | |
| 107 octave_value retval; | |
| 108 | |
| 109 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
|
110 gripe_divide_by_zero (); |
| 5164 | 111 |
|
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
112 retval = octave_value (v2.sparse_matrix_value () / d); |
| 5164 | 113 |
| 114 return retval; | |
| 115 } | |
| 116 | |
| 117 DEFBINOP_FN (el_and, scalar, sparse_matrix, mx_el_and) | |
| 118 DEFBINOP_FN (el_or, scalar, sparse_matrix, mx_el_or) | |
| 119 | |
| 120 DEFCATOP (s_sm, scalar, sparse_matrix) | |
| 121 { | |
| 122 CAST_BINOP_ARGS (octave_scalar&, const octave_sparse_matrix&); | |
| 123 SparseMatrix tmp (1, 1, v1.scalar_value ()); | |
| 5533 | 124 return octave_value (tmp.concat (v2.sparse_matrix_value (), ra_idx)); |
| 5164 | 125 } |
| 126 | |
| 127 DEFCONV (sparse_matrix_conv, scalar, sparse_matrix) | |
| 128 { | |
| 129 CAST_CONV_ARG (const octave_scalar&); | |
| 130 | |
| 131 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ())); | |
| 132 } | |
| 133 | |
| 134 void | |
| 135 install_s_sm_ops (void) | |
| 136 { | |
| 137 INSTALL_BINOP (op_add, octave_scalar, octave_sparse_matrix, add); | |
| 138 INSTALL_BINOP (op_sub, octave_scalar, octave_sparse_matrix, sub); | |
| 139 INSTALL_BINOP (op_mul, octave_scalar, octave_sparse_matrix, mul); | |
| 140 INSTALL_BINOP (op_div, octave_scalar, octave_sparse_matrix, div); | |
| 141 INSTALL_BINOP (op_pow, octave_scalar, octave_sparse_matrix, pow); | |
| 142 INSTALL_BINOP (op_ldiv, octave_scalar, octave_sparse_matrix, ldiv); | |
| 143 INSTALL_BINOP (op_lt, octave_scalar, octave_sparse_matrix, lt); | |
| 144 INSTALL_BINOP (op_le, octave_scalar, octave_sparse_matrix, le); | |
| 145 INSTALL_BINOP (op_eq, octave_scalar, octave_sparse_matrix, eq); | |
| 146 INSTALL_BINOP (op_ge, octave_scalar, octave_sparse_matrix, ge); | |
| 147 INSTALL_BINOP (op_gt, octave_scalar, octave_sparse_matrix, gt); | |
| 148 INSTALL_BINOP (op_ne, octave_scalar, octave_sparse_matrix, ne); | |
| 149 INSTALL_BINOP (op_el_mul, octave_scalar, octave_sparse_matrix, el_mul); | |
| 150 INSTALL_BINOP (op_el_div, octave_scalar, octave_sparse_matrix, el_div); | |
| 151 INSTALL_BINOP (op_el_pow, octave_scalar, octave_sparse_matrix, el_pow); | |
| 152 INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_sparse_matrix, el_ldiv); | |
| 153 INSTALL_BINOP (op_el_and, octave_scalar, octave_sparse_matrix, el_and); | |
| 154 INSTALL_BINOP (op_el_or, octave_scalar, octave_sparse_matrix, el_or); | |
| 155 | |
| 156 INSTALL_CATOP (octave_scalar, octave_sparse_matrix, s_sm); | |
| 157 | |
| 158 INSTALL_ASSIGNCONV (octave_scalar, octave_sparse_matrix, octave_matrix); | |
| 159 | |
| 160 INSTALL_WIDENOP (octave_scalar, octave_sparse_matrix, sparse_matrix_conv); | |
| 161 } |