Mercurial > forge

comparison main/fixed/src/fixedCNDArray.h @ 9481:d84d2fea3c90 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re-enable compilation of fixed package
author jordigh
date Wed, 22 Feb 2012 22:07:33 +0000
parents 2de537641f94
children 7b7cd174847c
comparison
equal deleted inserted replaced
9480:954f2f00d782 9481:d84d2fea3c90
24 */ 24 */
25 25
26 #if !defined (octave_FixedCNDArray_h) 26 #if !defined (octave_FixedCNDArray_h)
27 #define octave_FixedCNDArray_h 1 27 #define octave_FixedCNDArray_h 1
28 28
29 #include <octave/MArrayN.h> 29 #include <octave/MArray.h>
30 #include <octave/dMatrix.h> 30 #include <octave/dMatrix.h>
31 31
32 #include <octave/dNDArray.h> 32 #include <octave/dNDArray.h>
33 #include <octave/CNDArray.h> 33 #include <octave/CNDArray.h>
34 #include <octave/boolNDArray.h> 34 #include <octave/boolNDArray.h>
43 #include "fixedCMatrix.h" 43 #include "fixedCMatrix.h"
44 #include "fixedComplex.h" 44 #include "fixedComplex.h"
45 #include "fixedNDArray.h" 45 #include "fixedNDArray.h"
46 46
47 class 47 class
48 FixedComplexNDArray : public MArrayN<FixedPointComplex> 48 FixedComplexNDArray : public MArray<FixedPointComplex>
49 { 49 {
50 public: 50 public:
51 51
52 FixedComplexNDArray (void) : MArrayN<FixedPointComplex> () { } 52 FixedComplexNDArray (void) : MArray<FixedPointComplex> () { }
53 53
54 FixedComplexNDArray (const dim_vector& dv) 54 FixedComplexNDArray (const dim_vector& dv)
55 : MArrayN<FixedPointComplex> (dv) { } 55 : MArray<FixedPointComplex> (dv) { }
56 56
57 FixedComplexNDArray (const dim_vector& dv, const FixedPointComplex val) : 57 FixedComplexNDArray (const dim_vector& dv, const FixedPointComplex val) :
58 MArrayN<FixedPointComplex> (dv, val) { } 58 MArray<FixedPointComplex> (dv, val) { }
59 59
60 FixedComplexNDArray (const MArrayN<int> &is, const MArrayN<int> &ds); 60 FixedComplexNDArray (const MArray<int> &is, const MArray<int> &ds);
61 61
62 FixedComplexNDArray (const NDArray &is, const NDArray &ds); 62 FixedComplexNDArray (const NDArray &is, const NDArray &ds);
63 63
64 FixedComplexNDArray (const ComplexNDArray &is, const ComplexNDArray &ds); 64 FixedComplexNDArray (const ComplexNDArray &is, const ComplexNDArray &ds);
65 65
67 const FixedComplexNDArray& a); 67 const FixedComplexNDArray& a);
68 68
69 FixedComplexNDArray (Complex is, Complex ds, 69 FixedComplexNDArray (Complex is, Complex ds,
70 const FixedComplexNDArray& a); 70 const FixedComplexNDArray& a);
71 71
72 FixedComplexNDArray (const MArrayN<int> &is, const MArrayN<int> &ds, 72 FixedComplexNDArray (const MArray<int> &is, const MArray<int> &ds,
73 const FixedComplexNDArray& a); 73 const FixedComplexNDArray& a);
74 74
75 FixedComplexNDArray (const NDArray &is, const NDArray &ds, 75 FixedComplexNDArray (const NDArray &is, const NDArray &ds,
76 const FixedComplexNDArray& a); 76 const FixedComplexNDArray& a);
77 77
81 FixedComplexNDArray (unsigned int is, unsigned int ds, 81 FixedComplexNDArray (unsigned int is, unsigned int ds,
82 const FixedNDArray& a); 82 const FixedNDArray& a);
83 83
84 FixedComplexNDArray (Complex is, Complex ds, const FixedNDArray& a); 84 FixedComplexNDArray (Complex is, Complex ds, const FixedNDArray& a);
85 85
86 FixedComplexNDArray (const MArrayN<int> &is, const MArrayN<int> &ds, 86 FixedComplexNDArray (const MArray<int> &is, const MArray<int> &ds,
87 const FixedNDArray& a); 87 const FixedNDArray& a);
88 88
89 FixedComplexNDArray (const NDArray &is, const NDArray &ds, 89 FixedComplexNDArray (const NDArray &is, const NDArray &ds,
90 const FixedNDArray& a); 90 const FixedNDArray& a);
91 91
95 FixedComplexNDArray (unsigned int is, unsigned int ds, 95 FixedComplexNDArray (unsigned int is, unsigned int ds,
96 const ComplexNDArray& a); 96 const ComplexNDArray& a);
97 97
98 FixedComplexNDArray (Complex is, Complex ds, const ComplexNDArray& a); 98 FixedComplexNDArray (Complex is, Complex ds, const ComplexNDArray& a);
99 99
100 FixedComplexNDArray (const MArrayN<int> &is, const MArrayN<int> & ds, 100 FixedComplexNDArray (const MArray<int> &is, const MArray<int> & ds,
101 const ComplexNDArray& a); 101 const ComplexNDArray& a);
102 102
103 FixedComplexNDArray (const NDArray &is, const NDArray & ds, 103 FixedComplexNDArray (const NDArray &is, const NDArray & ds,
104 const ComplexNDArray& a); 104 const ComplexNDArray& a);
105 105
109 109
110 FixedComplexNDArray (unsigned int is, unsigned int ds, const NDArray& a); 110 FixedComplexNDArray (unsigned int is, unsigned int ds, const NDArray& a);
111 111
112 FixedComplexNDArray (Complex is, Complex ds, const NDArray& a); 112 FixedComplexNDArray (Complex is, Complex ds, const NDArray& a);
113 113
114 FixedComplexNDArray (const MArrayN<int> &is, const MArrayN<int> & ds, 114 FixedComplexNDArray (const MArray<int> &is, const MArray<int> & ds,
115 const NDArray& a); 115 const NDArray& a);
116 116
117 FixedComplexNDArray (const NDArray &is, const NDArray & ds, 117 FixedComplexNDArray (const NDArray &is, const NDArray & ds,
118 const NDArray& a); 118 const NDArray& a);
119 119
124 const ComplexNDArray &a, const ComplexNDArray &b); 124 const ComplexNDArray &a, const ComplexNDArray &b);
125 125
126 FixedComplexNDArray (Complex is, Complex ds, const ComplexNDArray &a, 126 FixedComplexNDArray (Complex is, Complex ds, const ComplexNDArray &a,
127 const ComplexNDArray &b); 127 const ComplexNDArray &b);
128 128
129 FixedComplexNDArray (const MArrayN<int> &is, const MArrayN<int> &ds, 129 FixedComplexNDArray (const MArray<int> &is, const MArray<int> &ds,
130 const ComplexNDArray &a, const ComplexNDArray &b); 130 const ComplexNDArray &a, const ComplexNDArray &b);
131 131
132 FixedComplexNDArray (const NDArray &is, const NDArray &ds, 132 FixedComplexNDArray (const NDArray &is, const NDArray &ds,
133 const ComplexNDArray &a, const ComplexNDArray &b); 133 const ComplexNDArray &a, const ComplexNDArray &b);
134 134
138 FixedComplexNDArray (const FixedNDArray& a); 138 FixedComplexNDArray (const FixedNDArray& a);
139 139
140 FixedComplexNDArray (const FixedNDArray& a, const FixedNDArray& b); 140 FixedComplexNDArray (const FixedNDArray& a, const FixedNDArray& b);
141 141
142 FixedComplexNDArray (const FixedComplexNDArray& a) 142 FixedComplexNDArray (const FixedComplexNDArray& a)
143 : MArrayN<FixedPointComplex> (a) { } 143 : MArray<FixedPointComplex> (a) { }
144 144
145 FixedComplexNDArray (const MArrayN<FixedPointComplex>& a) 145 FixedComplexNDArray (const MArray<FixedPointComplex>& a)
146 : MArrayN<FixedPointComplex> (a) { } 146 : MArray<FixedPointComplex> (a) { }
147 147
148 FixedComplexNDArray (const ArrayN<FixedPointComplex>& a) 148 FixedComplexNDArray (const Array<FixedPointComplex>& a)
149 : MArrayN<FixedPointComplex> (a) { } 149 : MArray<FixedPointComplex> (a) { }
150 150
151 ComplexNDArray sign (void) const; 151 ComplexNDArray sign (void) const;
152 ComplexNDArray getdecsize (void) const; 152 ComplexNDArray getdecsize (void) const;
153 ComplexNDArray getintsize (void) const; 153 ComplexNDArray getintsize (void) const;
154 ComplexNDArray getnumber (void) const; 154 ComplexNDArray getnumber (void) const;
164 FixedComplexNDArray incintsize (const ComplexNDArray &n); 164 FixedComplexNDArray incintsize (const ComplexNDArray &n);
165 FixedComplexNDArray incintsize (); 165 FixedComplexNDArray incintsize ();
166 166
167 FixedComplexNDArray& operator = (const FixedComplexNDArray& a) 167 FixedComplexNDArray& operator = (const FixedComplexNDArray& a)
168 { 168 {
169 MArrayN<FixedPointComplex>::operator = (a); 169 MArray<FixedPointComplex>::operator = (a);
170 return *this; 170 return *this;
171 } 171 }
172 172
173 bool operator == (const FixedComplexNDArray& a) const; 173 bool operator == (const FixedComplexNDArray& a) const;
174 bool operator != (const FixedComplexNDArray& a) const; 174 bool operator != (const FixedComplexNDArray& a) const;
192 FixedComplexNDArray prod (octave_idx_type dim = -1) const; 192 FixedComplexNDArray prod (octave_idx_type dim = -1) const;
193 FixedComplexNDArray sum (octave_idx_type dim = -1) const; 193 FixedComplexNDArray sum (octave_idx_type dim = -1) const;
194 FixedComplexNDArray sumsq (octave_idx_type dim = -1) const; 194 FixedComplexNDArray sumsq (octave_idx_type dim = -1) const;
195 195
196 FixedComplexNDArray max (octave_idx_type dim = 0) const; 196 FixedComplexNDArray max (octave_idx_type dim = 0) const;
197 FixedComplexNDArray max (ArrayN<octave_idx_type>& index, octave_idx_type dim = 0) const; 197 FixedComplexNDArray max (Array<octave_idx_type>& index, octave_idx_type dim = 0) const;
198 FixedComplexNDArray min (octave_idx_type dim = 0) const; 198 FixedComplexNDArray min (octave_idx_type dim = 0) const;
199 FixedComplexNDArray min (ArrayN<octave_idx_type>& index, octave_idx_type dim = 0) const; 199 FixedComplexNDArray min (Array<octave_idx_type>& index, octave_idx_type dim = 0) const;
200 200
201 FixedNDArray abs (void) const; 201 FixedNDArray abs (void) const;
202 202
203 FixedComplexMatrix fixed_complex_matrix_value (void) const; 203 FixedComplexMatrix fixed_complex_matrix_value (void) const;
204 204
205 FixedComplexNDArray squeeze (void) const 205 FixedComplexNDArray squeeze (void) const
206 { return ArrayN<FixedPointComplex>::squeeze (); } 206 { return Array<FixedPointComplex>::squeeze (); }
207 207
208 static void increment_index (Array<octave_idx_type>& ra_idx, 208 static void increment_index (Array<octave_idx_type>& ra_idx,
209 const dim_vector& dimensions, 209 const dim_vector& dimensions,
210 octave_idx_type start_dimension = 0); 210 octave_idx_type start_dimension = 0);
211 211
249 const FixedComplexNDArray& a); 249 const FixedComplexNDArray& a);
250 friend std::istream& operator >> (std::istream& is, FixedComplexNDArray& a); 250 friend std::istream& operator >> (std::istream& is, FixedComplexNDArray& a);
251 251
252 static FixedPointComplex resize_fill_value (void) 252 static FixedPointComplex resize_fill_value (void)
253 { return FixedPointComplex(); } 253 { return FixedPointComplex(); }
254
255 private:
256
257 FixedComplexNDArray (FixedPointComplex *d, const dim_vector& dv)
258 : MArrayN<FixedPointComplex> (d, dv) { }
259 }; 254 };
260 255
261 256
262 FixedNDArray real (const FixedComplexNDArray &x); 257 FixedNDArray real (const FixedComplexNDArray &x);
263 FixedNDArray imag (const FixedComplexNDArray &x); 258 FixedNDArray imag (const FixedComplexNDArray &x);
328 SND_BOOL_OP_DECLS (FixedPointComplex, FixedComplexNDArray, ) 323 SND_BOOL_OP_DECLS (FixedPointComplex, FixedComplexNDArray, )
329 324
330 NDND_CMP_OP_DECLS (FixedComplexNDArray, FixedComplexNDArray, ) 325 NDND_CMP_OP_DECLS (FixedComplexNDArray, FixedComplexNDArray, )
331 NDND_BOOL_OP_DECLS (FixedComplexNDArray, FixedComplexNDArray, ) 326 NDND_BOOL_OP_DECLS (FixedComplexNDArray, FixedComplexNDArray, )
332 327
333 MARRAY_FORWARD_DEFS (MArrayN, FixedComplexNDArray, FixedPointComplex) 328 MARRAY_FORWARD_DEFS (MArray, FixedComplexNDArray, FixedPointComplex)
334 329
335 #endif 330 #endif
336 331
337 /* 332 /*
338 ;;; Local Variables: *** 333 ;;; Local Variables: ***