comparison liboctave/fNDArray.h @ 11586:12df7854fa7c

strip trailing whitespace from source files
author John W. Eaton <jwe@octave.org>
date Thu, 20 Jan 2011 17:24:59 -0500
parents fd0a3ac60b0e
children 15eefbd9d4e8
comparison
equal deleted inserted replaced
11585:1473d0cf86d2 11586:12df7854fa7c
43 43
44 FloatNDArray (const dim_vector& dv) : MArray<float> (dv) { } 44 FloatNDArray (const dim_vector& dv) : MArray<float> (dv) { }
45 45
46 FloatNDArray (const dim_vector& dv, float val) 46 FloatNDArray (const dim_vector& dv, float val)
47 : MArray<float> (dv, val) { } 47 : MArray<float> (dv, val) { }
48 48
49 FloatNDArray (const FloatNDArray& a) : MArray<float> (a) { } 49 FloatNDArray (const FloatNDArray& a) : MArray<float> (a) { }
50 50
51 FloatNDArray (const FloatMatrix& a) : MArray<float> (a) { } 51 FloatNDArray (const FloatMatrix& a) : MArray<float> (a) { }
52 52
53 template <class U> 53 template <class U>
57 FloatNDArray (const Array<U>& a) : MArray<float> (a) { } 57 FloatNDArray (const Array<U>& a) : MArray<float> (a) { }
58 58
59 template <class U> 59 template <class U>
60 explicit FloatNDArray (const intNDArray<U>& a) : MArray<float> (a) { } 60 explicit FloatNDArray (const intNDArray<U>& a) : MArray<float> (a) { }
61 61
62 FloatNDArray (const charNDArray&); 62 FloatNDArray (const charNDArray&);
63 63
64 FloatNDArray& operator = (const FloatNDArray& a) 64 FloatNDArray& operator = (const FloatNDArray& a)
65 { 65 {
66 MArray<float>::operator = (a); 66 MArray<float>::operator = (a);
67 return *this; 67 return *this;
87 boolNDArray any (int dim = -1) const; 87 boolNDArray any (int dim = -1) const;
88 88
89 FloatNDArray cumprod (int dim = -1) const; 89 FloatNDArray cumprod (int dim = -1) const;
90 FloatNDArray cumsum (int dim = -1) const; 90 FloatNDArray cumsum (int dim = -1) const;
91 FloatNDArray prod (int dim = -1) const; 91 FloatNDArray prod (int dim = -1) const;
92 FloatNDArray sum (int dim = -1) const; 92 FloatNDArray sum (int dim = -1) const;
93 NDArray dsum (int dim = -1) const; 93 NDArray dsum (int dim = -1) const;
94 FloatNDArray sumsq (int dim = -1) const; 94 FloatNDArray sumsq (int dim = -1) const;
95 FloatNDArray concat (const FloatNDArray& rb, const Array<octave_idx_type>& ra_idx); 95 FloatNDArray concat (const FloatNDArray& rb, const Array<octave_idx_type>& ra_idx);
96 FloatComplexNDArray concat (const FloatComplexNDArray& rb, const Array<octave_idx_type>& ra_idx); 96 FloatComplexNDArray concat (const FloatComplexNDArray& rb, const Array<octave_idx_type>& ra_idx);
97 charNDArray concat (const charNDArray& rb, const Array<octave_idx_type>& ra_idx); 97 charNDArray concat (const charNDArray& rb, const Array<octave_idx_type>& ra_idx);
98 98
99 FloatNDArray max (int dim = -1) const; 99 FloatNDArray max (int dim = -1) const;
100 FloatNDArray max (Array<octave_idx_type>& index, int dim = -1) const; 100 FloatNDArray max (Array<octave_idx_type>& index, int dim = -1) const;
101 FloatNDArray min (int dim = -1) const; 101 FloatNDArray min (int dim = -1) const;
102 FloatNDArray min (Array<octave_idx_type>& index, int dim = -1) const; 102 FloatNDArray min (Array<octave_idx_type>& index, int dim = -1) const;
103 103
104 FloatNDArray cummax (int dim = -1) const; 104 FloatNDArray cummax (int dim = -1) const;
105 FloatNDArray cummax (Array<octave_idx_type>& index, int dim = -1) const; 105 FloatNDArray cummax (Array<octave_idx_type>& index, int dim = -1) const;
106 FloatNDArray cummin (int dim = -1) const; 106 FloatNDArray cummin (int dim = -1) const;
107 FloatNDArray cummin (Array<octave_idx_type>& index, int dim = -1) const; 107 FloatNDArray cummin (Array<octave_idx_type>& index, int dim = -1) const;
108 108
148 148
149 static float resize_fill_value (void) { return 0; } 149 static float resize_fill_value (void) { return 0; }
150 150
151 FloatNDArray diag (octave_idx_type k = 0) const; 151 FloatNDArray diag (octave_idx_type k = 0) const;
152 152
153 FloatNDArray& changesign (void) 153 FloatNDArray& changesign (void)
154 { 154 {
155 MArray<float>::changesign (); 155 MArray<float>::changesign ();
156 return *this; 156 return *this;
157 } 157 }
158 158
159 }; 159 };
160 160
161 // Publish externally used friend functions. 161 // Publish externally used friend functions.
178 178
179 BSXFUN_STDOP_DECLS (FloatNDArray, OCTAVE_API) 179 BSXFUN_STDOP_DECLS (FloatNDArray, OCTAVE_API)
180 BSXFUN_STDREL_DECLS (FloatNDArray, OCTAVE_API) 180 BSXFUN_STDREL_DECLS (FloatNDArray, OCTAVE_API)
181 181
182 BSXFUN_OP_DECL (pow, FloatNDArray, OCTAVE_API) 182 BSXFUN_OP_DECL (pow, FloatNDArray, OCTAVE_API)
183 BSXFUN_OP2_DECL (pow, FloatComplexNDArray, FloatComplexNDArray, 183 BSXFUN_OP2_DECL (pow, FloatComplexNDArray, FloatComplexNDArray,
184 FloatNDArray, OCTAVE_API) 184 FloatNDArray, OCTAVE_API)
185 185
186 #endif 186 #endif