Mercurial > forge

comparison main/fixed/src/fixedNDArray.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_FixedNDArray_h) 26 #if !defined (octave_FixedNDArray_h)
27 #define octave_FixedNDArray_h 1 27 #define octave_FixedNDArray_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 #include <octave/dNDArray.h> 31 #include <octave/dNDArray.h>
32 #include <octave/boolNDArray.h> 32 #include <octave/boolNDArray.h>
33 33
34 #include <octave/mx-defs.h> 34 #include <octave/mx-defs.h>
41 #include "fixedMatrix.h" 41 #include "fixedMatrix.h"
42 42
43 class FixedComplexNDArray; 43 class FixedComplexNDArray;
44 44
45 class 45 class
46 FixedNDArray : public MArrayN<FixedPoint> 46 FixedNDArray : public MArray<FixedPoint>
47 { 47 {
48 public: 48 public:
49 FixedNDArray (void) : MArrayN<FixedPoint> () { } 49 FixedNDArray (void) : MArray<FixedPoint> () { }
50 50
51 FixedNDArray (const dim_vector& dv) : MArrayN<FixedPoint> (dv) { } 51 FixedNDArray (const dim_vector& dv) : MArray<FixedPoint> (dv) { }
52 52
53 FixedNDArray (const dim_vector& dv, const FixedPoint val) 53 FixedNDArray (const dim_vector& dv, const FixedPoint val)
54 : MArrayN<FixedPoint> (dv, val) { } 54 : MArray<FixedPoint> (dv, val) { }
55 55
56 FixedNDArray (const MArrayN<int> &is, const MArrayN<int> &ds); 56 FixedNDArray (const MArray<int> &is, const MArray<int> &ds);
57 57
58 FixedNDArray (const NDArray &is, const NDArray &ds); 58 FixedNDArray (const NDArray &is, const NDArray &ds);
59 59
60 FixedNDArray (unsigned int is, unsigned int ds, const FixedNDArray& a); 60 FixedNDArray (unsigned int is, unsigned int ds, const FixedNDArray& a);
61 61
62 FixedNDArray (const MArrayN<int> &is, const MArrayN<int> &ds, 62 FixedNDArray (const MArray<int> &is, const MArray<int> &ds,
63 const FixedNDArray& a); 63 const FixedNDArray& a);
64 64
65 FixedNDArray (const NDArray &is, const NDArray &ds, const FixedNDArray& a); 65 FixedNDArray (const NDArray &is, const NDArray &ds, const FixedNDArray& a);
66 66
67 FixedNDArray (unsigned int is, unsigned int ds, const NDArray& a); 67 FixedNDArray (unsigned int is, unsigned int ds, const NDArray& a);
68 68
69 FixedNDArray (const MArrayN<int> &is, const MArrayN<int> &ds, 69 FixedNDArray (const MArray<int> &is, const MArray<int> &ds,
70 const NDArray& a); 70 const NDArray& a);
71 71
72 FixedNDArray (const NDArray &is, const NDArray &ds, const NDArray& a); 72 FixedNDArray (const NDArray &is, const NDArray &ds, const NDArray& a);
73 73
74 FixedNDArray (unsigned int is, unsigned int ds, const NDArray& a, 74 FixedNDArray (unsigned int is, unsigned int ds, const NDArray& a,
75 const NDArray& b); 75 const NDArray& b);
76 76
77 FixedNDArray (const MArrayN<int> &is, const MArrayN<int> &ds, 77 FixedNDArray (const MArray<int> &is, const MArray<int> &ds,
78 const NDArray& a, const NDArray& b); 78 const NDArray& a, const NDArray& b);
79 79
80 FixedNDArray (const NDArray &is, const NDArray &ds, const NDArray& a, 80 FixedNDArray (const NDArray &is, const NDArray &ds, const NDArray& a,
81 const NDArray& b); 81 const NDArray& b);
82 82
83 FixedNDArray (const MArrayN<int> &a); 83 FixedNDArray (const MArray<int> &a);
84 84
85 FixedNDArray (const NDArray &a); 85 FixedNDArray (const NDArray &a);
86 86
87 FixedNDArray (const FixedNDArray& a) : MArrayN<FixedPoint> (a) { } 87 FixedNDArray (const FixedNDArray& a) : MArray<FixedPoint> (a) { }
88 FixedNDArray (const MArrayN<FixedPoint>& a) : MArrayN<FixedPoint> (a) { } 88 FixedNDArray (const MArray<FixedPoint>& a) : MArray<FixedPoint> (a) { }
89 FixedNDArray (const ArrayN<FixedPoint>& a) : MArrayN<FixedPoint> (a) { } 89 FixedNDArray (const Array<FixedPoint>& a) : MArray<FixedPoint> (a) { }
90 90
91 NDArray sign (void) const; 91 NDArray sign (void) const;
92 NDArray signbit (void) const; 92 NDArray signbit (void) const;
93 NDArray getdecsize (void) const; 93 NDArray getdecsize (void) const;
94 NDArray getintsize (void) const; 94 NDArray getintsize (void) const;
105 FixedNDArray incintsize (const NDArray &n); 105 FixedNDArray incintsize (const NDArray &n);
106 FixedNDArray incintsize (); 106 FixedNDArray incintsize ();
107 107
108 FixedNDArray& operator = (const FixedNDArray& a) 108 FixedNDArray& operator = (const FixedNDArray& a)
109 { 109 {
110 MArrayN<FixedPoint>::operator = (a); 110 MArray<FixedPoint>::operator = (a);
111 return *this; 111 return *this;
112 } 112 }
113 113
114 bool operator == (const FixedNDArray& a) const; 114 bool operator == (const FixedNDArray& a) const;
115 bool operator != (const FixedNDArray& a) const; 115 bool operator != (const FixedNDArray& a) const;
130 FixedNDArray prod (octave_idx_type dim = -1) const; 130 FixedNDArray prod (octave_idx_type dim = -1) const;
131 FixedNDArray sum (octave_idx_type dim = -1) const; 131 FixedNDArray sum (octave_idx_type dim = -1) const;
132 FixedNDArray sumsq (octave_idx_type dim = -1) const; 132 FixedNDArray sumsq (octave_idx_type dim = -1) const;
133 133
134 FixedNDArray max (octave_idx_type dim = 0) const; 134 FixedNDArray max (octave_idx_type dim = 0) const;
135 FixedNDArray max (ArrayN<octave_idx_type>& index, octave_idx_type dim = 0) const; 135 FixedNDArray max (Array<octave_idx_type>& index, octave_idx_type dim = 0) const;
136 FixedNDArray min (octave_idx_type dim = 0) const; 136 FixedNDArray min (octave_idx_type dim = 0) const;
137 FixedNDArray min (ArrayN<octave_idx_type>& index, octave_idx_type dim = 0) const; 137 FixedNDArray min (Array<octave_idx_type>& index, octave_idx_type dim = 0) const;
138 138
139 FixedNDArray abs (void) const; 139 FixedNDArray abs (void) const;
140 140
141 FixedMatrix fixed_matrix_value (void) const; 141 FixedMatrix fixed_matrix_value (void) const;
142 142
143 FixedNDArray squeeze (void) const { return ArrayN<FixedPoint>::squeeze (); } 143 FixedNDArray squeeze (void) const { return Array<FixedPoint>::squeeze (); }
144 144
145 static void increment_index (Array<octave_idx_type>& ra_idx, 145 static void increment_index (Array<octave_idx_type>& ra_idx,
146 const dim_vector& dimensions, 146 const dim_vector& dimensions,
147 octave_idx_type start_dimension = 0); 147 octave_idx_type start_dimension = 0);
148 148
184 184
185 friend std::ostream& operator << (std::ostream& os, const FixedNDArray& a); 185 friend std::ostream& operator << (std::ostream& os, const FixedNDArray& a);
186 friend std::istream& operator >> (std::istream& is, FixedNDArray& a); 186 friend std::istream& operator >> (std::istream& is, FixedNDArray& a);
187 187
188 static FixedPoint resize_fill_value (void) { return FixedPoint(); } 188 static FixedPoint resize_fill_value (void) { return FixedPoint(); }
189
190 private:
191
192 FixedNDArray (FixedPoint *d, const dim_vector& dv) : MArrayN<FixedPoint> (d, dv) { }
193
194 }; 189 };
195 190
196 // FixedNDArray abs (const FixedNDArray &x); 191 // FixedNDArray abs (const FixedNDArray &x);
197 FixedNDArray cos (const FixedNDArray &x); 192 FixedNDArray cos (const FixedNDArray &x);
198 FixedNDArray cosh (const FixedNDArray &x); 193 FixedNDArray cosh (const FixedNDArray &x);
246 SND_BOOL_OP_DECLS (FixedPoint, FixedNDArray, ) 241 SND_BOOL_OP_DECLS (FixedPoint, FixedNDArray, )
247 242
248 NDND_CMP_OP_DECLS (FixedNDArray, FixedNDArray, ) 243 NDND_CMP_OP_DECLS (FixedNDArray, FixedNDArray, )
249 NDND_BOOL_OP_DECLS (FixedNDArray, FixedNDArray, ) 244 NDND_BOOL_OP_DECLS (FixedNDArray, FixedNDArray, )
250 245
251 MARRAY_FORWARD_DEFS (MArrayN, FixedNDArray, FixedPoint) 246 MARRAY_FORWARD_DEFS (MArray, FixedNDArray, FixedPoint)
252 247
253 #endif 248 #endif
254 249
255 /* 250 /*
256 ;;; Local Variables: *** 251 ;;; Local Variables: ***