BIG deep clean
This commit is contained in:
@@ -27,14 +27,12 @@
|
||||
|
||||
template<int Precision = 0, typename Type = int>
|
||||
class PIP_EXPORT PIFixedPoint {
|
||||
// friend PICout operator <<(PICout s, const FixedPoint<> & v);
|
||||
public:
|
||||
typedef PIFixedPoint<Precision, Type> fp;
|
||||
PIFixedPoint(const Type &v = Type()) {val = fpv(v);}
|
||||
PIFixedPoint(const fp &v) {val = v.val;}
|
||||
PIFixedPoint(const float &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << (Precision-1)));}
|
||||
PIFixedPoint(const double &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << (Precision-1)));}
|
||||
// FixedPoint(const long double &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << Precision-1));}
|
||||
|
||||
template<typename T>
|
||||
fp & operator =(const T & v) {val = fpv(Type(v)); return *this;}
|
||||
@@ -58,25 +56,13 @@ public:
|
||||
fp operator *(const fp & v) {fp p; p.val = fpi(val * v.val); return p;}
|
||||
fp operator /(const fp & v) {fp p; p.val = fpv(val) / v.val; return p;}
|
||||
|
||||
/*fp & operator =(const Type & v) {val = fpv(v); return *this;}
|
||||
bool operator ==(const Type & v) const {val == fpv(v);}
|
||||
bool operator !=(const Type & v) const {val != fpv(v);}
|
||||
void operator +=(const Type & v) {val += fpv(v);}
|
||||
void operator -=(const Type & v) {val -= fpv(v);}
|
||||
void operator *=(const Type & v) {val *= fpv(v);}
|
||||
void operator /=(const Type & v) {val /= fpv(v);}
|
||||
fp operator +(const Type & v) {fp p = fp(*this); p.val += fpv(v); return p;}
|
||||
fp operator -(const Type & v) {fp p = fp(*this); p.val -= fpv(v); return p;}
|
||||
fp operator *(const Type & v) {fp p = fp(*this); p.val *= fpv(v); return p;}
|
||||
fp operator /(const Type & v) {fp p = fp(*this); p.val /= fpv(v); return p;}*/
|
||||
|
||||
Type fpv(Type v) const {return Type(v << Precision);}
|
||||
Type fpi(Type v) const {return Type(v >> Precision);}
|
||||
Type fpc(Type v) const {return v - fpv(fpi(v));}
|
||||
Type val;
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
template<int Precision, typename Type>
|
||||
inline PICout operator <<(PICout s, const PIFixedPoint<Precision, Type> & v) {
|
||||
s.space(); s.setControl(0, true);
|
||||
@@ -100,5 +86,5 @@ inline PICout operator <<(PICout s, const PIFixedPoint<Precision, Type> & v) {
|
||||
s.restoreControl();
|
||||
return s;
|
||||
}
|
||||
*/
|
||||
|
||||
#endif // PIFIXEDPOINT_H
|
||||
|
||||
Reference in New Issue
Block a user