Mercurial > octave
annotate liboctave/util/oct-binmap.h @ 18789:dccbc8bff5cb stable
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
* oct-binmap.h (binmap (Sparse, Scalar), binmap (Scalar, Sparse)):
Check that function is sparsity preserving before using sparse algorithm.
Initialize retval row, column indices from original sparse array. Call
maybe_compress (true) to remove zero elements that function may have
produced.
* data.cc (Fatan2): Only preserve sparsity if *first* argument is sparse.
Add %!tests to verify sparse operations.
* data.cc (do_hypot): Call binmap with sparse inputs whenever at least
one of the inputs is sparse.
* data.cc (Fhypot): Add %!tests to verify sparse operations.
* data.cc (Frem): Call binmap with sparse inputs whenever at least
one of the inputs is sparse. Add %!tests to verify sparse operations.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 01 Jun 2014 21:41:58 -0700 |
parents | 658d23da2c46 |
children | 59975c3cea6b |
rev | line source |
---|---|
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
1 /* |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
2 |
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
15271
diff
changeset
|
3 Copyright (C) 2010-2013 VZLU Prague |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
4 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
5 This file is part of Octave. |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
6 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
7 Octave is free software; you can redistribute it and/or modify it |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
8 under the terms of the GNU General Public License as published by the |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
9 Free Software Foundation; either version 3 of the License, or (at your |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
10 option) any later version. |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
11 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
12 Octave is distributed in the hope that it will be useful, but WITHOUT |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
15 for more details. |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
16 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
17 You should have received a copy of the GNU General Public License |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
18 along with Octave; see the file COPYING. If not, see |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
19 <http://www.gnu.org/licenses/>. |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
20 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
21 */ |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
22 |
17822
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
23 #if !defined (octave_oct_binmap_h) |
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
24 #define octave_oct_binmap_h 1 |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
25 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
26 #include "Array.h" |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
27 #include "Sparse.h" |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
28 #include "Array-util.h" |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
29 |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
30 #include "bsxfun.h" |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
31 |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
32 // This source file implements a general binary maping function for |
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14846
diff
changeset
|
33 // arrays. The syntax is binmap<type> (a, b, f,[name]). type denotes |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
34 // the expected return type of the operation. a, b, should be one of |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
35 // the 6 combinations: |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
36 // |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
37 // Array-Array |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
38 // Array-scalar |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
39 // scalar-Array |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
40 // Sparse-Sparse |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
41 // Sparse-scalar |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
42 // scalar-Sparse |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
43 // |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
44 // If both operands are nonscalar, name must be supplied. It is used |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
45 // as the base for error message when operands are nonconforming. |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
46 // |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
47 // The operation needs not be homogeneous, i.e. a, b and the result |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
48 // may be of distinct types. f can have any of the four signatures: |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
49 // |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
50 // U f (T, R) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
51 // U f (const T&, R) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
52 // U f (T, const R&) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
53 // U f (const T&, const R&) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
54 // |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
55 // Additionally, f can be an arbitrary functor object. |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
56 // |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
57 // octave_quit() is called at appropriate places, hence the operation |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
58 // is breakable. |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
59 |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
60 // The following template wrappers are provided for automatic bsxfun |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
61 // calls (see the function signature for do_bsxfun_op). |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
62 |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
63 template<typename R, typename X, typename Y, typename F> |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
64 class bsxfun_wrapper |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
65 { |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
66 private: |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
67 static F f; |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
68 |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
69 public: |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
70 static void |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
71 set_f (const F& f_in) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
72 { |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
73 f = f_in; |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
74 } |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
75 |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
76 static void |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
77 op_mm (size_t n, R* r, const X* x , const Y* y) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
78 { |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
79 for (size_t i = 0; i < n; i++) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
80 r[i] = f (x[i], y[i]); |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
81 } |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
82 |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
83 static void |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
84 op_sm (size_t n, R* r, X x, const Y* y) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
85 { |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
86 for (size_t i = 0; i < n; i++) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
87 r[i] = f (x, y[i]); |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
88 } |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
89 |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
90 static void |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
91 op_ms (size_t n , R* r, const X* x, Y y) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
92 { |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
93 for (size_t i = 0; i < n; i++) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
94 r[i] = f (x[i], y); |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
95 } |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
96 }; |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
97 |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
98 // Static init |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
99 template<typename R, typename X, typename Y, typename F> |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
100 F bsxfun_wrapper<R, X, Y, F>::f; |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
101 |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
102 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
103 // scalar-Array |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
104 template <class U, class T, class R, class F> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
105 Array<U> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
106 binmap (const T& x, const Array<R>& ya, F fcn) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
107 { |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
108 octave_idx_type len = ya.numel (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
109 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
110 const R *y = ya.data (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
111 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
112 Array<U> result (ya.dims ()); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
113 U *p = result.fortran_vec (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
114 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
115 octave_idx_type i; |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
116 for (i = 0; i < len - 3; i += 4) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
117 { |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
118 octave_quit (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
119 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
120 p[i] = fcn (x, y[i]); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
121 p[i+1] = fcn (x, y[i+1]); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
122 p[i+2] = fcn (x, y[i+2]); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
123 p[i+3] = fcn (x, y[i+3]); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
124 } |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
125 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
126 octave_quit (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
127 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
128 for (; i < len; i++) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
129 p[i] = fcn (x, y[i]); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
130 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
131 return result; |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
132 } |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
133 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
134 // Array-scalar |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
135 template <class U, class T, class R, class F> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
136 Array<U> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
137 binmap (const Array<T>& xa, const R& y, F fcn) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
138 { |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
139 octave_idx_type len = xa.numel (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
140 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
141 const R *x = xa.data (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
142 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
143 Array<U> result (xa.dims ()); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
144 U *p = result.fortran_vec (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
145 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
146 octave_idx_type i; |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
147 for (i = 0; i < len - 3; i += 4) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
148 { |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
149 octave_quit (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
150 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
151 p[i] = fcn (x[i], y); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
152 p[i+1] = fcn (x[i+1], y); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
153 p[i+2] = fcn (x[i+2], y); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
154 p[i+3] = fcn (x[i+3], y); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
155 } |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
156 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
157 octave_quit (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
158 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
159 for (; i < len; i++) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
160 p[i] = fcn (x[i], y); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
161 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
162 return result; |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
163 } |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
164 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
165 // Array-Array (treats singletons as scalars) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
166 template <class U, class T, class R, class F> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
167 Array<U> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
168 binmap (const Array<T>& xa, const Array<R>& ya, F fcn, const char *name) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
169 { |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
170 dim_vector xad = xa.dims (), yad = ya.dims (); |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
171 if (xa.numel () == 1) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
172 return binmap<U, T, R, F> (xa(0), ya, fcn); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
173 else if (ya.numel () == 1) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
174 return binmap<U, T, R, F> (xa, ya(0), fcn); |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
175 else if (xad != yad) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
176 { |
14056
c3d401562410
allow warning (or error) for automatic bsxfun
John W. Eaton <jwe@octave.org>
parents:
13006
diff
changeset
|
177 if (is_valid_bsxfun (name, xad, yad)) |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
178 { |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
179 bsxfun_wrapper<U, T, R, F>::set_f(fcn); |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
180 return do_bsxfun_op (xa, ya, |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
181 bsxfun_wrapper<U, T, R, F>::op_mm, |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
182 bsxfun_wrapper<U, T, R, F>::op_sm, |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
183 bsxfun_wrapper<U, T, R, F>::op_ms); |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
184 } |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
185 else |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
186 gripe_nonconformant (name, xad, yad); |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
187 } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
188 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
189 octave_idx_type len = xa.numel (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
190 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
191 const T *x = xa.data (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
192 const T *y = ya.data (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
193 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
194 Array<U> result (xa.dims ()); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
195 U *p = result.fortran_vec (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
196 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
197 octave_idx_type i; |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
198 for (i = 0; i < len - 3; i += 4) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
199 { |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
200 octave_quit (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
201 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
202 p[i] = fcn (x[i], y[i]); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
203 p[i+1] = fcn (x[i+1], y[i+1]); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
204 p[i+2] = fcn (x[i+2], y[i+2]); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
205 p[i+3] = fcn (x[i+3], y[i+3]); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
206 } |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
207 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
208 octave_quit (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
209 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
210 for (; i < len; i++) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
211 p[i] = fcn (x[i], y[i]); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
212 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
213 return result; |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
214 } |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
215 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
216 // scalar-Sparse |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
217 template <class U, class T, class R, class F> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
218 Sparse<U> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
219 binmap (const T& x, const Sparse<R>& ys, F fcn) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
220 { |
18789
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
221 R yzero = R (); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
222 U fz = fcn (x, yzero); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
223 |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
224 if (fz == U ()) // Sparsity preserving fcn |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
225 { |
18789
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
226 octave_idx_type nz = ys.nnz (); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
227 Sparse<U> retval (ys.rows (), ys.cols (), nz); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
228 copy_or_memcpy (nz, ys.ridx (), retval.ridx ()); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
229 copy_or_memcpy (ys.cols () + 1, ys.cidx (), retval.cidx ()); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
230 |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
231 for (octave_idx_type i = 0; i < nz; i++) |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
232 { |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
233 octave_quit (); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
234 // FIXME: Could keep track of whether fcn call results in a 0. |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
235 // If no zeroes are created could skip maybe_compress() |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
236 retval.xdata (i) = fcn (x, ys.data (i)); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
237 } |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
238 |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
239 octave_quit (); |
18789
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
240 retval.maybe_compress (true); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
241 return retval; |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
242 } |
18789
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
243 else |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
244 return Sparse<U> (binmap<U, T, R, F> (x, ys.array_value (), fcn)); |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
245 } |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
246 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
247 // Sparse-scalar |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
248 template <class U, class T, class R, class F> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
249 Sparse<U> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
250 binmap (const Sparse<T>& xs, const R& y, F fcn) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
251 { |
18789
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
252 T xzero = T (); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
253 U fz = fcn (xzero, y); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
254 |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
255 if (fz == U ()) // Sparsity preserving fcn |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
256 { |
18789
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
257 octave_idx_type nz = xs.nnz (); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
258 Sparse<U> retval (xs.rows (), xs.cols (), nz); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
259 copy_or_memcpy (nz, xs.ridx (), retval.ridx ()); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
260 copy_or_memcpy (xs.cols () + 1, xs.cidx (), retval.cidx ()); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
261 |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
262 for (octave_idx_type i = 0; i < nz; i++) |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
263 { |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
264 octave_quit (); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
265 // FIXME: Could keep track of whether fcn call results in a 0. |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
266 // If no zeroes are created could skip maybe_compress() |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
267 retval.xdata (i) = fcn (xs.data (i), y); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
268 } |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
269 |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
270 octave_quit (); |
18789
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
271 retval.maybe_compress (true); |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
272 return retval; |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
273 } |
18789
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
274 else |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
275 return Sparse<U> (binmap<U, T, R, F> (xs.array_value (), y, fcn)); |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
276 } |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
277 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
278 // Sparse-Sparse (treats singletons as scalars) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
279 template <class U, class T, class R, class F> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
280 Sparse<U> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
281 binmap (const Sparse<T>& xs, const Sparse<R>& ys, F fcn, const char *name) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
282 { |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
283 if (xs.rows () == 1 && xs.cols () == 1) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
284 return binmap<U, T, R, F> (xs(0,0), ys, fcn); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
285 else if (ys.rows () == 1 && ys.cols () == 1) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
286 return binmap<U, T, R, F> (xs, ys(0,0), fcn); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
287 else if (xs.dims () != ys.dims ()) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
288 gripe_nonconformant (name, xs.dims (), ys.dims ()); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
289 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
290 T xzero = T (); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
291 R yzero = R (); |
18788
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
292 U fz = fcn (xzero, yzero); |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
293 |
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
294 if (fz == U ()) |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
295 { |
18788
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
296 // Sparsity-preserving function. Do it efficiently. |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
297 octave_idx_type nr = xs.rows (); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
298 octave_idx_type nc = xs.cols (); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
299 Sparse<T> retval (nr, nc, xs.nnz () + ys.nnz ()); |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
300 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
301 octave_idx_type nz = 0; |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
302 for (octave_idx_type j = 0; j < nc; j++) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
303 { |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
304 octave_quit (); |
18788
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
305 |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
306 octave_idx_type jx = xs.cidx (j); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
307 octave_idx_type jx_max = xs.cidx (j+1); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
308 bool jx_lt_max = jx < jx_max; |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
309 |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
310 octave_idx_type jy = ys.cidx (j); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
311 octave_idx_type jy_max = ys.cidx (j+1); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
312 bool jy_lt_max = jy < jy_max; |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
313 |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
314 while (jx_lt_max || jy_lt_max) |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
315 { |
18788
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
316 if (! jy_lt_max |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
317 || (jx_lt_max && (xs.ridx (jx) < ys.ridx (jy)))) |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
318 { |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
319 retval.xridx (nz) = xs.ridx (jx); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
320 retval.xdata (nz) = fcn (xs.data (jx), yzero); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
321 jx++; |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
322 jx_lt_max = jx < jx_max; |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
323 } |
18789
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
324 else if (! jx_lt_max |
dccbc8bff5cb
Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813).
Rik <rik@octave.org>
parents:
18788
diff
changeset
|
325 || (jy_lt_max && (ys.ridx (jy) < xs.ridx (jx)))) |
18788
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
326 { |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
327 retval.xridx (nz) = ys.ridx (jy); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
328 retval.xdata (nz) = fcn (xzero, ys.data (jy)); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
329 jy++; |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
330 jy_lt_max = jy < jy_max; |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
331 } |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
332 else |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
333 { |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
334 retval.xridx (nz) = xs.ridx (jx); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
335 retval.xdata (nz) = fcn (xs.data (jx), ys.data (jy)); |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
336 jx++; |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
337 jx_lt_max = jx < jx_max; |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
338 jy++; |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
339 jy_lt_max = jy < jy_max; |
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
340 } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
341 nz++; |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
342 } |
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14846
diff
changeset
|
343 retval.xcidx (j+1) = nz; |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
344 } |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
345 |
18788
658d23da2c46
Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813).
Stefan Mahr <dac922@gmx.de>
parents:
17822
diff
changeset
|
346 retval.maybe_compress (true); |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
347 return retval; |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
348 } |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
349 else |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
350 return Sparse<U> (binmap<U, T, R, F> (xs.array_value (), ys.array_value (), |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
351 fcn, name)); |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
352 } |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
353 |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
354 // Overloads for function pointers. |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
355 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
356 // Signature (T, R) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
357 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
358 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
359 inline Array<U> |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
360 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (T, R), |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
361 const char *name) |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
362 { return binmap<U, T, R, U (*) (T, R)> (xa, ya, fcn, name); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
363 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
364 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
365 inline Array<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
366 binmap (const T& x, const Array<R>& ya, U (*fcn) (T, R)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
367 { return binmap<U, T, R, U (*) (T, R)> (x, ya, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
368 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
369 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
370 inline Array<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
371 binmap (const Array<T>& xa, const R& y, U (*fcn) (T, R)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
372 { return binmap<U, T, R, U (*) (T, R)> (xa, y, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
373 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
374 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
375 inline Sparse<U> |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
376 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (T, R), |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
377 const char *name) |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
378 { return binmap<U, T, R, U (*) (T, R)> (xa, ya, fcn, name); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
379 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
380 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
381 inline Sparse<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
382 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (T, R)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
383 { return binmap<U, T, R, U (*) (T, R)> (x, ya, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
384 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
385 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
386 inline Sparse<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
387 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (T, R)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
388 { return binmap<U, T, R, U (*) (T, R)> (xa, y, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
389 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
390 // Signature (const T&, const R&) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
391 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
392 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
393 inline Array<U> |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
394 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (const T&, const R&), |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
395 const char *name) |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
396 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, ya, fcn, name); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
397 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
398 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
399 inline Array<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
400 binmap (const T& x, const Array<R>& ya, U (*fcn) (const T&, const R&)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
401 { return binmap<U, T, R, U (*) (const T&, const R&)> (x, ya, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
402 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
403 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
404 inline Array<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
405 binmap (const Array<T>& xa, const R& y, U (*fcn) (const T&, const R&)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
406 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, y, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
407 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
408 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
409 inline Sparse<U> |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
410 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (const T&, const R&), |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
411 const char *name) |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
412 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, ya, fcn, name); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
413 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
414 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
415 inline Sparse<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
416 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (const T&, const R&)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
417 { return binmap<U, T, R, U (*) (const T&, const R&)> (x, ya, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
418 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
419 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
420 inline Sparse<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
421 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (const T&, const R&)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
422 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, y, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
423 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
424 // Signature (const T&, R) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
425 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
426 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
427 inline Array<U> |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
428 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (const T&, R), |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
429 const char *name) |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
430 { return binmap<U, T, R, U (*) (const T&, R)> (xa, ya, fcn, name); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
431 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
432 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
433 inline Array<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
434 binmap (const T& x, const Array<R>& ya, U (*fcn) (const T&, R)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
435 { return binmap<U, T, R, U (*) (const T&, R)> (x, ya, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
436 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
437 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
438 inline Array<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
439 binmap (const Array<T>& xa, const R& y, U (*fcn) (const T&, R)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
440 { return binmap<U, T, R, U (*) (const T&, R)> (xa, y, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
441 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
442 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
443 inline Sparse<U> |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
444 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (const T&, R), |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
445 const char *name) |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
446 { return binmap<U, T, R, U (*) (const T&, R)> (xa, ya, fcn, name); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
447 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
448 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
449 inline Sparse<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
450 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (const T&, R)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
451 { return binmap<U, T, R, U (*) (const T&, R)> (x, ya, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
452 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
453 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
454 inline Sparse<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
455 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (const T&, R)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
456 { return binmap<U, T, R, U (*) (const T&, R)> (xa, y, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
457 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
458 // Signature (T, const R&) |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
459 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
460 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
461 inline Array<U> |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
462 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (T, const R&), |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
463 const char *name) |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
464 { return binmap<U, T, R, U (*) (T, const R&)> (xa, ya, fcn, name); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
465 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
466 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
467 inline Array<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
468 binmap (const T& x, const Array<R>& ya, U (*fcn) (T, const R&)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
469 { return binmap<U, T, R, U (*) (T, const R&)> (x, ya, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
470 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
471 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
472 inline Array<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
473 binmap (const Array<T>& xa, const R& y, U (*fcn) (T, const R&)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
474 { return binmap<U, T, R, U (*) (T, const R&)> (xa, y, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
475 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
476 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
477 inline Sparse<U> |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
478 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (T, const R&), |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
479 const char *name) |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
480 { return binmap<U, T, R, U (*) (T, const R&)> (xa, ya, fcn, name); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
481 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
482 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
483 inline Sparse<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
484 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (T, const R&)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
485 { return binmap<U, T, R, U (*) (T, const R&)> (x, ya, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
486 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
487 template <class U, class T, class R> |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
488 inline Sparse<U> |
13006
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
489 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (T, const R&)) |
61be447052c3
Implement automatic bsxfun almost everywhere now except sparse matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
490 { return binmap<U, T, R, U (*) (T, const R&)> (xa, y, fcn); } |
10435
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
491 |
6a271334750c
implement general binary mapping facility
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
492 #endif |