Mercurial > octave-nkf
annotate libinterp/operators/op-m-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:
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" | |
| 29 #include "oct-obj.h" | |
| 30 #include "ov.h" | |
| 31 #include "ov-typeinfo.h" | |
| 32 #include "ov-re-mat.h" | |
| 33 #include "ops.h" | |
| 34 #include "xdiv.h" | |
| 35 | |
| 36 #include "sparse-xpow.h" | |
| 37 #include "sparse-xdiv.h" | |
| 38 #include "smx-sm-m.h" | |
| 39 #include "smx-m-sm.h" | |
| 40 #include "ov-re-sparse.h" | |
| 41 | |
| 42 // matrix by sparse matrix ops. | |
| 43 | |
| 44 DEFBINOP_OP (add, matrix, sparse_matrix, +) | |
| 45 DEFBINOP_OP (sub, matrix, sparse_matrix, -) | |
| 46 | |
| 5429 | 47 DEFBINOP_OP (mul, matrix, sparse_matrix, *) |
| 5164 | 48 |
| 49 DEFBINOP (div, matrix, sparse_matrix) | |
| 50 { | |
| 5760 | 51 CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); |
| 6221 | 52 |
|
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
|
53 if (v2.rows () == 1 && v2.columns () == 1) |
| 6221 | 54 { |
| 55 double d = v2.scalar_value (); | |
| 56 | |
| 57 if (d == 0.0) | |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
58 gripe_divide_by_zero (); |
| 5322 | 59 |
| 6221 | 60 return octave_value (v1.array_value () / d); |
| 61 } | |
| 62 else | |
| 63 { | |
| 64 MatrixType typ = v2.matrix_type (); | |
| 5322 | 65 |
| 6221 | 66 Matrix ret = xdiv (v1.matrix_value (), v2.sparse_matrix_value (), typ); |
| 67 | |
| 68 v2.matrix_type (typ); | |
| 69 return ret; | |
| 70 } | |
| 5164 | 71 } |
| 72 | |
| 73 DEFBINOPX (pow, matrix, sparse_matrix) | |
| 74 { | |
| 75 error ("can't do A ^ B for A and B both matrices"); | |
| 76 return octave_value (); | |
| 77 } | |
| 78 | |
| 79 DEFBINOP (ldiv, matrix, sparse_matrix) | |
| 80 { | |
| 81 CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); | |
| 5785 | 82 MatrixType typ = v1.matrix_type (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
83 |
| 5785 | 84 Matrix ret = xleftdiv (v1.matrix_value (), v2.matrix_value (), typ); |
| 85 | |
| 86 v1.matrix_type (typ); | |
| 87 return ret; | |
| 5164 | 88 } |
| 89 | |
|
7802
1a446f28ce68
implement optimized sparse-dense transposed multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
7289
diff
changeset
|
90 DEFBINOP_FN (mul_trans, matrix, sparse_matrix, mul_trans); |
|
1a446f28ce68
implement optimized sparse-dense transposed multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
7289
diff
changeset
|
91 |
| 5164 | 92 DEFBINOP_FN (lt, matrix, sparse_matrix, mx_el_lt) |
| 93 DEFBINOP_FN (le, matrix, sparse_matrix, mx_el_le) | |
| 94 DEFBINOP_FN (eq, matrix, sparse_matrix, mx_el_eq) | |
| 95 DEFBINOP_FN (ge, matrix, sparse_matrix, mx_el_ge) | |
| 96 DEFBINOP_FN (gt, matrix, sparse_matrix, mx_el_gt) | |
| 97 DEFBINOP_FN (ne, matrix, sparse_matrix, mx_el_ne) | |
| 98 | |
| 99 DEFBINOP_FN (el_mul, matrix, sparse_matrix, product) | |
| 100 DEFBINOP_FN (el_div, matrix, sparse_matrix, quotient) | |
| 101 | |
| 102 DEFBINOP (el_pow, matrix, sparse_matrix) | |
| 103 { | |
| 104 CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
105 |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
106 return octave_value (elem_xpow (SparseMatrix (v1.matrix_value ()), |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
107 v2.sparse_matrix_value ())); |
| 5164 | 108 } |
| 109 | |
| 110 DEFBINOP (el_ldiv, matrix, sparse_matrix) | |
| 111 { | |
| 112 CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
113 |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
114 return octave_value |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
115 (quotient (v2.sparse_matrix_value (), v1.matrix_value ())); |
| 5164 | 116 } |
| 117 | |
| 118 DEFBINOP_FN (el_and, matrix, sparse_matrix, mx_el_and) | |
| 119 DEFBINOP_FN (el_or, matrix, sparse_matrix, mx_el_or) | |
| 120 | |
| 121 DEFCATOP (m_sm, matrix, sparse_matrix) | |
| 122 { | |
| 123 CAST_BINOP_ARGS (octave_matrix&, const octave_sparse_matrix&); | |
| 124 SparseMatrix tmp (v1.matrix_value ()); | |
| 125 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); | |
| 126 } | |
| 127 | |
| 128 DEFCONV (sparse_matrix_conv, matrix, sparse_matrix) | |
| 129 { | |
| 130 CAST_CONV_ARG (const octave_matrix&); | |
| 131 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ())); | |
| 132 } | |
| 133 | |
| 7289 | 134 DEFNDASSIGNOP_FN (assign, matrix, sparse_matrix, array, assign) |
| 135 | |
| 5164 | 136 void |
| 137 install_m_sm_ops (void) | |
| 138 { | |
| 139 INSTALL_BINOP (op_add, octave_matrix, octave_sparse_matrix, add); | |
| 140 INSTALL_BINOP (op_sub, octave_matrix, octave_sparse_matrix, sub); | |
| 141 INSTALL_BINOP (op_mul, octave_matrix, octave_sparse_matrix, mul); | |
| 142 INSTALL_BINOP (op_div, octave_matrix, octave_sparse_matrix, div); | |
| 143 INSTALL_BINOP (op_pow, octave_matrix, octave_sparse_matrix, pow); | |
| 144 INSTALL_BINOP (op_ldiv, octave_matrix, octave_sparse_matrix, ldiv); | |
|
7802
1a446f28ce68
implement optimized sparse-dense transposed multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
7289
diff
changeset
|
145 INSTALL_BINOP (op_mul_trans, octave_matrix, octave_sparse_matrix, mul_trans); |
|
1a446f28ce68
implement optimized sparse-dense transposed multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
7289
diff
changeset
|
146 INSTALL_BINOP (op_mul_herm, octave_matrix, octave_sparse_matrix, mul_trans); |
| 5164 | 147 INSTALL_BINOP (op_lt, octave_matrix, octave_sparse_matrix, lt); |
| 148 INSTALL_BINOP (op_le, octave_matrix, octave_sparse_matrix, le); | |
| 149 INSTALL_BINOP (op_eq, octave_matrix, octave_sparse_matrix, eq); | |
| 150 INSTALL_BINOP (op_ge, octave_matrix, octave_sparse_matrix, ge); | |
| 151 INSTALL_BINOP (op_gt, octave_matrix, octave_sparse_matrix, gt); | |
| 152 INSTALL_BINOP (op_ne, octave_matrix, octave_sparse_matrix, ne); | |
| 153 INSTALL_BINOP (op_el_mul, octave_matrix, octave_sparse_matrix, el_mul); | |
| 154 INSTALL_BINOP (op_el_div, octave_matrix, octave_sparse_matrix, el_div); | |
| 155 INSTALL_BINOP (op_el_pow, octave_matrix, octave_sparse_matrix, el_pow); | |
| 156 INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_sparse_matrix, el_ldiv); | |
| 157 INSTALL_BINOP (op_el_and, octave_matrix, octave_sparse_matrix, el_and); | |
| 158 INSTALL_BINOP (op_el_or, octave_matrix, octave_sparse_matrix, el_or); | |
| 159 | |
| 160 INSTALL_CATOP (octave_matrix, octave_sparse_matrix, m_sm); | |
| 161 | |
| 7289 | 162 INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_sparse_matrix, assign) |
| 163 INSTALL_ASSIGNCONV (octave_matrix, octave_sparse_matrix, octave_matrix) | |
| 5164 | 164 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
165 INSTALL_WIDENOP (octave_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
166 sparse_matrix_conv); |
| 5164 | 167 } |