Mercurial > octave-nkf
annotate src/OPERATORS/op-m-m.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 | 5861b95e9879 |
| rev | line source |
|---|---|
| 2928 | 1 /* |
| 2 | |
| 7017 | 3 Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, |
| 4 2006, 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-typeinfo.h" |
| 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 | |
| 54 return octave_value (v.matrix_value().transpose ()); | |
| 3203 | 55 } |
| 56 | |
| 57 DEFNCUNOP_METHOD (incr, matrix, increment) | |
| 58 DEFNCUNOP_METHOD (decr, matrix, decrement) | |
| 59 | |
| 2928 | 60 // matrix by matrix ops. |
| 61 | |
| 4543 | 62 DEFNDBINOP_OP (add, matrix, matrix, array, array, +) |
| 63 DEFNDBINOP_OP (sub, matrix, matrix, array, array, -) | |
| 64 | |
| 2928 | 65 DEFBINOP_OP (mul, matrix, matrix, *) |
| 5785 | 66 |
| 67 DEFBINOP (div, matrix, matrix) | |
| 68 { | |
| 69 CAST_BINOP_ARGS (const octave_matrix&, const octave_matrix&); | |
| 70 MatrixType typ = v2.matrix_type (); | |
| 71 | |
| 72 Matrix ret = xdiv (v1.matrix_value (), v2.matrix_value (), typ); | |
| 73 | |
| 74 v2.matrix_type (typ); | |
| 75 return ret; | |
| 76 } | |
| 2928 | 77 |
| 78 DEFBINOPX (pow, matrix, matrix) | |
| 79 { | |
| 80 error ("can't do A ^ B for A and B both matrices"); | |
| 81 return octave_value (); | |
| 82 } | |
| 83 | |
| 5785 | 84 DEFBINOP (ldiv, matrix, matrix) |
| 85 { | |
| 86 CAST_BINOP_ARGS (const octave_matrix&, const octave_matrix&); | |
| 87 MatrixType typ = v1.matrix_type (); | |
| 88 | |
| 89 Matrix ret = xleftdiv (v1.matrix_value (), v2.matrix_value (), typ); | |
| 90 | |
| 91 v1.matrix_type (typ); | |
| 92 return ret; | |
| 93 } | |
| 2928 | 94 |
| 4543 | 95 DEFNDBINOP_FN (lt, matrix, matrix, array, array, mx_el_lt) |
| 96 DEFNDBINOP_FN (le, matrix, matrix, array, array, mx_el_le) | |
| 97 DEFNDBINOP_FN (eq, matrix, matrix, array, array, mx_el_eq) | |
| 98 DEFNDBINOP_FN (ge, matrix, matrix, array, array, mx_el_ge) | |
| 99 DEFNDBINOP_FN (gt, matrix, matrix, array, array, mx_el_gt) | |
| 100 DEFNDBINOP_FN (ne, matrix, matrix, array, array, mx_el_ne) | |
| 2928 | 101 |
| 4543 | 102 DEFNDBINOP_FN (el_mul, matrix, matrix, array, array, product) |
| 103 DEFNDBINOP_FN (el_div, matrix, matrix, array, array, quotient) | |
| 104 DEFNDBINOP_FN (el_pow, matrix, matrix, array, array, elem_xpow) | |
| 2928 | 105 |
| 106 DEFBINOP (el_ldiv, matrix, matrix) | |
| 107 { | |
| 108 CAST_BINOP_ARGS (const octave_matrix&, const octave_matrix&); | |
| 109 | |
| 4543 | 110 return octave_value (quotient (v2.array_value (), v1.array_value ())); |
| 2928 | 111 } |
| 112 | |
| 4543 | 113 DEFNDBINOP_FN (el_and, matrix, matrix, array, array, mx_el_and) |
| 114 DEFNDBINOP_FN (el_or, matrix, matrix, array, array, mx_el_or) | |
| 4532 | 115 |
| 4915 | 116 DEFNDCATOP_FN (m_m, matrix, matrix, array, array, concat) |
| 117 | |
| 4686 | 118 DEFNDASSIGNOP_FN (assign, matrix, matrix, array, assign) |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
119 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
|
120 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
121 CONVDECL (matrix_to_float_matrix) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
122 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
123 CAST_CONV_ARG (const octave_matrix&); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
124 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
125 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
|
126 } |
| 2928 | 127 |
| 128 void | |
| 129 install_m_m_ops (void) | |
| 130 { | |
| 3538 | 131 INSTALL_UNOP (op_not, octave_matrix, not); |
| 4965 | 132 INSTALL_UNOP (op_uplus, octave_matrix, uplus); |
| 3538 | 133 INSTALL_UNOP (op_uminus, octave_matrix, uminus); |
| 134 INSTALL_UNOP (op_transpose, octave_matrix, transpose); | |
| 135 INSTALL_UNOP (op_hermitian, octave_matrix, transpose); | |
| 3203 | 136 |
| 3538 | 137 INSTALL_NCUNOP (op_incr, octave_matrix, incr); |
| 138 INSTALL_NCUNOP (op_decr, octave_matrix, decr); | |
| 3203 | 139 |
| 3538 | 140 INSTALL_BINOP (op_add, octave_matrix, octave_matrix, add); |
| 141 INSTALL_BINOP (op_sub, octave_matrix, octave_matrix, sub); | |
| 142 INSTALL_BINOP (op_mul, octave_matrix, octave_matrix, mul); | |
| 143 INSTALL_BINOP (op_div, octave_matrix, octave_matrix, div); | |
| 144 INSTALL_BINOP (op_pow, octave_matrix, octave_matrix, pow); | |
| 145 INSTALL_BINOP (op_ldiv, octave_matrix, octave_matrix, ldiv); | |
| 146 INSTALL_BINOP (op_lt, octave_matrix, octave_matrix, lt); | |
| 147 INSTALL_BINOP (op_le, octave_matrix, octave_matrix, le); | |
| 148 INSTALL_BINOP (op_eq, octave_matrix, octave_matrix, eq); | |
| 149 INSTALL_BINOP (op_ge, octave_matrix, octave_matrix, ge); | |
| 150 INSTALL_BINOP (op_gt, octave_matrix, octave_matrix, gt); | |
| 151 INSTALL_BINOP (op_ne, octave_matrix, octave_matrix, ne); | |
| 152 INSTALL_BINOP (op_el_mul, octave_matrix, octave_matrix, el_mul); | |
| 153 INSTALL_BINOP (op_el_div, octave_matrix, octave_matrix, el_div); | |
| 154 INSTALL_BINOP (op_el_pow, octave_matrix, octave_matrix, el_pow); | |
| 155 INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_matrix, el_ldiv); | |
| 156 INSTALL_BINOP (op_el_and, octave_matrix, octave_matrix, el_and); | |
| 157 INSTALL_BINOP (op_el_or, octave_matrix, octave_matrix, el_or); | |
| 2928 | 158 |
| 4915 | 159 INSTALL_CATOP (octave_matrix, octave_matrix, m_m); |
| 160 | |
| 3538 | 161 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
|
162 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
|
163 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
164 INSTALL_CONVOP (octave_matrix, octave_float_matrix, matrix_to_float_matrix); |
| 2928 | 165 } |
| 166 | |
| 167 /* | |
| 168 ;;; Local Variables: *** | |
| 169 ;;; mode: C++ *** | |
| 170 ;;; End: *** | |
| 171 */ |