Mercurial > hg > octave-nkf
annotate liboctave/dNDArray.h @ 10396:a0b51ac0f88a
optimize accumdim with summation
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Fri, 05 Mar 2010 12:31:30 +0100 |
parents | 96ed7c629bbd |
children | fd0a3ac60b0e |
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 |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
27 #include "MArray.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 |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
37 NDArray : public MArray<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 |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
43 NDArray (void) : MArray<double> () { } |
4511 | 44 |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
45 NDArray (const dim_vector& dv) : MArray<double> (dv) { } |
4511 | 46 |
4587 | 47 NDArray (const dim_vector& dv, double val) |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
48 : MArray<double> (dv, val) { } |
4511 | 49 |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
50 NDArray (const NDArray& a) : MArray<double> (a) { } |
4513 | 51 |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
52 NDArray (const Matrix& a) : MArray<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, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
55 bool negative_to_nan = false); |
7919
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> |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
58 NDArray (const MArray<U>& a) : MArray<double> (a) { } |
7789
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> |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
61 NDArray (const Array<U>& a) : MArray<double> (a) { } |
4511 | 62 |
4902 | 63 template <class U> |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
64 explicit NDArray (const intNDArray<U>& a) : MArray<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 { | |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
70 MArray<double>::operator = (a); |
4511 | 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; | |
9827
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
85 bool all_integers (void) const; |
4634 | 86 bool too_large_for_float (void) const; |
87 | |
5775 | 88 // FIXME -- this is not quite the right thing. |
4513 | 89 |
4556 | 90 boolNDArray all (int dim = -1) const; |
91 boolNDArray any (int dim = -1) const; | |
4513 | 92 |
4584 | 93 NDArray cumprod (int dim = -1) const; |
94 NDArray cumsum (int dim = -1) const; | |
4569 | 95 NDArray prod (int dim = -1) const; |
96 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
|
97 NDArray xsum (int dim = -1) const; |
4569 | 98 NDArray sumsq (int dim = -1) const; |
5275 | 99 NDArray concat (const NDArray& rb, const Array<octave_idx_type>& ra_idx); |
100 ComplexNDArray concat (const ComplexNDArray& rb, const Array<octave_idx_type>& ra_idx); | |
101 charNDArray concat (const charNDArray& rb, const Array<octave_idx_type>& ra_idx); | |
4844 | 102 |
9790
a5035bc7fbfb
rewrite dispatch part & slightly improve min,max,cummin,cummax
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
103 NDArray max (int dim = -1) const; |
a5035bc7fbfb
rewrite dispatch part & slightly improve min,max,cummin,cummax
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
104 NDArray max (Array<octave_idx_type>& index, int dim = -1) const; |
a5035bc7fbfb
rewrite dispatch part & slightly improve min,max,cummin,cummax
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
105 NDArray min (int dim = -1) const; |
a5035bc7fbfb
rewrite dispatch part & slightly improve min,max,cummin,cummax
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
106 NDArray min (Array<octave_idx_type>& index, int dim = -1) const; |
4844 | 107 |
9790
a5035bc7fbfb
rewrite dispatch part & slightly improve min,max,cummin,cummax
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
108 NDArray cummax (int dim = -1) const; |
a5035bc7fbfb
rewrite dispatch part & slightly improve min,max,cummin,cummax
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
109 NDArray cummax (Array<octave_idx_type>& index, int dim = -1) const; |
a5035bc7fbfb
rewrite dispatch part & slightly improve min,max,cummin,cummax
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
110 NDArray cummin (int dim = -1) const; |
a5035bc7fbfb
rewrite dispatch part & slightly improve min,max,cummin,cummax
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
111 NDArray cummin (Array<octave_idx_type>& index, int dim = -1) const; |
8777
724c0f46d9d4
implement cummin/cummax functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8774
diff
changeset
|
112 |
9790
a5035bc7fbfb
rewrite dispatch part & slightly improve min,max,cummin,cummax
Jaroslav Hajek <highegg@gmail.com>
parents:
9743
diff
changeset
|
113 NDArray diff (octave_idx_type order = 1, int dim = -1) const; |
9513
9f870f73ab7d
implement built-in diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
114 |
5275 | 115 NDArray& insert (const NDArray& a, octave_idx_type r, octave_idx_type c); |
116 NDArray& insert (const NDArray& a, const Array<octave_idx_type>& ra_idx); | |
4915 | 117 |
4634 | 118 NDArray abs (void) const; |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8956
diff
changeset
|
119 boolNDArray isnan (void) const; |
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8956
diff
changeset
|
120 boolNDArray isinf (void) const; |
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8956
diff
changeset
|
121 boolNDArray isfinite (void) const; |
4634 | 122 |
4773 | 123 ComplexNDArray fourier (int dim = 1) const; |
124 ComplexNDArray ifourier (int dim = 1) const; | |
125 | |
126 ComplexNDArray fourier2d (void) const; | |
127 ComplexNDArray ifourier2d (void) const; | |
128 | |
129 ComplexNDArray fourierNd (void) const; | |
130 ComplexNDArray ifourierNd (void) const; | |
131 | |
6108 | 132 friend OCTAVE_API NDArray real (const ComplexNDArray& a); |
133 friend OCTAVE_API NDArray imag (const ComplexNDArray& a); | |
4569 | 134 |
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
|
135 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
|
136 |
4513 | 137 Matrix matrix_value (void) const; |
138 | |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
139 NDArray squeeze (void) const { return MArray<double>::squeeze (); } |
4532 | 140 |
5275 | 141 static void increment_index (Array<octave_idx_type>& ra_idx, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
142 const dim_vector& dimensions, |
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
143 int start_dimension = 0); |
4532 | 144 |
5275 | 145 static octave_idx_type compute_index (Array<octave_idx_type>& ra_idx, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
146 const dim_vector& dimensions); |
4556 | 147 |
4511 | 148 // i/o |
149 | |
6108 | 150 friend OCTAVE_API std::ostream& operator << (std::ostream& os, const NDArray& a); |
151 friend OCTAVE_API std::istream& operator >> (std::istream& is, NDArray& a); | |
4511 | 152 |
153 static double resize_fill_value (void) { return 0; } | |
154 | |
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
155 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
|
156 |
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9513
diff
changeset
|
157 NDArray& changesign (void) |
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9513
diff
changeset
|
158 { |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
159 MArray<double>::changesign (); |
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9513
diff
changeset
|
160 return *this; |
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9513
diff
changeset
|
161 } |
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9513
diff
changeset
|
162 |
4511 | 163 }; |
164 | |
5508 | 165 // Publish externally used friend functions. |
166 | |
6108 | 167 extern OCTAVE_API NDArray real (const ComplexNDArray& a); |
168 extern OCTAVE_API NDArray imag (const ComplexNDArray& a); | |
5508 | 169 |
10329
83fa590b8a09
simplify min/max definitions in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10312
diff
changeset
|
170 MINMAX_DECLS (NDArray, double, OCTAVE_API) |
4844 | 171 |
6708 | 172 NDS_CMP_OP_DECLS (NDArray, double, OCTAVE_API) |
173 NDS_BOOL_OP_DECLS (NDArray, double, OCTAVE_API) | |
4543 | 174 |
6708 | 175 SND_CMP_OP_DECLS (double, NDArray, OCTAVE_API) |
176 SND_BOOL_OP_DECLS (double, NDArray, OCTAVE_API) | |
4543 | 177 |
6708 | 178 NDND_CMP_OP_DECLS (NDArray, NDArray, OCTAVE_API) |
179 NDND_BOOL_OP_DECLS (NDArray, NDArray, OCTAVE_API) | |
4543 | 180 |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10329
diff
changeset
|
181 MARRAY_FORWARD_DEFS (MArray, NDArray, double) |
4511 | 182 |
9743
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9732
diff
changeset
|
183 BSXFUN_STDOP_DECLS (NDArray, OCTAVE_API) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9732
diff
changeset
|
184 BSXFUN_STDREL_DECLS (NDArray, OCTAVE_API) |
26abff55f6fe
optimize bsxfun for common built-in operations
Jaroslav Hajek <highegg@gmail.com>
parents:
9732
diff
changeset
|
185 |
9827
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
186 BSXFUN_OP_DECL (pow, NDArray, OCTAVE_API) |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
187 BSXFUN_OP2_DECL (pow, ComplexNDArray, ComplexNDArray, |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
188 NDArray, OCTAVE_API) |
c15a5ed0da58
optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
189 |
4511 | 190 #endif |