Mercurial > hg > octave-lyh
annotate liboctave/dNDArray.h @ 9743:26abff55f6fe
optimize bsxfun for common built-in operations
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Tue, 20 Oct 2009 10:47:22 +0200 |
| parents | b4fdfee405b5 |
| children | a5035bc7fbfb |
| rev | line source |
|---|---|
| 4511 | 1 /* |
| 2 | |
| 8920 | 3 Copyright (C) 1996, 1997, 2003, 2004, 2005, 2006, 2007, 2008, |
| 4 2009 John W. Eaton | |
| 4511 | 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. | |
| 4511 | 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/>. | |
| 4511 | 21 |
| 22 */ | |
| 23 | |
| 4513 | 24 #if !defined (octave_NDArray_h) |
| 25 #define octave_NDArray_h 1 | |
| 4511 | 26 |
| 27 #include "MArrayN.h" | |
| 4513 | 28 #include "dMatrix.h" |
| 4902 | 29 #include "intNDArray.h" |
| 4511 | 30 |
| 31 #include "mx-defs.h" | |
|
8774
b756ce0002db
split implementation and interface in mx-op-defs and MArray-defs
Jaroslav Hajek <highegg@gmail.com>
parents:
8650
diff
changeset
|
32 #include "mx-op-decl.h" |
|
9743
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9732
diff
changeset
|
33 #include "bsxfun-decl.h" |
| 4511 | 34 |
| 4513 | 35 class |
| 6108 | 36 OCTAVE_API |
| 4513 | 37 NDArray : public MArrayN<double> |
| 4511 | 38 { |
| 4513 | 39 public: |
| 5523 | 40 |
|
9656
b29504415a2e
provide NDArray->Matrix->Vector typedef mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
41 typedef Matrix matrix_type; |
|
b29504415a2e
provide NDArray->Matrix->Vector typedef mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
42 |
| 4511 | 43 NDArray (void) : MArrayN<double> () { } |
| 44 | |
| 4587 | 45 NDArray (const dim_vector& dv) : MArrayN<double> (dv) { } |
| 4511 | 46 |
| 4587 | 47 NDArray (const dim_vector& dv, double val) |
| 48 : MArrayN<double> (dv, val) { } | |
| 4511 | 49 |
| 4513 | 50 NDArray (const NDArray& a) : MArrayN<double> (a) { } |
| 51 | |
| 52 NDArray (const Matrix& a) : MArrayN<double> (a) { } | |
| 4511 | 53 |
|
7919
9d080df0c843
new NDArray constructor for ArrayN<octave_idx_type>
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
54 NDArray (const Array<octave_idx_type>& a, bool zero_based = false, |
|
9d080df0c843
new NDArray constructor for ArrayN<octave_idx_type>
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
55 bool negative_to_nan = false); |
|
9d080df0c843
new NDArray constructor for ArrayN<octave_idx_type>
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
56 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
57 template <class U> |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
58 NDArray (const MArrayN<U>& a) : MArrayN<double> (a) { } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
59 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
60 template <class U> |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9721
diff
changeset
|
61 NDArray (const Array<U>& a) : MArrayN<double> (a) { } |
| 4511 | 62 |
| 4902 | 63 template <class U> |
| 64 explicit NDArray (const intNDArray<U>& a) : MArrayN<double> (a) { } | |
| 4543 | 65 |
|
8956
d91fa4b20bbb
ensure nonnegative char -> real conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
66 NDArray (const charNDArray&); |
|
d91fa4b20bbb
ensure nonnegative char -> real conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
67 |
| 4511 | 68 NDArray& operator = (const NDArray& a) |
| 69 { | |
| 70 MArrayN<double>::operator = (a); | |
| 71 return *this; | |
| 72 } | |
| 73 | |
| 4543 | 74 // unary operations |
| 75 | |
| 76 boolNDArray operator ! (void) const; | |
| 77 | |
| 4634 | 78 bool any_element_is_negative (bool = false) const; |
|
7922
935be827eaf8
error for NaN values in & and | expressions
John W. Eaton <jwe@octave.org>
parents:
7919
diff
changeset
|
79 bool any_element_is_nan (void) const; |
| 4634 | 80 bool any_element_is_inf_or_nan (void) const; |
| 5943 | 81 bool any_element_not_one_or_zero (void) const; |
| 6989 | 82 bool all_elements_are_zero (void) const; |
| 4634 | 83 bool all_elements_are_int_or_inf_or_nan (void) const; |
| 84 bool all_integers (double& max_val, double& min_val) const; | |
| 85 bool too_large_for_float (void) const; | |
| 86 | |
| 5775 | 87 // FIXME -- this is not quite the right thing. |
| 4513 | 88 |
| 4556 | 89 boolNDArray all (int dim = -1) const; |
| 90 boolNDArray any (int dim = -1) const; | |
| 4513 | 91 |
| 4584 | 92 NDArray cumprod (int dim = -1) const; |
| 93 NDArray cumsum (int dim = -1) const; | |
| 4569 | 94 NDArray prod (int dim = -1) const; |
| 95 NDArray sum (int dim = -1) const; | |
|
9721
192d94cff6c1
improve sum & implement the 'extra' option, refactor some code
Jaroslav Hajek <highegg@gmail.com>
parents:
9656
diff
changeset
|
96 NDArray xsum (int dim = -1) const; |
| 4569 | 97 NDArray sumsq (int dim = -1) const; |
| 5275 | 98 NDArray concat (const NDArray& rb, const Array<octave_idx_type>& ra_idx); |
| 99 ComplexNDArray concat (const ComplexNDArray& rb, const Array<octave_idx_type>& ra_idx); | |
| 100 charNDArray concat (const charNDArray& rb, const Array<octave_idx_type>& ra_idx); | |
| 4844 | 101 |
| 102 NDArray max (int dim = 0) const; | |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9721
diff
changeset
|
103 NDArray max (Array<octave_idx_type>& index, int dim = 0) const; |
| 4844 | 104 NDArray min (int dim = 0) const; |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9721
diff
changeset
|
105 NDArray min (Array<octave_idx_type>& index, int dim = 0) const; |
| 4844 | 106 |
|
8777
724c0f46d9d4
implement cummin/cummax functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8774
diff
changeset
|
107 NDArray cummax (int dim = 0) const; |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9721
diff
changeset
|
108 NDArray cummax (Array<octave_idx_type>& index, int dim = 0) const; |
|
8777
724c0f46d9d4
implement cummin/cummax functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8774
diff
changeset
|
109 NDArray cummin (int dim = 0) const; |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9721
diff
changeset
|
110 NDArray cummin (Array<octave_idx_type>& index, int dim = 0) const; |
|
8777
724c0f46d9d4
implement cummin/cummax functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8774
diff
changeset
|
111 |
|
9513
9f870f73ab7d
implement built-in diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
112 NDArray diff (octave_idx_type order = 1, int dim = 0) const; |
|
9f870f73ab7d
implement built-in diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
113 |
| 5275 | 114 NDArray& insert (const NDArray& a, octave_idx_type r, octave_idx_type c); |
| 115 NDArray& insert (const NDArray& a, const Array<octave_idx_type>& ra_idx); | |
| 4915 | 116 |
| 4634 | 117 NDArray abs (void) const; |
|
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8956
diff
changeset
|
118 boolNDArray isnan (void) const; |
|
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8956
diff
changeset
|
119 boolNDArray isinf (void) const; |
|
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8956
diff
changeset
|
120 boolNDArray isfinite (void) const; |
| 4634 | 121 |
| 4773 | 122 ComplexNDArray fourier (int dim = 1) const; |
| 123 ComplexNDArray ifourier (int dim = 1) const; | |
| 124 | |
| 125 ComplexNDArray fourier2d (void) const; | |
| 126 ComplexNDArray ifourier2d (void) const; | |
| 127 | |
| 128 ComplexNDArray fourierNd (void) const; | |
| 129 ComplexNDArray ifourierNd (void) const; | |
| 130 | |
| 6108 | 131 friend OCTAVE_API NDArray real (const ComplexNDArray& a); |
| 132 friend OCTAVE_API NDArray imag (const ComplexNDArray& a); | |
| 4569 | 133 |
|
8650
a1ae2aae903e
abs,real,imag,conj: use code from mx-inlines rather than the generic map
Jaroslav Hajek <highegg@gmail.com>
parents:
7922
diff
changeset
|
134 friend class ComplexNDArray; |
|
a1ae2aae903e
abs,real,imag,conj: use code from mx-inlines rather than the generic map
Jaroslav Hajek <highegg@gmail.com>
parents:
7922
diff
changeset
|
135 |
| 4513 | 136 Matrix matrix_value (void) const; |
| 137 | |
| 4902 | 138 NDArray squeeze (void) const { return MArrayN<double>::squeeze (); } |
| 4532 | 139 |
| 5275 | 140 static void increment_index (Array<octave_idx_type>& ra_idx, |
| 4532 | 141 const dim_vector& dimensions, |
| 142 int start_dimension = 0); | |
| 143 | |
| 5275 | 144 static octave_idx_type compute_index (Array<octave_idx_type>& ra_idx, |
| 4556 | 145 const dim_vector& dimensions); |
| 146 | |
| 4511 | 147 // i/o |
| 148 | |
| 6108 | 149 friend OCTAVE_API std::ostream& operator << (std::ostream& os, const NDArray& a); |
| 150 friend OCTAVE_API std::istream& operator >> (std::istream& is, NDArray& a); | |
| 4511 | 151 |
| 152 static double resize_fill_value (void) { return 0; } | |
| 153 | |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
154 NDArray diag (octave_idx_type k = 0) const; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
155 |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9513
diff
changeset
|
156 NDArray& changesign (void) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9513
diff
changeset
|
157 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9513
diff
changeset
|
158 MArrayN<double>::changesign (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9513
diff
changeset
|
159 return *this; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9513
diff
changeset
|
160 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9513
diff
changeset
|
161 |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
162 typedef double (*dmapper) (double); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
163 typedef Complex (*cmapper) (const Complex&); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
164 typedef bool (*bmapper) (double); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
165 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
166 NDArray map (dmapper fcn) const; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
167 ComplexNDArray map (cmapper fcn) const; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
168 boolNDArray map (bmapper fcn) const; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
169 |
| 4513 | 170 private: |
| 4511 | 171 |
| 4634 | 172 NDArray (double *d, const dim_vector& dv) : MArrayN<double> (d, dv) { } |
| 4511 | 173 }; |
| 174 | |
| 5508 | 175 // Publish externally used friend functions. |
| 176 | |
| 6108 | 177 extern OCTAVE_API NDArray real (const ComplexNDArray& a); |
| 178 extern OCTAVE_API NDArray imag (const ComplexNDArray& a); | |
| 5508 | 179 |
| 6108 | 180 extern OCTAVE_API NDArray min (double d, const NDArray& m); |
| 181 extern OCTAVE_API NDArray min (const NDArray& m, double d); | |
| 182 extern OCTAVE_API NDArray min (const NDArray& a, const NDArray& b); | |
| 4844 | 183 |
| 6108 | 184 extern OCTAVE_API NDArray max (double d, const NDArray& m); |
| 185 extern OCTAVE_API NDArray max (const NDArray& m, double d); | |
| 186 extern OCTAVE_API NDArray max (const NDArray& a, const NDArray& b); | |
| 4844 | 187 |
| 6708 | 188 NDS_CMP_OP_DECLS (NDArray, double, OCTAVE_API) |
| 189 NDS_BOOL_OP_DECLS (NDArray, double, OCTAVE_API) | |
| 4543 | 190 |
| 6708 | 191 SND_CMP_OP_DECLS (double, NDArray, OCTAVE_API) |
| 192 SND_BOOL_OP_DECLS (double, NDArray, OCTAVE_API) | |
| 4543 | 193 |
| 6708 | 194 NDND_CMP_OP_DECLS (NDArray, NDArray, OCTAVE_API) |
| 195 NDND_BOOL_OP_DECLS (NDArray, NDArray, OCTAVE_API) | |
| 4543 | 196 |
| 4511 | 197 MARRAY_FORWARD_DEFS (MArrayN, NDArray, double) |
| 198 | |
|
9743
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9732
diff
changeset
|
199 BSXFUN_STDOP_DECLS (NDArray, OCTAVE_API) |
|
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9732
diff
changeset
|
200 BSXFUN_STDREL_DECLS (NDArray, OCTAVE_API) |
|
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9732
diff
changeset
|
201 |
| 4511 | 202 #endif |
| 4513 | 203 |
| 204 /* | |
| 205 ;;; Local Variables: *** | |
| 206 ;;; mode: C++ *** | |
| 207 ;;; End: *** | |
| 208 */ |