Mercurial > forge
diff main/fixed/src/fixedColVector.h @ 9481:d84d2fea3c90 octave-forge
Re-enable compilation of fixed package
author | jordigh |
---|---|
date | Wed, 22 Feb 2012 22:07:33 +0000 |
parents | f8d77845533f |
children | 7b7cd174847c |
line wrap: on
line diff
--- a/main/fixed/src/fixedColVector.h Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/fixedColVector.h Wed Feb 22 22:07:33 2012 +0000 @@ -50,7 +50,8 @@ FixedColumnVector (void) : MArray<FixedPoint> () { } - explicit FixedColumnVector (int n) : MArray<FixedPoint> (n) { } + explicit FixedColumnVector (int n) + : MArray<FixedPoint> (dim_vector (n, 1)) { } FixedColumnVector (const MArray<int> &is, const MArray<int> &ds); @@ -82,7 +83,8 @@ FixedColumnVector (const ColumnVector &is, const ColumnVector &ds, const ColumnVector& a, const ColumnVector& b); - FixedColumnVector (int n, FixedPoint val) : MArray<FixedPoint> (n, val) { } + FixedColumnVector (int n, FixedPoint val) + : MArray<FixedPoint> (dim_vector (n,1), val) { } FixedColumnVector (const FixedColumnVector& a) : MArray<FixedPoint> (a) { } @@ -140,7 +142,8 @@ FixedPoint min (void) const; FixedPoint max (void) const; - friend FixedColumnVector operator * (const FixedMatrix& a, const FixedColumnVector& b); + friend FixedColumnVector operator * (const FixedMatrix& a, + const FixedColumnVector& b); friend FixedColumnVector real (const FixedColumnVector &x); friend FixedColumnVector imag (const FixedColumnVector &x); @@ -174,15 +177,21 @@ // i/o - friend std::ostream& operator << (std::ostream& os, const FixedColumnVector& a); - friend std::istream& operator >> (std::istream& is, FixedColumnVector& a); + friend std::ostream& operator << (std::ostream& os, + const FixedColumnVector& a); + friend std::istream& operator >> (std::istream& is, + FixedColumnVector& a); -private: + void resize (octave_idx_type n, + const FixedPoint& rfv = Array<FixedPoint>::resize_fill_value ()) + { + Array<FixedPoint>::resize (dim_vector (n, 1), rfv); + } - FixedColumnVector (FixedPoint *d, int l) : MArray<FixedPoint> (d, l) { } }; -FixedColumnVector operator * (const FixedMatrix& a, const FixedColumnVector& b); +FixedColumnVector operator * (const FixedMatrix& a, + const FixedColumnVector& b); FixedColumnVector real (const FixedColumnVector &x); FixedColumnVector imag (const FixedColumnVector &x);