Mercurial > octave
annotate src/OPERATORS/op-m-s.cc @ 7789:82be108cc558
First attempt at single precision tyeps
* * *
corrections to qrupdate single precision routines
* * *
prefer demotion to single over promotion to double
* * *
Add single precision support to log2 function
* * *
Trivial PROJECT file update
* * *
Cache optimized hermitian/transpose methods
* * *
Add tests for tranpose/hermitian and ChangeLog entry for new transpose code
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Sun, 27 Apr 2008 22:34:17 +0200 |
| parents | a1dbe9d80eee |
| children | 280fae940bb0 |
| rev | line source |
|---|---|
| 2928 | 1 /* |
| 2 | |
| 7017 | 3 Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, |
| 4 2007 John W. Eaton | |
| 2928 | 5 |
| 6 This file is part of Octave. | |
| 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. | |
| 2928 | 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/>. | |
| 2928 | 21 |
| 22 */ | |
| 23 | |
| 24 #ifdef HAVE_CONFIG_H | |
| 25 #include <config.h> | |
| 26 #endif | |
| 27 | |
| 28 #include "gripes.h" | |
| 4055 | 29 #include "oct-obj.h" |
| 2928 | 30 #include "ov.h" |
| 31 #include "ov-re-mat.h" | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
32 #include "ov-flt-re-mat.h" |
| 2928 | 33 #include "ov-scalar.h" |
| 34 #include "ov-typeinfo.h" | |
| 35 #include "ops.h" | |
| 36 #include "xdiv.h" | |
| 37 #include "xpow.h" | |
| 38 | |
| 39 // matrix by scalar ops. | |
| 40 | |
| 4543 | 41 DEFNDBINOP_OP (add, matrix, scalar, array, scalar, +) |
| 42 DEFNDBINOP_OP (sub, matrix, scalar, array, scalar, -) | |
| 43 DEFNDBINOP_OP (mul, matrix, scalar, array, scalar, *) | |
| 2928 | 44 |
| 45 DEFBINOP (div, matrix, scalar) | |
| 46 { | |
| 47 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); | |
| 48 | |
| 49 double d = v2.double_value (); | |
| 50 | |
| 51 if (d == 0.0) | |
| 52 gripe_divide_by_zero (); | |
| 53 | |
| 4543 | 54 return octave_value (v1.array_value () / d); |
| 2928 | 55 } |
| 56 | |
| 57 DEFBINOP_FN (pow, matrix, scalar, xpow) | |
| 58 | |
| 59 DEFBINOP (ldiv, matrix, scalar) | |
| 60 { | |
| 3766 | 61 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); |
| 62 | |
| 63 Matrix m1 = v1.matrix_value (); | |
| 64 Matrix m2 = v2.matrix_value (); | |
| 5785 | 65 MatrixType typ = v1.matrix_type (); |
| 3766 | 66 |
| 5785 | 67 Matrix ret = xleftdiv (m1, m2, typ); |
| 68 | |
| 69 v1.matrix_type (typ); | |
| 70 return ret; | |
| 2928 | 71 } |
| 72 | |
| 4543 | 73 DEFNDBINOP_FN (lt, matrix, scalar, array, scalar, mx_el_lt) |
| 74 DEFNDBINOP_FN (le, matrix, scalar, array, scalar, mx_el_le) | |
| 75 DEFNDBINOP_FN (eq, matrix, scalar, array, scalar, mx_el_eq) | |
| 76 DEFNDBINOP_FN (ge, matrix, scalar, array, scalar, mx_el_ge) | |
| 77 DEFNDBINOP_FN (gt, matrix, scalar, array, scalar, mx_el_gt) | |
| 78 DEFNDBINOP_FN (ne, matrix, scalar, array, scalar, mx_el_ne) | |
| 2928 | 79 |
| 4543 | 80 DEFNDBINOP_OP (el_mul, matrix, scalar, array, scalar, *) |
| 2928 | 81 |
| 82 DEFBINOP (el_div, matrix, scalar) | |
| 83 { | |
| 84 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); | |
| 85 | |
| 86 double d = v2.double_value (); | |
| 87 | |
| 88 if (d == 0.0) | |
| 89 gripe_divide_by_zero (); | |
| 90 | |
| 4543 | 91 return octave_value (v1.array_value () / d); |
| 2928 | 92 } |
| 93 | |
| 4543 | 94 DEFNDBINOP_FN (el_pow, matrix, scalar, array, scalar, elem_xpow) |
| 2928 | 95 |
| 96 DEFBINOP (el_ldiv, matrix, scalar) | |
| 97 { | |
| 98 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); | |
| 99 | |
| 4543 | 100 return x_el_div (v2.double_value (), v1.array_value ()); |
| 2928 | 101 } |
| 102 | |
| 4543 | 103 DEFNDBINOP_FN (el_and, matrix, scalar, array, scalar, mx_el_and) |
| 104 DEFNDBINOP_FN (el_or, matrix, scalar, array, scalar, mx_el_or) | |
| 2928 | 105 |
| 4915 | 106 DEFNDCATOP_FN (m_s, matrix, scalar, array, array, concat) |
| 107 | |
| 4686 | 108 DEFNDASSIGNOP_FN (assign, matrix, scalar, array, assign) |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
109 DEFNDASSIGNOP_FN (sgl_assign, float_matrix, scalar, float_array, assign) |
| 2928 | 110 |
| 111 void | |
| 112 install_m_s_ops (void) | |
| 113 { | |
| 3538 | 114 INSTALL_BINOP (op_add, octave_matrix, octave_scalar, add); |
| 115 INSTALL_BINOP (op_sub, octave_matrix, octave_scalar, sub); | |
| 116 INSTALL_BINOP (op_mul, octave_matrix, octave_scalar, mul); | |
| 117 INSTALL_BINOP (op_div, octave_matrix, octave_scalar, div); | |
| 118 INSTALL_BINOP (op_pow, octave_matrix, octave_scalar, pow); | |
| 119 INSTALL_BINOP (op_ldiv, octave_matrix, octave_scalar, ldiv); | |
| 4543 | 120 |
| 121 // INSTALL_BINOP (op_lt, octave_matrix, octave_scalar, lt); | |
| 122 | |
| 123 octave_value_typeinfo::register_binary_op | |
| 124 (octave_value::op_lt, octave_matrix::static_type_id (), | |
| 125 octave_scalar::static_type_id (), oct_binop_lt); | |
| 126 | |
| 3538 | 127 INSTALL_BINOP (op_le, octave_matrix, octave_scalar, le); |
| 128 INSTALL_BINOP (op_eq, octave_matrix, octave_scalar, eq); | |
| 129 INSTALL_BINOP (op_ge, octave_matrix, octave_scalar, ge); | |
| 130 INSTALL_BINOP (op_gt, octave_matrix, octave_scalar, gt); | |
| 131 INSTALL_BINOP (op_ne, octave_matrix, octave_scalar, ne); | |
| 132 INSTALL_BINOP (op_el_mul, octave_matrix, octave_scalar, el_mul); | |
| 133 INSTALL_BINOP (op_el_div, octave_matrix, octave_scalar, el_div); | |
| 134 INSTALL_BINOP (op_el_pow, octave_matrix, octave_scalar, el_pow); | |
| 135 INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_scalar, el_ldiv); | |
| 136 INSTALL_BINOP (op_el_and, octave_matrix, octave_scalar, el_and); | |
| 137 INSTALL_BINOP (op_el_or, octave_matrix, octave_scalar, el_or); | |
| 2928 | 138 |
| 4915 | 139 INSTALL_CATOP (octave_matrix, octave_scalar, m_s); |
| 140 | |
| 3538 | 141 INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_scalar, assign); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
142 INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_scalar, sgl_assign); |
| 2928 | 143 } |
| 144 | |
| 145 /* | |
| 146 ;;; Local Variables: *** | |
| 147 ;;; mode: C++ *** | |
| 148 ;;; End: *** | |
| 149 */ |