Mercurial > octave
annotate libinterp/operators/op-m-sm.cc @ 21100:e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
* libinterp/corefcn/errwarn.h, libinterp/corefcn/errwarn.cc: New header and .cc
file with common errors and warnings for libinterp.
* libinterp/corefcn/module.mk: Add errwarn.h, errwarn.cc to build system.
* liboctave/util/lo-array-errwarn.h, liboctave/util/lo-array-errwarn.cc: New
header and .cc file with common errors and warnings for liboctave.
* liboctave/util/module.mk: Add lo-array-errwarn.h, lo-array-errwarn.cc to
build system.
* lo-array-gripes.h: #include "lo-array-errwarn.h" for access to class
index_exception. Remove const char *error_id_XXX prototypes.
* lo-array-gripes.cc: Remove const char *error_id_XXX initializations.
Remove index_exception method definitions.
* Cell.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, betainc.cc, cellfun.cc,
daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, defaults.cc, det.cc,
dirfns.cc, eig.cc, fft.cc, fft2.cc, fftn.cc, find.cc, gammainc.cc, gcd.cc,
getgrent.cc, getpwent.cc, graphics.in.h, help.cc, hess.cc, hex2num.cc,
input.cc, inv.cc, jit-typeinfo.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, mgorth.cc, oct-hist.cc, oct-procbuf.cc,
oct-stream.cc, oct.h, pager.cc, pinv.cc, pr-output.cc, quad.cc, qz.cc, rand.cc,
rcond.cc, regexp.cc, schur.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc,
spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
sylvester.cc, syscalls.cc, typecast.cc, utils.cc, variables.cc, xdiv.cc,
xnorm.cc, xpow.cc, __eigs__.cc, __glpk__.cc, __magick_read__.cc,
__osmesa_print__.cc, audiodevinfo.cc, audioread.cc, chol.cc, dmperm.cc,
fftw.cc, qr.cc, symbfact.cc, symrcm.cc, ov-base-diag.cc, ov-base-int.cc,
ov-base-mat.cc, ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc,
ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc,
ov-ch-mat.cc, ov-class.cc, ov-complex.cc, ov-complex.h, ov-cs-list.cc,
ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc,
ov-fcn-inline.cc, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h,
ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-mex-fcn.cc, ov-perm.cc,
ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h,
ov-str-mat.cc, ov-struct.cc, ov-type-conv.h, ov-uint16.cc, ov-uint32.cc,
ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc, ov.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-dms-template.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-int.h, 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,
ops.h, lex.ll, pt-assign.cc, pt-eval.cc, pt-idx.cc, pt-loop.cc, pt-mat.cc,
pt-stmt.cc, Array-util.cc, Array-util.h, Array.cc, CColVector.cc,
CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc,
DiagArray2.cc, MDiagArray2.cc, MSparse.cc, PermMatrix.cc, Range.cc, Sparse.cc,
dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc,
dSparse.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc,
fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc,
fRowVector.cc, idx-vector.cc, CmplxGEPBAL.cc, dbleGEPBAL.cc, fCmplxGEPBAL.cc,
floatGEPBAL.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h, Sparse-perm-op-defs.h,
mx-inlines.cc, mx-op-defs.h, oct-binmap.h:
Replace 'include "gripes.h"' with 'include "errwarn.h". Change all gripe_XXX
to err_XXX or warn_XXX or errwarn_XXX.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 18 Jan 2016 18:28:06 -0800 |
| parents | 48b2ad5ee801 |
| children | fcac5dbbf9ed |
| 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 | |
|
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
28 #include "errwarn.h" |
|
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
29 #include "ovl.h" |
| 5164 | 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) | |
|
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
58 warn_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 } | |
| 77 | |
| 78 DEFBINOP (ldiv, matrix, sparse_matrix) | |
| 79 { | |
| 80 CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); | |
| 5785 | 81 MatrixType typ = v1.matrix_type (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
82 |
| 5785 | 83 Matrix ret = xleftdiv (v1.matrix_value (), v2.matrix_value (), typ); |
| 84 | |
| 85 v1.matrix_type (typ); | |
| 86 return ret; | |
| 5164 | 87 } |
| 88 | |
|
7802
1a446f28ce68
implement optimized sparse-dense transposed multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
7289
diff
changeset
|
89 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
|
90 |
| 5164 | 91 DEFBINOP_FN (lt, matrix, sparse_matrix, mx_el_lt) |
| 92 DEFBINOP_FN (le, matrix, sparse_matrix, mx_el_le) | |
| 93 DEFBINOP_FN (eq, matrix, sparse_matrix, mx_el_eq) | |
| 94 DEFBINOP_FN (ge, matrix, sparse_matrix, mx_el_ge) | |
| 95 DEFBINOP_FN (gt, matrix, sparse_matrix, mx_el_gt) | |
| 96 DEFBINOP_FN (ne, matrix, sparse_matrix, mx_el_ne) | |
| 97 | |
| 98 DEFBINOP_FN (el_mul, matrix, sparse_matrix, product) | |
| 99 DEFBINOP_FN (el_div, matrix, sparse_matrix, quotient) | |
| 100 | |
| 101 DEFBINOP (el_pow, matrix, sparse_matrix) | |
| 102 { | |
| 103 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
|
104 |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
105 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
|
106 v2.sparse_matrix_value ())); |
| 5164 | 107 } |
| 108 | |
| 109 DEFBINOP (el_ldiv, matrix, sparse_matrix) | |
| 110 { | |
| 111 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
|
112 |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
113 return octave_value |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
114 (quotient (v2.sparse_matrix_value (), v1.matrix_value ())); |
| 5164 | 115 } |
| 116 | |
| 117 DEFBINOP_FN (el_and, matrix, sparse_matrix, mx_el_and) | |
| 118 DEFBINOP_FN (el_or, matrix, sparse_matrix, mx_el_or) | |
| 119 | |
| 120 DEFCATOP (m_sm, matrix, sparse_matrix) | |
| 121 { | |
| 122 CAST_BINOP_ARGS (octave_matrix&, const octave_sparse_matrix&); | |
| 123 SparseMatrix tmp (v1.matrix_value ()); | |
| 124 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); | |
| 125 } | |
| 126 | |
| 127 DEFCONV (sparse_matrix_conv, matrix, sparse_matrix) | |
| 128 { | |
| 129 CAST_CONV_ARG (const octave_matrix&); | |
| 130 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ())); | |
| 131 } | |
| 132 | |
| 7289 | 133 DEFNDASSIGNOP_FN (assign, matrix, sparse_matrix, array, assign) |
| 134 | |
| 5164 | 135 void |
| 136 install_m_sm_ops (void) | |
| 137 { | |
| 138 INSTALL_BINOP (op_add, octave_matrix, octave_sparse_matrix, add); | |
| 139 INSTALL_BINOP (op_sub, octave_matrix, octave_sparse_matrix, sub); | |
| 140 INSTALL_BINOP (op_mul, octave_matrix, octave_sparse_matrix, mul); | |
| 141 INSTALL_BINOP (op_div, octave_matrix, octave_sparse_matrix, div); | |
| 142 INSTALL_BINOP (op_pow, octave_matrix, octave_sparse_matrix, pow); | |
| 143 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
|
144 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
|
145 INSTALL_BINOP (op_mul_herm, octave_matrix, octave_sparse_matrix, mul_trans); |
| 5164 | 146 INSTALL_BINOP (op_lt, octave_matrix, octave_sparse_matrix, lt); |
| 147 INSTALL_BINOP (op_le, octave_matrix, octave_sparse_matrix, le); | |
| 148 INSTALL_BINOP (op_eq, octave_matrix, octave_sparse_matrix, eq); | |
| 149 INSTALL_BINOP (op_ge, octave_matrix, octave_sparse_matrix, ge); | |
| 150 INSTALL_BINOP (op_gt, octave_matrix, octave_sparse_matrix, gt); | |
| 151 INSTALL_BINOP (op_ne, octave_matrix, octave_sparse_matrix, ne); | |
| 152 INSTALL_BINOP (op_el_mul, octave_matrix, octave_sparse_matrix, el_mul); | |
| 153 INSTALL_BINOP (op_el_div, octave_matrix, octave_sparse_matrix, el_div); | |
| 154 INSTALL_BINOP (op_el_pow, octave_matrix, octave_sparse_matrix, el_pow); | |
| 155 INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_sparse_matrix, el_ldiv); | |
| 156 INSTALL_BINOP (op_el_and, octave_matrix, octave_sparse_matrix, el_and); | |
| 157 INSTALL_BINOP (op_el_or, octave_matrix, octave_sparse_matrix, el_or); | |
| 158 | |
| 159 INSTALL_CATOP (octave_matrix, octave_sparse_matrix, m_sm); | |
| 160 | |
| 7289 | 161 INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_sparse_matrix, assign) |
| 162 INSTALL_ASSIGNCONV (octave_matrix, octave_sparse_matrix, octave_matrix) | |
| 5164 | 163 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
164 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
|
165 sparse_matrix_conv); |
| 5164 | 166 } |