Mercurial > hg > octave-nkf
annotate src/DLD-FUNCTIONS/bsxfun.cc @ 9827:c15a5ed0da58
optimize bsxfun (@power, ...)
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Wed, 18 Nov 2009 12:03:07 +0100 |
parents | 119d97db51f0 |
children | fd262afea1d1 |
rev | line source |
---|---|
6869 | 1 /* |
2 | |
8920 | 3 Copyright (C) 2007, 2008, 2009 David Bateman |
9783
119d97db51f0
avoid repeated table init in bsxfun
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
4 Copyright (C) 2009 VZLU Prague |
6869 | 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. | |
6869 | 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/>. | |
6869 | 21 |
22 */ | |
23 | |
24 #ifdef HAVE_CONFIG_H | |
25 #include <config.h> | |
26 #endif | |
27 | |
28 #include <string> | |
29 #include <vector> | |
30 #include <list> | |
31 | |
32 #include "lo-mappers.h" | |
33 | |
34 #include "oct-map.h" | |
35 #include "defun-dld.h" | |
36 #include "parse.h" | |
37 #include "variables.h" | |
38 #include "ov-colon.h" | |
39 #include "unwind-prot.h" | |
9743
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
40 #include "ov-fcn-handle.h" |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
41 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
42 // Optimized bsxfun operations |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
43 enum bsxfun_builtin_op |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
44 { |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
45 bsxfun_builtin_plus = 0, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
46 bsxfun_builtin_minus, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
47 bsxfun_builtin_times, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
48 bsxfun_builtin_divide, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
49 bsxfun_builtin_max, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
50 bsxfun_builtin_min, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
51 bsxfun_builtin_eq, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
52 bsxfun_builtin_ne, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
53 bsxfun_builtin_lt, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
54 bsxfun_builtin_le, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
55 bsxfun_builtin_gt, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
56 bsxfun_builtin_ge, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
57 bsxfun_builtin_and, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
58 bsxfun_builtin_or, |
9827
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
59 bsxfun_builtin_power, |
9743
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
60 bsxfun_builtin_unknown, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
61 bsxfun_num_builtin_ops = bsxfun_builtin_unknown |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
62 }; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
63 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
64 const char *bsxfun_builtin_names[] = |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
65 { |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
66 "plus", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
67 "minus", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
68 "times", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
69 "rdivide", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
70 "max", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
71 "min", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
72 "eq", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
73 "ne", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
74 "lt", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
75 "le", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
76 "gt", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
77 "ge", |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
78 "and", |
9827
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
79 "or", |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
80 "power" |
9743
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
81 }; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
82 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
83 static bsxfun_builtin_op |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
84 bsxfun_builtin_lookup (const std::string& name) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
85 { |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
86 for (int i = 0; i < bsxfun_num_builtin_ops; i++) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
87 if (name == bsxfun_builtin_names[i]) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
88 return static_cast<bsxfun_builtin_op> (i); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
89 return bsxfun_builtin_unknown; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
90 } |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
91 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
92 typedef octave_value (*bsxfun_handler) (const octave_value&, const octave_value&); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
93 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
94 // Static table of handlers. |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
95 bsxfun_handler bsxfun_handler_table[bsxfun_num_builtin_ops][btyp_num_types]; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
96 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
97 template <class NDA, NDA (bsxfun_op) (const NDA&, const NDA&)> |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
98 static octave_value |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
99 bsxfun_forward_op (const octave_value& x, const octave_value& y) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
100 { |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
101 NDA xa = octave_value_extract<NDA> (x); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
102 NDA ya = octave_value_extract<NDA> (y); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
103 return octave_value (bsxfun_op (xa, ya)); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
104 } |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
105 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
106 template <class NDA, boolNDArray (bsxfun_rel) (const NDA&, const NDA&)> |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
107 static octave_value |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
108 bsxfun_forward_rel (const octave_value& x, const octave_value& y) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
109 { |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
110 NDA xa = octave_value_extract<NDA> (x); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
111 NDA ya = octave_value_extract<NDA> (y); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
112 return octave_value (bsxfun_rel (xa, ya)); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
113 } |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
114 |
9827
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
115 // Pow needs a special handler for reals because of the potentially complex result. |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
116 template <class NDA, class CNDA> |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
117 static octave_value |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
118 do_bsxfun_real_pow (const octave_value& x, const octave_value& y) |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
119 { |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
120 NDA xa = octave_value_extract<NDA> (x); |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
121 NDA ya = octave_value_extract<NDA> (y); |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
122 if (! ya.all_integers () && xa.any_element_is_negative ()) |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
123 return octave_value (bsxfun_pow (CNDA (xa), ya)); |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
124 else |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
125 return octave_value (bsxfun_pow (xa, ya)); |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
126 } |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
127 |
9743
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
128 static void maybe_fill_table (void) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
129 { |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
130 static bool filled = false; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
131 if (filled) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
132 return; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
133 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
134 #define REGISTER_OP_HANDLER(OP, BTYP, NDA, FUNOP) \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
135 bsxfun_handler_table[OP][BTYP] = bsxfun_forward_op<NDA, FUNOP> |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
136 #define REGISTER_REL_HANDLER(REL, BTYP, NDA, FUNREL) \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
137 bsxfun_handler_table[REL][BTYP] = bsxfun_forward_rel<NDA, FUNREL> |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
138 #define REGISTER_STD_HANDLERS(BTYP, NDA) \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
139 REGISTER_OP_HANDLER (bsxfun_builtin_plus, BTYP, NDA, bsxfun_add); \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
140 REGISTER_OP_HANDLER (bsxfun_builtin_minus, BTYP, NDA, bsxfun_sub); \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
141 REGISTER_OP_HANDLER (bsxfun_builtin_times, BTYP, NDA, bsxfun_mul); \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
142 REGISTER_OP_HANDLER (bsxfun_builtin_divide, BTYP, NDA, bsxfun_div); \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
143 REGISTER_OP_HANDLER (bsxfun_builtin_max, BTYP, NDA, bsxfun_max); \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
144 REGISTER_OP_HANDLER (bsxfun_builtin_min, BTYP, NDA, bsxfun_min); \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
145 REGISTER_REL_HANDLER (bsxfun_builtin_eq, BTYP, NDA, bsxfun_eq); \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
146 REGISTER_REL_HANDLER (bsxfun_builtin_ne, BTYP, NDA, bsxfun_ne); \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
147 REGISTER_REL_HANDLER (bsxfun_builtin_lt, BTYP, NDA, bsxfun_lt); \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
148 REGISTER_REL_HANDLER (bsxfun_builtin_le, BTYP, NDA, bsxfun_le); \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
149 REGISTER_REL_HANDLER (bsxfun_builtin_gt, BTYP, NDA, bsxfun_gt); \ |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
150 REGISTER_REL_HANDLER (bsxfun_builtin_ge, BTYP, NDA, bsxfun_ge) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
151 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
152 REGISTER_STD_HANDLERS (btyp_double, NDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
153 REGISTER_STD_HANDLERS (btyp_float, FloatNDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
154 REGISTER_STD_HANDLERS (btyp_complex, ComplexNDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
155 REGISTER_STD_HANDLERS (btyp_float_complex, FloatComplexNDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
156 REGISTER_STD_HANDLERS (btyp_int8, int8NDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
157 REGISTER_STD_HANDLERS (btyp_int16, int16NDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
158 REGISTER_STD_HANDLERS (btyp_int32, int32NDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
159 REGISTER_STD_HANDLERS (btyp_int64, int64NDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
160 REGISTER_STD_HANDLERS (btyp_uint8, uint8NDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
161 REGISTER_STD_HANDLERS (btyp_uint16, uint16NDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
162 REGISTER_STD_HANDLERS (btyp_uint32, uint32NDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
163 REGISTER_STD_HANDLERS (btyp_uint64, uint64NDArray); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
164 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
165 // For bools, we register and/or. |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
166 REGISTER_OP_HANDLER (bsxfun_builtin_and, btyp_bool, boolNDArray, bsxfun_and); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
167 REGISTER_OP_HANDLER (bsxfun_builtin_or, btyp_bool, boolNDArray, bsxfun_or); |
9783
119d97db51f0
avoid repeated table init in bsxfun
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
168 |
9827
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
169 // Register power handlers. |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
170 bsxfun_handler_table[bsxfun_builtin_power][btyp_double] = |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
171 do_bsxfun_real_pow<NDArray, ComplexNDArray>; |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
172 bsxfun_handler_table[bsxfun_builtin_power][btyp_float] = |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
173 do_bsxfun_real_pow<FloatNDArray, FloatComplexNDArray>; |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
174 |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
175 REGISTER_OP_HANDLER (bsxfun_builtin_power, btyp_complex, ComplexNDArray, bsxfun_pow); |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
176 REGISTER_OP_HANDLER (bsxfun_builtin_power, btyp_float_complex, FloatComplexNDArray, bsxfun_pow); |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9783
diff
changeset
|
177 |
9783
119d97db51f0
avoid repeated table init in bsxfun
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
178 filled = true; |
9743
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
179 } |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
180 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
181 static octave_value |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
182 maybe_optimized_builtin (const std::string& name, |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
183 const octave_value& a, const octave_value& b) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
184 { |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
185 octave_value retval; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
186 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
187 maybe_fill_table (); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
188 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
189 bsxfun_builtin_op op = bsxfun_builtin_lookup (name); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
190 if (op != bsxfun_builtin_unknown) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
191 { |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
192 builtin_type_t btyp_a = a.builtin_type (), btyp_b = b.builtin_type (); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
193 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
194 // Simplify single/double combinations. |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
195 if (btyp_a == btyp_float && btyp_b == btyp_double) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
196 btyp_b = btyp_float; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
197 else if (btyp_a == btyp_double && btyp_b == btyp_float) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
198 btyp_a = btyp_float; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
199 else if (btyp_a == btyp_float_complex && btyp_b == btyp_complex) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
200 btyp_b = btyp_float_complex; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
201 else if (btyp_a == btyp_complex && btyp_b == btyp_float_complex) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
202 btyp_a = btyp_float_complex; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
203 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
204 if (btyp_a == btyp_b && btyp_a != btyp_unknown) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
205 { |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
206 bsxfun_handler handler = bsxfun_handler_table[op][btyp_a]; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
207 if (handler) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
208 retval = handler (a, b); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
209 } |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
210 } |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
211 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
212 return retval; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
213 } |
6869 | 214 |
215 static bool | |
216 maybe_update_column (octave_value& Ac, const octave_value& A, | |
217 const dim_vector& dva, const dim_vector& dvc, | |
218 octave_idx_type i, octave_value_list &idx) | |
219 { | |
220 octave_idx_type nd = dva.length (); | |
221 | |
222 if (i == 0) | |
223 { | |
224 idx(0) = octave_value (':'); | |
225 for (octave_idx_type j = 1; j < nd; j++) | |
226 { | |
227 if (dva (j) == 1) | |
228 idx (j) = octave_value (1); | |
229 else | |
230 idx (j) = octave_value ((i % dvc(j)) + 1); | |
231 | |
232 i = i / dvc (j); | |
233 } | |
234 | |
235 Ac = A; | |
236 Ac = Ac.single_subsref ("(", idx); | |
237 return true; | |
238 } | |
239 else | |
240 { | |
241 bool is_changed = false; | |
242 octave_idx_type k = i; | |
243 octave_idx_type k1 = i - 1; | |
244 for (octave_idx_type j = 1; j < nd; j++) | |
245 { | |
246 if (dva(j) != 1 && k % dvc (j) != k1 % dvc (j)) | |
247 { | |
248 idx (j) = octave_value ((k % dvc(j)) + 1); | |
249 is_changed = true; | |
250 } | |
251 | |
252 k = k / dvc (j); | |
253 k1 = k1 / dvc (j); | |
254 } | |
255 | |
256 if (is_changed) | |
257 { | |
258 Ac = A; | |
259 Ac = Ac.single_subsref ("(", idx); | |
260 return true; | |
261 } | |
262 else | |
263 return false; | |
264 } | |
265 } | |
266 | |
6959 | 267 #if 0 |
268 // FIXME -- this function is not used; is it OK to delete it? | |
6869 | 269 static void |
270 update_index (octave_value_list& idx, const dim_vector& dv, octave_idx_type i) | |
271 { | |
272 octave_idx_type nd = dv.length (); | |
273 | |
274 if (i == 0) | |
275 { | |
276 for (octave_idx_type j = nd - 1; j > 0; j--) | |
277 idx(j) = octave_value (static_cast<double>(1)); | |
278 idx(0) = octave_value (':'); | |
279 } | |
280 else | |
281 { | |
282 for (octave_idx_type j = 1; j < nd; j++) | |
283 { | |
284 idx (j) = octave_value (i % dv (j) + 1); | |
285 i = i / dv (j); | |
286 } | |
287 } | |
288 } | |
6959 | 289 #endif |
6869 | 290 |
291 static void | |
292 update_index (Array<int>& idx, const dim_vector& dv, octave_idx_type i) | |
293 { | |
294 octave_idx_type nd = dv.length (); | |
295 | |
296 idx(0) = 0; | |
297 for (octave_idx_type j = 1; j < nd; j++) | |
298 { | |
299 idx (j) = i % dv (j); | |
300 i = i / dv (j); | |
301 } | |
302 } | |
303 | |
6959 | 304 DEFUN_DLD (bsxfun, args, , |
8715 | 305 "-*- texinfo -*-\n\ |
7001 | 306 @deftypefn {Loadable Function} {} bsxfun (@var{f}, @var{a}, @var{b})\n\ |
6869 | 307 Applies a binary function @var{f} element-wise to two matrix arguments\n\ |
9041
853f96e8008f
Cleanup documentation file matrix.texi
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
308 @var{a} and @var{b}. The function @var{f} must be capable of accepting\n\ |
6869 | 309 two column vector arguments of equal length, or one column vector\n\ |
310 argument and a scalar.\n\ | |
311 \n\ | |
9041
853f96e8008f
Cleanup documentation file matrix.texi
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
312 The dimensions of @var{a} and @var{b} must be equal or singleton. The\n\ |
7001 | 313 singleton dimensions of the matrices will be expanded to the same\n\ |
6881 | 314 dimensionality as the other matrix.\n\ |
6869 | 315 \n\ |
316 @seealso{arrayfun, cellfun}\n\ | |
317 @end deftypefn") | |
318 { | |
319 int nargin = args.length (); | |
320 octave_value_list retval; | |
321 | |
322 if (nargin != 3) | |
323 print_usage (); | |
324 else | |
325 { | |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
326 octave_value func = args(0); |
6869 | 327 |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
328 if (func.is_string ()) |
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
329 { |
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
330 std::string name = func.string_value (); |
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
331 func = symbol_table::find_function (name); |
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
332 if (func.is_undefined ()) |
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
333 error ("bsxfun: invalid function name: %s", name.c_str ()); |
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
334 } |
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
335 else if (! (args(0).is_function_handle () || args(0).is_inline_function ())) |
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
336 error ("bsxfun: first argument must be a string or function handle"); |
6869 | 337 |
9743
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
338 const octave_value A = args (1); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
339 const octave_value B = args (2); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
340 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
341 if (func.is_builtin_function () |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
342 || (func.is_function_handle () |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
343 && ! func.fcn_handle_value ()->is_overloaded () |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
344 && ! A.is_object () && ! B.is_object ())) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
345 { |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
346 octave_function *fcn_val = func.function_value (); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
347 if (fcn_val) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
348 { |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
349 octave_value tmp = maybe_optimized_builtin (fcn_val->name (), A, B); |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
350 if (tmp.is_defined ()) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
351 retval(0) = tmp; |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
352 } |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
353 } |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
354 |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
355 if (! error_state && retval.empty ()) |
6869 | 356 { |
357 dim_vector dva = A.dims (); | |
358 octave_idx_type nda = dva.length (); | |
359 dim_vector dvb = B.dims (); | |
360 octave_idx_type ndb = dvb.length (); | |
361 octave_idx_type nd = nda; | |
362 | |
363 if (nda > ndb) | |
364 dvb.resize (nda, 1); | |
365 else if (nda < ndb) | |
366 { | |
367 dva.resize (ndb, 1); | |
368 nd = ndb; | |
369 } | |
370 | |
371 for (octave_idx_type i = 0; i < nd; i++) | |
372 if (dva (i) != dvb (i) && dva (i) != 1 && dvb (i) != 1) | |
373 { | |
374 error ("bsxfun: dimensions don't match"); | |
375 break; | |
376 } | |
377 | |
378 if (!error_state) | |
379 { | |
380 // Find the size of the output | |
381 dim_vector dvc; | |
382 dvc.resize (nd); | |
383 | |
384 for (octave_idx_type i = 0; i < nd; i++) | |
385 dvc (i) = (dva (i) < 1 ? dva (i) : (dvb (i) < 1 ? dvb (i) : | |
386 (dva (i) > dvb (i) ? dva (i) : dvb (i)))); | |
387 | |
388 if (dva == dvb || dva.numel () == 1 || dvb.numel () == 1) | |
389 { | |
390 octave_value_list inputs; | |
391 inputs (0) = A; | |
392 inputs (1) = B; | |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
393 retval = func.do_multi_index_op (1, inputs); |
6869 | 394 } |
395 else if (dvc.numel () < 1) | |
396 { | |
397 octave_value_list inputs; | |
398 inputs (0) = A.resize (dvc); | |
399 inputs (1) = B.resize (dvc); | |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
400 retval = func.do_multi_index_op (1, inputs); |
6869 | 401 } |
402 else | |
403 { | |
404 octave_idx_type ncount = 1; | |
405 for (octave_idx_type i = 1; i < nd; i++) | |
406 ncount *= dvc (i); | |
407 | |
408 #define BSXDEF(T) \ | |
409 T result_ ## T; \ | |
410 bool have_ ## T = false; | |
411 | |
412 BSXDEF(NDArray); | |
413 BSXDEF(ComplexNDArray); | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
414 BSXDEF(FloatNDArray); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
415 BSXDEF(FloatComplexNDArray); |
6869 | 416 BSXDEF(boolNDArray); |
417 BSXDEF(int8NDArray); | |
418 BSXDEF(int16NDArray); | |
419 BSXDEF(int32NDArray); | |
420 BSXDEF(int64NDArray); | |
421 BSXDEF(uint8NDArray); | |
422 BSXDEF(uint16NDArray); | |
423 BSXDEF(uint32NDArray); | |
424 BSXDEF(uint64NDArray); | |
425 | |
426 octave_value Ac ; | |
427 octave_value_list idxA; | |
428 octave_value Bc; | |
429 octave_value_list idxB; | |
430 octave_value C; | |
431 octave_value_list inputs; | |
432 Array<int> ra_idx (dvc.length(), 0); | |
433 | |
434 | |
435 for (octave_idx_type i = 0; i < ncount; i++) | |
436 { | |
437 if (maybe_update_column (Ac, A, dva, dvc, i, idxA)) | |
438 inputs (0) = Ac; | |
439 | |
440 if (maybe_update_column (Bc, B, dvb, dvc, i, idxB)) | |
441 inputs (1) = Bc; | |
442 | |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9041
diff
changeset
|
443 octave_value_list tmp = func.do_multi_index_op (1, inputs); |
6869 | 444 |
445 if (error_state) | |
446 break; | |
447 | |
448 #define BSXINIT(T, CLS, EXTRACTOR) \ | |
449 (result_type == CLS) \ | |
450 { \ | |
451 have_ ## T = true; \ | |
452 result_ ## T = \ | |
453 tmp (0). EXTRACTOR ## _array_value (); \ | |
454 result_ ## T .resize (dvc); \ | |
455 } | |
456 | |
457 if (i == 0) | |
458 { | |
459 if (! tmp(0).is_sparse_type ()) | |
460 { | |
461 std::string result_type = tmp(0).class_name (); | |
462 if (result_type == "double") | |
463 { | |
464 if (tmp(0).is_real_type ()) | |
465 { | |
466 have_NDArray = true; | |
467 result_NDArray = tmp(0).array_value (); | |
468 result_NDArray.resize (dvc); | |
469 } | |
470 else | |
471 { | |
472 have_ComplexNDArray = true; | |
473 result_ComplexNDArray = | |
474 tmp(0).complex_array_value (); | |
475 result_ComplexNDArray.resize (dvc); | |
476 } | |
477 } | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
478 else if (result_type == "single") |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
479 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
480 if (tmp(0).is_real_type ()) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
481 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
482 have_FloatNDArray = true; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
483 result_FloatNDArray = tmp(0).float_array_value (); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
484 result_FloatNDArray.resize (dvc); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
485 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
486 else |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
487 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
488 have_ComplexNDArray = true; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
489 result_ComplexNDArray = |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
490 tmp(0).complex_array_value (); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
491 result_ComplexNDArray.resize (dvc); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
492 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
493 } |
6869 | 494 else if BSXINIT(boolNDArray, "logical", bool) |
495 else if BSXINIT(int8NDArray, "int8", int8) | |
496 else if BSXINIT(int16NDArray, "int16", int16) | |
497 else if BSXINIT(int32NDArray, "int32", int32) | |
498 else if BSXINIT(int64NDArray, "int64", int64) | |
499 else if BSXINIT(uint8NDArray, "uint8", uint8) | |
500 else if BSXINIT(uint16NDArray, "uint16", uint16) | |
501 else if BSXINIT(uint32NDArray, "uint32", uint32) | |
502 else if BSXINIT(uint64NDArray, "uint64", uint64) | |
503 else | |
504 { | |
505 C = tmp (0); | |
506 C = C.resize (dvc); | |
507 } | |
508 } | |
509 } | |
510 else | |
511 { | |
512 update_index (ra_idx, dvc, i); | |
513 | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
514 if (have_FloatNDArray || |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
515 have_FloatComplexNDArray) |
6869 | 516 { |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
517 if (! tmp(0).is_float_type ()) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
518 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
519 if (have_FloatNDArray) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
520 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
521 have_FloatNDArray = false; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
522 C = result_FloatNDArray; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
523 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
524 else |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
525 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
526 have_FloatComplexNDArray = false; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
527 C = result_FloatComplexNDArray; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
528 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
529 C = do_cat_op (C, tmp(0), ra_idx); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
530 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
531 else if (tmp(0).is_double_type ()) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
532 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
533 if (tmp(0).is_complex_type () && |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
534 have_FloatNDArray) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
535 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
536 result_ComplexNDArray = |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
537 ComplexNDArray (result_FloatNDArray); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
538 result_ComplexNDArray.insert |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
539 (tmp(0).complex_array_value(), ra_idx); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
540 have_FloatComplexNDArray = false; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
541 have_ComplexNDArray = true; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
542 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
543 else |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
544 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
545 result_NDArray = |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
546 NDArray (result_FloatNDArray); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
547 result_NDArray.insert |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
548 (tmp(0).array_value(), ra_idx); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
549 have_FloatNDArray = false; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
550 have_NDArray = true; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
551 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
552 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
553 else if (tmp(0).is_real_type ()) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
554 result_FloatNDArray.insert |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
555 (tmp(0).float_array_value(), ra_idx); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
556 else |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
557 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
558 result_FloatComplexNDArray = |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
559 FloatComplexNDArray (result_FloatNDArray); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
560 result_FloatComplexNDArray.insert |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
561 (tmp(0).float_complex_array_value(), ra_idx); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
562 have_FloatNDArray = false; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
563 have_FloatComplexNDArray = true; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
564 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
565 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
566 else if (have_NDArray) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
567 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
568 if (! tmp(0).is_float_type ()) |
6869 | 569 { |
570 have_NDArray = false; | |
571 C = result_NDArray; | |
572 C = do_cat_op (C, tmp(0), ra_idx); | |
573 } | |
574 else if (tmp(0).is_real_type ()) | |
575 result_NDArray.insert (tmp(0).array_value(), | |
576 ra_idx); | |
577 else | |
578 { | |
579 result_ComplexNDArray = | |
580 ComplexNDArray (result_NDArray); | |
581 result_ComplexNDArray.insert | |
582 (tmp(0).complex_array_value(), ra_idx); | |
583 have_NDArray = false; | |
584 have_ComplexNDArray = true; | |
585 } | |
586 } | |
587 | |
588 #define BSXLOOP(T, CLS, EXTRACTOR) \ | |
589 (have_ ## T) \ | |
590 { \ | |
591 if (tmp (0).class_name () != CLS) \ | |
592 { \ | |
593 have_ ## T = false; \ | |
594 C = result_ ## T; \ | |
595 C = do_cat_op (C, tmp (0), ra_idx); \ | |
596 } \ | |
597 else \ | |
598 result_ ## T .insert \ | |
599 (tmp(0). EXTRACTOR ## _array_value (), \ | |
600 ra_idx); \ | |
601 } | |
602 | |
603 else if BSXLOOP(ComplexNDArray, "double", complex) | |
604 else if BSXLOOP(boolNDArray, "logical", bool) | |
605 else if BSXLOOP(int8NDArray, "int8", int8) | |
606 else if BSXLOOP(int16NDArray, "int16", int16) | |
607 else if BSXLOOP(int32NDArray, "int32", int32) | |
608 else if BSXLOOP(int64NDArray, "int64", int64) | |
609 else if BSXLOOP(uint8NDArray, "uint8", uint8) | |
610 else if BSXLOOP(uint16NDArray, "uint16", uint16) | |
611 else if BSXLOOP(uint32NDArray, "uint32", uint32) | |
612 else if BSXLOOP(uint64NDArray, "uint64", uint64) | |
613 else | |
614 C = do_cat_op (C, tmp(0), ra_idx); | |
615 } | |
616 } | |
617 | |
618 #define BSXEND(T) \ | |
619 (have_ ## T) \ | |
620 retval (0) = result_ ## T; | |
621 | |
622 if BSXEND(NDArray) | |
623 else if BSXEND(ComplexNDArray) | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
624 else if BSXEND(FloatNDArray) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7016
diff
changeset
|
625 else if BSXEND(FloatComplexNDArray) |
6869 | 626 else if BSXEND(boolNDArray) |
627 else if BSXEND(int8NDArray) | |
628 else if BSXEND(int16NDArray) | |
629 else if BSXEND(int32NDArray) | |
630 else if BSXEND(int64NDArray) | |
631 else if BSXEND(uint8NDArray) | |
632 else if BSXEND(uint16NDArray) | |
633 else if BSXEND(uint32NDArray) | |
634 else if BSXEND(uint64NDArray) | |
635 else | |
636 retval(0) = C; | |
637 } | |
638 } | |
639 } | |
640 } | |
641 | |
642 return retval; | |
643 } | |
644 | |
645 /* | |
646 | |
647 %!shared a, b, c, f | |
648 %! a = randn (4, 4); | |
649 %! b = mean (a, 1); | |
650 %! c = mean (a, 2); | |
651 %! f = @minus; | |
652 %!error(bsxfun (f)); | |
653 %!error(bsxfun (f, a)); | |
654 %!error(bsxfun (a, b)); | |
655 %!error(bsxfun (a, b, c)); | |
656 %!error(bsxfun (f, a, b, c)); | |
657 %!error(bsxfun (f, ones(4, 0), ones(4, 4))) | |
658 %!assert(bsxfun (f, ones(4, 0), ones(4, 1)), zeros(4, 0)); | |
659 %!assert(bsxfun (f, ones(1, 4), ones(4, 1)), zeros(4, 4)); | |
660 %!assert(bsxfun (f, a, b), a - repmat(b, 4, 1)); | |
661 %!assert(bsxfun (f, a, c), a - repmat(c, 1, 4)); | |
662 %!assert(bsxfun ("minus", ones(1, 4), ones(4, 1)), zeros(4, 4)); | |
663 | |
664 %!shared a, b, c, f | |
665 %! a = randn (4, 4); | |
666 %! a(1) *= 1i; | |
667 %! b = mean (a, 1); | |
668 %! c = mean (a, 2); | |
669 %! f = @minus; | |
670 %!error(bsxfun (f)); | |
671 %!error(bsxfun (f, a)); | |
672 %!error(bsxfun (a, b)); | |
673 %!error(bsxfun (a, b, c)); | |
674 %!error(bsxfun (f, a, b, c)); | |
675 %!error(bsxfun (f, ones(4, 0), ones(4, 4))) | |
676 %!assert(bsxfun (f, ones(4, 0), ones(4, 1)), zeros(4, 0)); | |
677 %!assert(bsxfun (f, ones(1, 4), ones(4, 1)), zeros(4, 4)); | |
678 %!assert(bsxfun (f, a, b), a - repmat(b, 4, 1)); | |
679 %!assert(bsxfun (f, a, c), a - repmat(c, 1, 4)); | |
680 %!assert(bsxfun ("minus", ones(1, 4), ones(4, 1)), zeros(4, 4)); | |
681 | |
682 %!shared a, b, c, f | |
683 %! a = randn (4, 4); | |
684 %! a(end) *= 1i; | |
685 %! b = mean (a, 1); | |
686 %! c = mean (a, 2); | |
687 %! f = @minus; | |
688 %!error(bsxfun (f)); | |
689 %!error(bsxfun (f, a)); | |
690 %!error(bsxfun (a, b)); | |
691 %!error(bsxfun (a, b, c)); | |
692 %!error(bsxfun (f, a, b, c)); | |
693 %!error(bsxfun (f, ones(4, 0), ones(4, 4))) | |
694 %!assert(bsxfun (f, ones(4, 0), ones(4, 1)), zeros(4, 0)); | |
695 %!assert(bsxfun (f, ones(1, 4), ones(4, 1)), zeros(4, 4)); | |
696 %!assert(bsxfun (f, a, b), a - repmat(b, 4, 1)); | |
697 %!assert(bsxfun (f, a, c), a - repmat(c, 1, 4)); | |
698 %!assert(bsxfun ("minus", ones(1, 4), ones(4, 1)), zeros(4, 4)); | |
699 | |
700 %!shared a, b, c, f | |
701 %! a = randn (4, 4); | |
702 %! b = a (1, :); | |
703 %! c = a (:, 1); | |
704 %! f = @(x, y) x == y; | |
705 %!error(bsxfun (f)); | |
706 %!error(bsxfun (f, a)); | |
707 %!error(bsxfun (a, b)); | |
708 %!error(bsxfun (a, b, c)); | |
709 %!error(bsxfun (f, a, b, c)); | |
710 %!error(bsxfun (f, ones(4, 0), ones(4, 4))) | |
711 %!assert(bsxfun (f, ones(4, 0), ones(4, 1)), zeros(4, 0, "logical")); | |
712 %!assert(bsxfun (f, ones(1, 4), ones(4, 1)), ones(4, 4, "logical")); | |
713 %!assert(bsxfun (f, a, b), a == repmat(b, 4, 1)); | |
714 %!assert(bsxfun (f, a, c), a == repmat(c, 1, 4)); | |
715 | |
716 %!shared a, b, c, d, f | |
717 %! a = randn (4, 4, 4); | |
718 %! b = mean (a, 1); | |
719 %! c = mean (a, 2); | |
720 %! d = mean (a, 3); | |
721 %! f = @minus; | |
722 %!error(bsxfun (f, ones([4, 0, 4]), ones([4, 4, 4]))); | |
723 %!assert(bsxfun (f, ones([4, 0, 4]), ones([4, 1, 4])), zeros([4, 0, 4])); | |
724 %!assert(bsxfun (f, ones([4, 4, 0]), ones([4, 1, 1])), zeros([4, 4, 0])); | |
725 %!assert(bsxfun (f, ones([1, 4, 4]), ones([4, 1, 4])), zeros([4, 4, 4])); | |
726 %!assert(bsxfun (f, ones([4, 4, 1]), ones([4, 1, 4])), zeros([4, 4, 4])); | |
727 %!assert(bsxfun (f, ones([4, 1, 4]), ones([1, 4, 4])), zeros([4, 4, 4])); | |
728 %!assert(bsxfun (f, ones([4, 1, 4]), ones([1, 4, 1])), zeros([4, 4, 4])); | |
729 %!assert(bsxfun (f, a, b), a - repmat(b, [4, 1, 1])); | |
730 %!assert(bsxfun (f, a, c), a - repmat(c, [1, 4, 1])); | |
731 %!assert(bsxfun (f, a, d), a - repmat(d, [1, 1, 4])); | |
732 %!assert(bsxfun ("minus", ones([4, 0, 4]), ones([4, 1, 4])), zeros([4, 0, 4])); | |
733 | |
734 %% The below is a very hard case to treat | |
735 %!assert(bsxfun (f, ones([4, 1, 4, 1]), ones([1, 4, 1, 4])), zeros([4, 4, 4, 4])); | |
736 | |
737 */ |