Mercurial > octave
annotate src/OPERATORS/op-s-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 | 935be827eaf8 |
rev | line source |
---|---|
2928 | 1 /* |
2 | |
7017 | 3 Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, |
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-scalar.h" | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
32 #include "ov-float.h" |
2928 | 33 #include "ov-re-mat.h" |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
34 #include "ov-flt-re-mat.h" |
2928 | 35 #include "ov-typeinfo.h" |
36 #include "ops.h" | |
37 #include "xdiv.h" | |
38 #include "xpow.h" | |
39 | |
3203 | 40 // scalar unary ops. |
41 | |
42 DEFUNOP_OP (not, scalar, !) | |
4965 | 43 DEFUNOP_OP (uplus, scalar, /* no-op */) |
3203 | 44 DEFUNOP_OP (uminus, scalar, -) |
45 DEFUNOP_OP (transpose, scalar, /* no-op */) | |
46 DEFUNOP_OP (hermitian, scalar, /* no-op */) | |
47 | |
48 DEFNCUNOP_METHOD (incr, scalar, increment) | |
49 DEFNCUNOP_METHOD (decr, scalar, decrement) | |
50 | |
2928 | 51 // scalar by scalar ops. |
52 | |
53 DEFBINOP_OP (add, scalar, scalar, +) | |
54 DEFBINOP_OP (sub, scalar, scalar, -) | |
55 DEFBINOP_OP (mul, scalar, scalar, *) | |
56 | |
57 DEFBINOP (div, scalar, scalar) | |
58 { | |
59 CAST_BINOP_ARGS (const octave_scalar&, const octave_scalar&); | |
60 | |
61 double d = v2.double_value (); | |
62 | |
63 if (d == 0.0) | |
64 gripe_divide_by_zero (); | |
65 | |
66 return octave_value (v1.double_value () / d); | |
67 } | |
68 | |
69 DEFBINOP_FN (pow, scalar, scalar, xpow) | |
70 | |
71 DEFBINOP (ldiv, scalar, scalar) | |
72 { | |
73 CAST_BINOP_ARGS (const octave_scalar&, const octave_scalar&); | |
74 | |
75 double d = v1.double_value (); | |
76 | |
77 if (d == 0.0) | |
78 gripe_divide_by_zero (); | |
79 | |
80 return octave_value (v2.double_value () / d); | |
81 } | |
82 | |
83 DEFBINOP_OP (lt, scalar, scalar, <) | |
84 DEFBINOP_OP (le, scalar, scalar, <=) | |
85 DEFBINOP_OP (eq, scalar, scalar, ==) | |
86 DEFBINOP_OP (ge, scalar, scalar, >=) | |
87 DEFBINOP_OP (gt, scalar, scalar, >) | |
88 DEFBINOP_OP (ne, scalar, scalar, !=) | |
89 | |
90 DEFBINOP_OP (el_mul, scalar, scalar, *) | |
91 | |
92 DEFBINOP (el_div, scalar, scalar) | |
93 { | |
94 CAST_BINOP_ARGS (const octave_scalar&, const octave_scalar&); | |
95 | |
96 double d = v2.double_value (); | |
97 | |
98 if (d == 0.0) | |
99 gripe_divide_by_zero (); | |
100 | |
101 return octave_value (v1.double_value () / d); | |
102 } | |
103 | |
104 DEFBINOP_FN (el_pow, scalar, scalar, xpow) | |
105 | |
106 DEFBINOP (el_ldiv, scalar, scalar) | |
107 { | |
108 CAST_BINOP_ARGS (const octave_scalar&, const octave_scalar&); | |
109 | |
110 double d = v1.double_value (); | |
111 | |
112 if (d == 0.0) | |
113 gripe_divide_by_zero (); | |
114 | |
115 return octave_value (v2.double_value () / d); | |
116 } | |
117 | |
3799 | 118 DEFBINOP_OP (el_and, scalar, scalar, &&) |
119 DEFBINOP_OP (el_or, scalar, scalar, ||) | |
2928 | 120 |
4915 | 121 DEFNDCATOP_FN (s_s, scalar, scalar, array, array, concat) |
122 | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
123 CONVDECL (scalar_to_float) |
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 CAST_CONV_ARG (const octave_scalar&); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
126 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
127 return new octave_float_matrix (FloatMatrix (1, 1, static_cast<float>(v.double_value ()))); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
128 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
129 |
2928 | 130 void |
131 install_s_s_ops (void) | |
132 { | |
3538 | 133 INSTALL_UNOP (op_not, octave_scalar, not); |
4977 | 134 INSTALL_UNOP (op_uplus, octave_scalar, uplus); |
3538 | 135 INSTALL_UNOP (op_uminus, octave_scalar, uminus); |
136 INSTALL_UNOP (op_transpose, octave_scalar, transpose); | |
137 INSTALL_UNOP (op_hermitian, octave_scalar, hermitian); | |
3203 | 138 |
3538 | 139 INSTALL_NCUNOP (op_incr, octave_scalar, incr); |
140 INSTALL_NCUNOP (op_decr, octave_scalar, decr); | |
3203 | 141 |
3538 | 142 INSTALL_BINOP (op_add, octave_scalar, octave_scalar, add); |
143 INSTALL_BINOP (op_sub, octave_scalar, octave_scalar, sub); | |
144 INSTALL_BINOP (op_mul, octave_scalar, octave_scalar, mul); | |
145 INSTALL_BINOP (op_div, octave_scalar, octave_scalar, div); | |
146 INSTALL_BINOP (op_pow, octave_scalar, octave_scalar, pow); | |
147 INSTALL_BINOP (op_ldiv, octave_scalar, octave_scalar, ldiv); | |
148 INSTALL_BINOP (op_lt, octave_scalar, octave_scalar, lt); | |
149 INSTALL_BINOP (op_le, octave_scalar, octave_scalar, le); | |
150 INSTALL_BINOP (op_eq, octave_scalar, octave_scalar, eq); | |
151 INSTALL_BINOP (op_ge, octave_scalar, octave_scalar, ge); | |
152 INSTALL_BINOP (op_gt, octave_scalar, octave_scalar, gt); | |
153 INSTALL_BINOP (op_ne, octave_scalar, octave_scalar, ne); | |
154 INSTALL_BINOP (op_el_mul, octave_scalar, octave_scalar, el_mul); | |
155 INSTALL_BINOP (op_el_div, octave_scalar, octave_scalar, el_div); | |
156 INSTALL_BINOP (op_el_pow, octave_scalar, octave_scalar, el_pow); | |
157 INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_scalar, el_ldiv); | |
158 INSTALL_BINOP (op_el_and, octave_scalar, octave_scalar, el_and); | |
159 INSTALL_BINOP (op_el_or, octave_scalar, octave_scalar, el_or); | |
2928 | 160 |
4915 | 161 INSTALL_CATOP (octave_scalar, octave_scalar, s_s); |
162 | |
2928 | 163 INSTALL_ASSIGNCONV (octave_scalar, octave_scalar, octave_matrix); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
164 INSTALL_ASSIGNCONV (octave_float_scalar, octave_scalar, octave_float_matrix); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
165 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
166 INSTALL_CONVOP (octave_scalar, octave_float_matrix, scalar_to_float); |
2928 | 167 } |
168 | |
169 /* | |
170 ;;; Local Variables: *** | |
171 ;;; mode: C++ *** | |
172 ;;; End: *** | |
173 */ |