Mercurial > octave-nkf
annotate src/operators/op-m-m.cc @ 15057:46b19589b593
maint: Partition src/ directory with more code in subdirs.
Create new octave-value dir for ov* code.
Create new parse-tre dir for pt* code.
Move OPERATORS and TEMPLATE-INST directories to lowercase names
* octave-value/module.mk: Hook code in octave-value dir into build system.
* octave-value/ov-base-diag.cc,
octave-value/ov-base-diag.h, octave-value/ov-base-int.cc,
octave-value/ov-base-int.h, octave-value/ov-base-mat.cc,
octave-value/ov-base-mat.h, octave-value/ov-base-scalar.cc,
octave-value/ov-base-scalar.h, octave-value/ov-base-sparse.cc,
octave-value/ov-base-sparse.h, octave-value/ov-base.cc, octave-value/ov-base.h,
octave-value/ov-bool-mat.cc, octave-value/ov-bool-mat.h,
octave-value/ov-bool-sparse.cc, octave-value/ov-bool-sparse.h,
octave-value/ov-bool.cc, octave-value/ov-bool.h, octave-value/ov-builtin.cc,
octave-value/ov-builtin.h, octave-value/ov-cell.cc, octave-value/ov-cell.h,
octave-value/ov-ch-mat.cc, octave-value/ov-ch-mat.h, octave-value/ov-class.cc,
octave-value/ov-class.h, octave-value/ov-colon.cc, octave-value/ov-colon.h,
octave-value/ov-complex.cc, octave-value/ov-complex.h,
octave-value/ov-cs-list.cc, octave-value/ov-cs-list.h,
octave-value/ov-cx-diag.cc, octave-value/ov-cx-diag.h,
octave-value/ov-cx-mat.cc, octave-value/ov-cx-mat.h,
octave-value/ov-cx-sparse.cc, octave-value/ov-cx-sparse.h,
octave-value/ov-dld-fcn.cc, octave-value/ov-dld-fcn.h,
octave-value/ov-fcn-handle.cc, octave-value/ov-fcn-handle.h,
octave-value/ov-fcn-inline.cc, octave-value/ov-fcn-inline.h,
octave-value/ov-fcn.cc, octave-value/ov-fcn.h, octave-value/ov-float.cc,
octave-value/ov-float.h, octave-value/ov-flt-complex.cc,
octave-value/ov-flt-complex.h, octave-value/ov-flt-cx-diag.cc,
octave-value/ov-flt-cx-diag.h, octave-value/ov-flt-cx-mat.cc,
octave-value/ov-flt-cx-mat.h, octave-value/ov-flt-re-diag.cc,
octave-value/ov-flt-re-diag.h, octave-value/ov-flt-re-mat.cc,
octave-value/ov-flt-re-mat.h, octave-value/ov-int-traits.h,
octave-value/ov-int16.cc, octave-value/ov-int16.h, octave-value/ov-int32.cc,
octave-value/ov-int32.h, octave-value/ov-int64.cc, octave-value/ov-int64.h,
octave-value/ov-int8.cc, octave-value/ov-int8.h, octave-value/ov-intx.h,
octave-value/ov-lazy-idx.cc, octave-value/ov-lazy-idx.h,
octave-value/ov-mex-fcn.cc, octave-value/ov-mex-fcn.h,
octave-value/ov-null-mat.cc, octave-value/ov-null-mat.h,
octave-value/ov-oncleanup.cc, octave-value/ov-oncleanup.h,
octave-value/ov-perm.cc, octave-value/ov-perm.h, octave-value/ov-range.cc,
octave-value/ov-range.h, octave-value/ov-re-diag.cc, octave-value/ov-re-diag.h,
octave-value/ov-re-mat.cc, octave-value/ov-re-mat.h,
octave-value/ov-re-sparse.cc, octave-value/ov-re-sparse.h,
octave-value/ov-scalar.cc, octave-value/ov-scalar.h,
octave-value/ov-str-mat.cc, octave-value/ov-str-mat.h,
octave-value/ov-struct.cc, octave-value/ov-struct.h,
octave-value/ov-type-conv.h, octave-value/ov-typeinfo.cc,
octave-value/ov-typeinfo.h, octave-value/ov-uint16.cc,
octave-value/ov-uint16.h, octave-value/ov-uint32.cc, octave-value/ov-uint32.h,
octave-value/ov-uint64.cc, octave-value/ov-uint64.h, octave-value/ov-uint8.cc,
octave-value/ov-uint8.h, octave-value/ov-usr-fcn.cc, octave-value/ov-usr-fcn.h,
octave-value/ov.cc, octave-value/ov.h: Moved from src/ dir to octave-value dir.
* operators/module.mk, operators/op-b-b.cc, operators/op-b-bm.cc,
operators/op-b-sbm.cc, operators/op-bm-b.cc, operators/op-bm-bm.cc,
operators/op-bm-sbm.cc, operators/op-cdm-cdm.cc, operators/op-cdm-cm.cc,
operators/op-cdm-cs.cc, operators/op-cdm-dm.cc, operators/op-cdm-m.cc,
operators/op-cdm-s.cc, operators/op-cell.cc, operators/op-chm.cc,
operators/op-class.cc, operators/op-cm-cdm.cc, operators/op-cm-cm.cc,
operators/op-cm-cs.cc, operators/op-cm-dm.cc, operators/op-cm-m.cc,
operators/op-cm-pm.cc, operators/op-cm-s.cc, operators/op-cm-scm.cc,
operators/op-cm-sm.cc, operators/op-cs-cm.cc, operators/op-cs-cs.cc,
operators/op-cs-m.cc, operators/op-cs-s.cc, operators/op-cs-scm.cc,
operators/op-cs-sm.cc, operators/op-dm-cdm.cc, operators/op-dm-cm.cc,
operators/op-dm-cs.cc, operators/op-dm-dm.cc, operators/op-dm-m.cc,
operators/op-dm-s.cc, operators/op-dm-scm.cc, operators/op-dm-sm.cc,
operators/op-dm-template.cc, operators/op-dms-template.cc,
operators/op-double-conv.cc, operators/op-fcdm-fcdm.cc,
operators/op-fcdm-fcm.cc, operators/op-fcdm-fcs.cc, operators/op-fcdm-fdm.cc,
operators/op-fcdm-fm.cc, operators/op-fcdm-fs.cc, operators/op-fcm-fcdm.cc,
operators/op-fcm-fcm.cc, operators/op-fcm-fcs.cc, operators/op-fcm-fdm.cc,
operators/op-fcm-fm.cc, operators/op-fcm-fs.cc, operators/op-fcm-pm.cc,
operators/op-fcn.cc, operators/op-fcs-fcm.cc, operators/op-fcs-fcs.cc,
operators/op-fcs-fm.cc, operators/op-fcs-fs.cc, operators/op-fdm-fcdm.cc,
operators/op-fdm-fcm.cc, operators/op-fdm-fcs.cc, operators/op-fdm-fdm.cc,
operators/op-fdm-fm.cc, operators/op-fdm-fs.cc, operators/op-float-conv.cc,
operators/op-fm-fcdm.cc, operators/op-fm-fcm.cc, operators/op-fm-fcs.cc,
operators/op-fm-fdm.cc, operators/op-fm-fm.cc, operators/op-fm-fs.cc,
operators/op-fm-pm.cc, operators/op-fs-fcm.cc, operators/op-fs-fcs.cc,
operators/op-fs-fm.cc, operators/op-fs-fs.cc, operators/op-i16-i16.cc,
operators/op-i32-i32.cc, operators/op-i64-i64.cc, operators/op-i8-i8.cc,
operators/op-int-concat.cc, operators/op-int-conv.cc, operators/op-int.h,
operators/op-m-cdm.cc, operators/op-m-cm.cc, operators/op-m-cs.cc,
operators/op-m-dm.cc, operators/op-m-m.cc, operators/op-m-pm.cc,
operators/op-m-s.cc, operators/op-m-scm.cc, operators/op-m-sm.cc,
operators/op-pm-cm.cc, operators/op-pm-fcm.cc, operators/op-pm-fm.cc,
operators/op-pm-m.cc, operators/op-pm-pm.cc, operators/op-pm-scm.cc,
operators/op-pm-sm.cc, operators/op-pm-template.cc, operators/op-range.cc,
operators/op-s-cm.cc, operators/op-s-cs.cc, operators/op-s-m.cc,
operators/op-s-s.cc, operators/op-s-scm.cc, operators/op-s-sm.cc,
operators/op-sbm-b.cc, operators/op-sbm-bm.cc, operators/op-sbm-sbm.cc,
operators/op-scm-cm.cc, operators/op-scm-cs.cc, operators/op-scm-m.cc,
operators/op-scm-s.cc, operators/op-scm-scm.cc, operators/op-scm-sm.cc,
operators/op-sm-cm.cc, operators/op-sm-cs.cc, operators/op-sm-m.cc,
operators/op-sm-s.cc, operators/op-sm-scm.cc, operators/op-sm-sm.cc,
operators/op-str-m.cc, operators/op-str-s.cc, operators/op-str-str.cc,
operators/op-struct.cc, operators/op-ui16-ui16.cc, operators/op-ui32-ui32.cc,
operators/op-ui64-ui64.cc, operators/op-ui8-ui8.cc: Moved from OPERATORS/
dir to operators/ directory.
* mkops: Correctly print comment in generated file ops.cc that it is made by
mkops. Change sed expression for OPERATORS/ to operators/.
* parse-tree/module.mk: Hook code in parse-tree dir into build system.
* parse-tree/pt-all.h, parse-tree/pt-arg-list.cc, parse-tree/pt-arg-list.h,
parse-tree/pt-assign.cc, parse-tree/pt-assign.h, parse-tree/pt-binop.cc,
parse-tree/pt-binop.h, parse-tree/pt-bp.cc, parse-tree/pt-bp.h,
parse-tree/pt-cbinop.cc, parse-tree/pt-cbinop.h, parse-tree/pt-cell.cc,
parse-tree/pt-cell.h, parse-tree/pt-check.cc, parse-tree/pt-check.h,
parse-tree/pt-cmd.cc, parse-tree/pt-cmd.h, parse-tree/pt-colon.cc,
parse-tree/pt-colon.h, parse-tree/pt-const.cc, parse-tree/pt-const.h,
parse-tree/pt-decl.cc, parse-tree/pt-decl.h, parse-tree/pt-eval.cc,
parse-tree/pt-eval.h, parse-tree/pt-except.cc, parse-tree/pt-except.h,
parse-tree/pt-exp.cc, parse-tree/pt-exp.h, parse-tree/pt-fcn-handle.cc,
parse-tree/pt-fcn-handle.h, parse-tree/pt-id.cc, parse-tree/pt-id.h,
parse-tree/pt-idx.cc, parse-tree/pt-idx.h, parse-tree/pt-jump.cc,
parse-tree/pt-jump.h, parse-tree/pt-loop.cc, parse-tree/pt-loop.h,
parse-tree/pt-mat.cc, parse-tree/pt-mat.h, parse-tree/pt-misc.cc,
parse-tree/pt-misc.h, parse-tree/pt-pr-code.cc, parse-tree/pt-pr-code.h,
parse-tree/pt-select.cc, parse-tree/pt-select.h, parse-tree/pt-stmt.cc,
parse-tree/pt-stmt.h, parse-tree/pt-unop.cc, parse-tree/pt-unop.h,
parse-tree/pt-walk.h, parse-tree/pt.cc, parse-tree/pt.h:
Moved from src/ dir to parse-tree dir.
* template-inst/Array-jit.cc, template-inst/Array-os.cc,
template-inst/Array-sym.cc, template-inst/Array-tc.cc, template-inst/module.mk:
Moved from TEMPLATE-INST dir to template-inst/ directory.
* src/Makefile.am: Add new directories to build system.
* corefcn/module.mk: Use COREFCN_SRC with all capitals to indicate it is not an
Automake special target.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 30 Jul 2012 15:29:19 -0700 |
| parents | src/OPERATORS/op-m-m.cc@460a3c6d8bf1 |
| children |
| rev | line source |
|---|---|
| 2928 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
3 Copyright (C) 1996-2012 John W. Eaton |
| 2928 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 2928 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 2928 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include "gripes.h" | |
| 4055 | 28 #include "oct-obj.h" |
| 2928 | 29 #include "ov.h" |
| 30 #include "ov-re-mat.h" | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
31 #include "ov-flt-re-mat.h" |
| 2928 | 32 #include "ov-typeinfo.h" |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7800
diff
changeset
|
33 #include "ov-null-mat.h" |
| 2928 | 34 #include "ops.h" |
| 35 #include "xdiv.h" | |
| 36 #include "xpow.h" | |
| 37 | |
| 3203 | 38 // matrix unary ops. |
| 39 | |
| 4550 | 40 DEFNDUNOP_OP (not, matrix, array, !) |
| 4965 | 41 DEFNDUNOP_OP (uplus, matrix, array, /* no-op */) |
| 4550 | 42 DEFNDUNOP_OP (uminus, matrix, array, -) |
| 3203 | 43 |
| 44 DEFUNOP (transpose, matrix) | |
| 45 { | |
| 46 CAST_UNOP_ARG (const octave_matrix&); | |
| 47 | |
| 4673 | 48 if (v.ndims () > 2) |
| 49 { | |
| 50 error ("transpose not defined for N-d objects"); | |
| 51 return octave_value (); | |
| 52 } | |
| 53 else | |
|
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
|
54 return octave_value (v.matrix_value ().transpose ()); |
| 3203 | 55 } |
| 56 | |
| 57 DEFNCUNOP_METHOD (incr, matrix, increment) | |
| 58 DEFNCUNOP_METHOD (decr, matrix, decrement) | |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9557
diff
changeset
|
59 DEFNCUNOP_METHOD (changesign, matrix, changesign) |
| 3203 | 60 |
| 2928 | 61 // matrix by matrix ops. |
| 62 | |
| 4543 | 63 DEFNDBINOP_OP (add, matrix, matrix, array, array, +) |
| 64 DEFNDBINOP_OP (sub, matrix, matrix, array, array, -) | |
| 65 | |
| 2928 | 66 DEFBINOP_OP (mul, matrix, matrix, *) |
| 5785 | 67 |
| 68 DEFBINOP (div, matrix, matrix) | |
| 69 { | |
| 70 CAST_BINOP_ARGS (const octave_matrix&, const octave_matrix&); | |
| 71 MatrixType typ = v2.matrix_type (); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
72 |
| 5785 | 73 Matrix ret = xdiv (v1.matrix_value (), v2.matrix_value (), typ); |
| 74 | |
| 75 v2.matrix_type (typ); | |
| 76 return ret; | |
| 77 } | |
| 2928 | 78 |
| 79 DEFBINOPX (pow, matrix, matrix) | |
| 80 { | |
| 81 error ("can't do A ^ B for A and B both matrices"); | |
| 82 return octave_value (); | |
| 83 } | |
| 84 | |
| 5785 | 85 DEFBINOP (ldiv, matrix, matrix) |
| 86 { | |
| 87 CAST_BINOP_ARGS (const octave_matrix&, const octave_matrix&); | |
| 88 MatrixType typ = v1.matrix_type (); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
89 |
| 5785 | 90 Matrix ret = xleftdiv (v1.matrix_value (), v2.matrix_value (), typ); |
| 91 | |
| 92 v1.matrix_type (typ); | |
| 93 return ret; | |
| 94 } | |
| 2928 | 95 |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
96 DEFBINOP (trans_mul, matrix, matrix) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
97 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
98 CAST_BINOP_ARGS (const octave_matrix&, const octave_matrix&); |
|
9665
1dba57e9d08d
use blas_trans_type for xgemm
Jaroslav Hajek <highegg@gmail.com>
parents:
9661
diff
changeset
|
99 return octave_value(xgemm (v1.matrix_value (), v2.matrix_value (), |
|
1dba57e9d08d
use blas_trans_type for xgemm
Jaroslav Hajek <highegg@gmail.com>
parents:
9661
diff
changeset
|
100 blas_trans, blas_no_trans)); |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
101 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
102 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
103 DEFBINOP (mul_trans, matrix, matrix) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
104 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
105 CAST_BINOP_ARGS (const octave_matrix&, const octave_matrix&); |
|
9665
1dba57e9d08d
use blas_trans_type for xgemm
Jaroslav Hajek <highegg@gmail.com>
parents:
9661
diff
changeset
|
106 return octave_value(xgemm (v1.matrix_value (), v2.matrix_value (), |
|
1dba57e9d08d
use blas_trans_type for xgemm
Jaroslav Hajek <highegg@gmail.com>
parents:
9661
diff
changeset
|
107 blas_no_trans, blas_trans)); |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
108 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
109 |
|
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
110 DEFBINOP (trans_ldiv, matrix, matrix) |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
111 { |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
112 CAST_BINOP_ARGS (const octave_matrix&, const octave_matrix&); |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
113 MatrixType typ = v1.matrix_type (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
114 |
|
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
115 Matrix ret = xleftdiv (v1.matrix_value (), v2.matrix_value (), typ, blas_trans); |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
116 |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
117 v1.matrix_type (typ); |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
118 return ret; |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
119 } |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
120 |
| 4543 | 121 DEFNDBINOP_FN (lt, matrix, matrix, array, array, mx_el_lt) |
| 122 DEFNDBINOP_FN (le, matrix, matrix, array, array, mx_el_le) | |
| 123 DEFNDBINOP_FN (eq, matrix, matrix, array, array, mx_el_eq) | |
| 124 DEFNDBINOP_FN (ge, matrix, matrix, array, array, mx_el_ge) | |
| 125 DEFNDBINOP_FN (gt, matrix, matrix, array, array, mx_el_gt) | |
| 126 DEFNDBINOP_FN (ne, matrix, matrix, array, array, mx_el_ne) | |
| 2928 | 127 |
| 4543 | 128 DEFNDBINOP_FN (el_mul, matrix, matrix, array, array, product) |
| 129 DEFNDBINOP_FN (el_div, matrix, matrix, array, array, quotient) | |
| 130 DEFNDBINOP_FN (el_pow, matrix, matrix, array, array, elem_xpow) | |
| 2928 | 131 |
| 132 DEFBINOP (el_ldiv, matrix, matrix) | |
| 133 { | |
| 134 CAST_BINOP_ARGS (const octave_matrix&, const octave_matrix&); | |
| 135 | |
| 4543 | 136 return octave_value (quotient (v2.array_value (), v1.array_value ())); |
| 2928 | 137 } |
| 138 | |
| 4543 | 139 DEFNDBINOP_FN (el_and, matrix, matrix, array, array, mx_el_and) |
| 140 DEFNDBINOP_FN (el_or, matrix, matrix, array, array, mx_el_or) | |
|
8982
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
141 DEFNDBINOP_FN (el_not_and, matrix, matrix, array, array, mx_el_not_and) |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
142 DEFNDBINOP_FN (el_not_or, matrix, matrix, array, array, mx_el_not_or) |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
143 DEFNDBINOP_FN (el_and_not, matrix, matrix, array, array, mx_el_and_not) |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
144 DEFNDBINOP_FN (el_or_not, matrix, matrix, array, array, mx_el_or_not) |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
145 |
| 4532 | 146 |
| 4915 | 147 DEFNDCATOP_FN (m_m, matrix, matrix, array, array, concat) |
| 148 | |
| 4686 | 149 DEFNDASSIGNOP_FN (assign, matrix, matrix, array, assign) |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
150 DEFNDASSIGNOP_FN (sgl_assign, float_matrix, matrix, float_array, assign) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
151 |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7800
diff
changeset
|
152 DEFNULLASSIGNOP_FN (null_assign, matrix, delete_elements) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7800
diff
changeset
|
153 |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8993
diff
changeset
|
154 DEFNDASSIGNOP_OP (assign_add, matrix, matrix, array, +=) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8993
diff
changeset
|
155 DEFNDASSIGNOP_OP (assign_sub, matrix, matrix, array, -=) |
|
9557
3a1dd361f978
optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
156 DEFNDASSIGNOP_FNOP (assign_el_mul, matrix, matrix, array, product_eq) |
|
3a1dd361f978
optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
157 DEFNDASSIGNOP_FNOP (assign_el_div, matrix, matrix, array, quotient_eq) |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8993
diff
changeset
|
158 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
159 CONVDECL (matrix_to_float_matrix) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
160 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
161 CAST_CONV_ARG (const octave_matrix&); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
162 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
163 return new octave_float_matrix (FloatNDArray (v.array_value ())); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
164 } |
| 2928 | 165 |
| 166 void | |
| 167 install_m_m_ops (void) | |
| 168 { | |
| 3538 | 169 INSTALL_UNOP (op_not, octave_matrix, not); |
| 4965 | 170 INSTALL_UNOP (op_uplus, octave_matrix, uplus); |
| 3538 | 171 INSTALL_UNOP (op_uminus, octave_matrix, uminus); |
| 172 INSTALL_UNOP (op_transpose, octave_matrix, transpose); | |
| 173 INSTALL_UNOP (op_hermitian, octave_matrix, transpose); | |
| 3203 | 174 |
| 3538 | 175 INSTALL_NCUNOP (op_incr, octave_matrix, incr); |
| 176 INSTALL_NCUNOP (op_decr, octave_matrix, decr); | |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9557
diff
changeset
|
177 INSTALL_NCUNOP (op_uminus, octave_matrix, changesign); |
| 3203 | 178 |
| 3538 | 179 INSTALL_BINOP (op_add, octave_matrix, octave_matrix, add); |
| 180 INSTALL_BINOP (op_sub, octave_matrix, octave_matrix, sub); | |
| 181 INSTALL_BINOP (op_mul, octave_matrix, octave_matrix, mul); | |
| 182 INSTALL_BINOP (op_div, octave_matrix, octave_matrix, div); | |
| 183 INSTALL_BINOP (op_pow, octave_matrix, octave_matrix, pow); | |
| 184 INSTALL_BINOP (op_ldiv, octave_matrix, octave_matrix, ldiv); | |
| 185 INSTALL_BINOP (op_lt, octave_matrix, octave_matrix, lt); | |
| 186 INSTALL_BINOP (op_le, octave_matrix, octave_matrix, le); | |
| 187 INSTALL_BINOP (op_eq, octave_matrix, octave_matrix, eq); | |
| 188 INSTALL_BINOP (op_ge, octave_matrix, octave_matrix, ge); | |
| 189 INSTALL_BINOP (op_gt, octave_matrix, octave_matrix, gt); | |
| 190 INSTALL_BINOP (op_ne, octave_matrix, octave_matrix, ne); | |
| 191 INSTALL_BINOP (op_el_mul, octave_matrix, octave_matrix, el_mul); | |
| 192 INSTALL_BINOP (op_el_div, octave_matrix, octave_matrix, el_div); | |
| 193 INSTALL_BINOP (op_el_pow, octave_matrix, octave_matrix, el_pow); | |
| 194 INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_matrix, el_ldiv); | |
| 195 INSTALL_BINOP (op_el_and, octave_matrix, octave_matrix, el_and); | |
| 196 INSTALL_BINOP (op_el_or, octave_matrix, octave_matrix, el_or); | |
|
8993
6769599e3458
add missing binops installs
Jaroslav Hajek <highegg@gmail.com>
parents:
8982
diff
changeset
|
197 INSTALL_BINOP (op_el_and_not, octave_matrix, octave_matrix, el_and_not); |
|
6769599e3458
add missing binops installs
Jaroslav Hajek <highegg@gmail.com>
parents:
8982
diff
changeset
|
198 INSTALL_BINOP (op_el_or_not, octave_matrix, octave_matrix, el_or_not); |
|
6769599e3458
add missing binops installs
Jaroslav Hajek <highegg@gmail.com>
parents:
8982
diff
changeset
|
199 INSTALL_BINOP (op_el_not_and, octave_matrix, octave_matrix, el_not_and); |
|
6769599e3458
add missing binops installs
Jaroslav Hajek <highegg@gmail.com>
parents:
8982
diff
changeset
|
200 INSTALL_BINOP (op_el_not_or, octave_matrix, octave_matrix, el_not_or); |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
201 INSTALL_BINOP (op_trans_mul, octave_matrix, octave_matrix, trans_mul); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
202 INSTALL_BINOP (op_mul_trans, octave_matrix, octave_matrix, mul_trans); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
203 INSTALL_BINOP (op_herm_mul, octave_matrix, octave_matrix, trans_mul); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
204 INSTALL_BINOP (op_mul_herm, octave_matrix, octave_matrix, mul_trans); |
|
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
205 INSTALL_BINOP (op_trans_ldiv, octave_matrix, octave_matrix, trans_ldiv); |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
206 INSTALL_BINOP (op_herm_ldiv, octave_matrix, octave_matrix, trans_ldiv); |
| 2928 | 207 |
| 4915 | 208 INSTALL_CATOP (octave_matrix, octave_matrix, m_m); |
| 209 | |
| 3538 | 210 INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_matrix, assign); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
211 INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_matrix, sgl_assign); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
212 |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7800
diff
changeset
|
213 INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_null_matrix, null_assign); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7800
diff
changeset
|
214 INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_null_str, null_assign); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7800
diff
changeset
|
215 INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_null_sq_str, null_assign); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7800
diff
changeset
|
216 |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8993
diff
changeset
|
217 INSTALL_ASSIGNOP (op_add_eq, octave_matrix, octave_matrix, assign_add); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8993
diff
changeset
|
218 INSTALL_ASSIGNOP (op_sub_eq, octave_matrix, octave_matrix, assign_sub); |
|
9557
3a1dd361f978
optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
219 INSTALL_ASSIGNOP (op_el_mul_eq, octave_matrix, octave_matrix, assign_el_mul); |
|
3a1dd361f978
optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
220 INSTALL_ASSIGNOP (op_el_div_eq, octave_matrix, octave_matrix, assign_el_div); |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8993
diff
changeset
|
221 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
222 INSTALL_CONVOP (octave_matrix, octave_float_matrix, matrix_to_float_matrix); |
| 2928 | 223 } |