Mercurial > octave-nkf
annotate src/operators/op-cm-s.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-cm-s.cc@72c96de7a403 |
| children |
| rev | line source |
|---|---|
| 2928 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11523
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 "mx-cm-s.h" | |
| 4544 | 28 #include "mx-cnda-s.h" |
| 2928 | 29 |
| 30 #include "gripes.h" | |
| 4055 | 31 #include "oct-obj.h" |
| 2928 | 32 #include "ov.h" |
| 33 #include "ov-cx-mat.h" | |
| 3766 | 34 #include "ov-re-mat.h" |
| 2928 | 35 #include "ov-scalar.h" |
| 36 #include "ov-typeinfo.h" | |
| 37 #include "ops.h" | |
| 38 #include "xdiv.h" | |
| 39 #include "xpow.h" | |
| 40 | |
| 41 // complex matrix by scalar ops. | |
| 42 | |
| 4550 | 43 DEFNDBINOP_OP (add, complex_matrix, scalar, complex_array, scalar, +) |
| 44 DEFNDBINOP_OP (sub, complex_matrix, scalar, complex_array, scalar, -) | |
| 45 DEFNDBINOP_OP (mul, complex_matrix, scalar, complex_array, scalar, *) | |
| 2928 | 46 |
| 47 DEFBINOP (div, complex_matrix, scalar) | |
| 48 { | |
| 49 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_scalar&); | |
| 50 | |
| 51 double d = v2.double_value (); | |
| 52 | |
| 53 if (d == 0.0) | |
| 54 gripe_divide_by_zero (); | |
| 55 | |
| 4550 | 56 return octave_value (v1.complex_array_value () / d); |
| 2928 | 57 } |
| 58 | |
| 59 DEFBINOP_FN (pow, complex_matrix, scalar, xpow) | |
| 60 | |
| 61 DEFBINOP (ldiv, complex_matrix, scalar) | |
| 62 { | |
| 3766 | 63 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_scalar&); |
| 64 | |
| 65 ComplexMatrix m1 = v1.complex_matrix_value (); | |
| 66 Matrix m2 = v2.matrix_value (); | |
| 5785 | 67 MatrixType typ = v1.matrix_type (); |
| 3766 | 68 |
| 5785 | 69 ComplexMatrix ret = xleftdiv (m1, m2, typ); |
| 70 | |
| 71 v1.matrix_type (typ); | |
| 72 return ret; | |
| 2928 | 73 } |
| 74 | |
|
9588
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
75 DEFNDCMPLXCMPOP_FN (lt, complex_matrix, scalar, complex_array, scalar, mx_el_lt) |
|
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
76 DEFNDCMPLXCMPOP_FN (le, complex_matrix, scalar, complex_array, scalar, mx_el_le) |
|
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
77 DEFNDCMPLXCMPOP_FN (eq, complex_matrix, scalar, complex_array, scalar, mx_el_eq) |
|
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
78 DEFNDCMPLXCMPOP_FN (ge, complex_matrix, scalar, complex_array, scalar, mx_el_ge) |
|
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
79 DEFNDCMPLXCMPOP_FN (gt, complex_matrix, scalar, complex_array, scalar, mx_el_gt) |
|
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
80 DEFNDCMPLXCMPOP_FN (ne, complex_matrix, scalar, complex_array, scalar, mx_el_ne) |
| 2928 | 81 |
| 7275 | 82 DEFNDBINOP_OP (el_mul, complex_matrix, scalar, complex_array, scalar, *) |
| 2928 | 83 |
| 84 DEFBINOP (el_div, complex_matrix, scalar) | |
| 85 { | |
| 86 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_scalar&); | |
| 87 | |
| 88 double d = v2.double_value (); | |
| 89 | |
| 90 if (d == 0.0) | |
| 91 gripe_divide_by_zero (); | |
| 92 | |
| 4550 | 93 return octave_value (v1.complex_array_value () / d); |
| 2928 | 94 } |
| 95 | |
| 4550 | 96 DEFNDBINOP_FN (el_pow, complex_matrix, scalar, complex_array, scalar, elem_xpow) |
| 2928 | 97 |
| 98 DEFBINOP (el_ldiv, complex_matrix, scalar) | |
| 99 { | |
| 100 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_scalar&); | |
| 101 | |
| 4550 | 102 return x_el_div (v2.double_value (), v1.complex_array_value ()); |
| 2928 | 103 } |
| 104 | |
| 4550 | 105 DEFNDBINOP_FN (el_and, complex_matrix, scalar, complex_array, scalar, mx_el_and) |
| 106 DEFNDBINOP_FN (el_or, complex_matrix, scalar, complex_array, scalar, mx_el_or) | |
| 2928 | 107 |
| 4915 | 108 DEFNDCATOP_FN (cm_s, complex_matrix, scalar, complex_array, array, concat) |
| 109 | |
| 4686 | 110 DEFNDASSIGNOP_FN (assign, complex_matrix, scalar, complex_array, assign) |
| 2928 | 111 |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
7275
diff
changeset
|
112 DEFNDASSIGNOP_OP (assign_mul, complex_matrix, scalar, scalar, *=) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
7275
diff
changeset
|
113 DEFNDASSIGNOP_OP (assign_div, complex_matrix, scalar, scalar, /=) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
7275
diff
changeset
|
114 |
| 2928 | 115 void |
| 116 install_cm_s_ops (void) | |
| 117 { | |
| 3538 | 118 INSTALL_BINOP (op_add, octave_complex_matrix, octave_scalar, add); |
| 119 INSTALL_BINOP (op_sub, octave_complex_matrix, octave_scalar, sub); | |
| 120 INSTALL_BINOP (op_mul, octave_complex_matrix, octave_scalar, mul); | |
| 121 INSTALL_BINOP (op_div, octave_complex_matrix, octave_scalar, div); | |
| 122 INSTALL_BINOP (op_pow, octave_complex_matrix, octave_scalar, pow); | |
| 123 INSTALL_BINOP (op_ldiv, octave_complex_matrix, octave_scalar, ldiv); | |
| 124 INSTALL_BINOP (op_lt, octave_complex_matrix, octave_scalar, lt); | |
| 125 INSTALL_BINOP (op_le, octave_complex_matrix, octave_scalar, le); | |
| 126 INSTALL_BINOP (op_eq, octave_complex_matrix, octave_scalar, eq); | |
| 127 INSTALL_BINOP (op_ge, octave_complex_matrix, octave_scalar, ge); | |
| 128 INSTALL_BINOP (op_gt, octave_complex_matrix, octave_scalar, gt); | |
| 129 INSTALL_BINOP (op_ne, octave_complex_matrix, octave_scalar, ne); | |
| 130 INSTALL_BINOP (op_el_mul, octave_complex_matrix, octave_scalar, el_mul); | |
| 131 INSTALL_BINOP (op_el_div, octave_complex_matrix, octave_scalar, el_div); | |
| 132 INSTALL_BINOP (op_el_pow, octave_complex_matrix, octave_scalar, el_pow); | |
| 133 INSTALL_BINOP (op_el_ldiv, octave_complex_matrix, octave_scalar, el_ldiv); | |
| 134 INSTALL_BINOP (op_el_and, octave_complex_matrix, octave_scalar, el_and); | |
| 135 INSTALL_BINOP (op_el_or, octave_complex_matrix, octave_scalar, el_or); | |
| 2928 | 136 |
| 4915 | 137 INSTALL_CATOP (octave_complex_matrix, octave_scalar, cm_s); |
| 138 | |
| 3538 | 139 INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, octave_scalar, assign); |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
7275
diff
changeset
|
140 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
7275
diff
changeset
|
141 INSTALL_ASSIGNOP (op_mul_eq, octave_complex_matrix, octave_scalar, assign_mul); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
7275
diff
changeset
|
142 INSTALL_ASSIGNOP (op_div_eq, octave_complex_matrix, octave_scalar, assign_div); |
| 2928 | 143 } |