SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

x64 fixICU fixes

Browse Source 
git-svn-id: svn://db.shs.com.ru/pip@100 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
Пелипенко Иван
2015-04-15 07:52:07 +00:00
parent 04481dd908
commit eb99c5752e
4 changed files with 9 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
main.cpp
View File

@@ -136,85 +136,6 @@ public:
//#include <netdb.h>
template<int Precision = 0, typename Type = int>
class FixedPoint {
// friend PICout operator <<(PICout s, const FixedPoint<> & v);
public:
typedef FixedPoint<Precision, Type> fp;
FixedPoint(const Type &v = Type()) {val = fpv(v);}
FixedPoint(const fp &v) {val = v.val;}
FixedPoint(const float &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << Precision-1));}
FixedPoint(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;}
fp & operator=(const fp & v) {val = v.val; return *this;}
fp & operator=(const float &v) {val = FixedPoint(v).val; return *this;}
fp & operator=(const double &v) {val = FixedPoint(v).val; return *this;}
fp & operator=(const long double &v) {val = FixedPoint(v).val; return *this;}
fp & operator-() {fp p = fp(*this); p.val = -val; return p;}
bool operator==(const fp & v) const {return val == v.val;}
bool operator!=(const fp & v) const {return val != v.val;}
void operator+=(const fp & v) {val += v.val;}
void operator-=(const fp & v) {val -= v.val;}
void operator*=(const fp & v) {val = fpi(val *v.val);}
void operator/=(const fp & v) {val = fpv(val) / v.val;}
fp operator+(const fp & v) {fp p = fp(*this); p.val += v.val; return p;}
fp operator-(const fp & v) {fp p = fp(*this); p.val -= v.val; return p;}
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 FixedPoint<Precision, Type> & v) {
s.space(); s.setControl(0, true);
if (Precision == 0) s << v.val;
else {
std::stringstream ss,sr;
Type tmp = 10;
int n = 1;
Type rs = (2 << Precision-1);
while(tmp < rs) tmp = tmp*10, n++;
tmp *= 10; n++;
Type rv = v.fpc(v.val);
if (rv != 0) tmp = tmp / (rs / rv);
ss << tmp;
PIString r = ss.str();
if (rv == 0) r.pop_front();
else r.expandLeftTo(n,'0');
sr << v.fpi(v.val);
s << PIString(sr.str()) + "." + r;
}
s.restoreControl();
return s;
}
//#include "mpint.h"
//#include "unicode/utypes.h"
//#include "unicode/stringpiece.h"