add diag to basetransfer

fix pibinarylog delay

git-svn-id: svn://db.shs.com.ru/pip@63 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

main.cpp

@@ -133,9 +133,119 @@ public:
 	void print() {piCout << "Child"; Parent::print();}
 };
 	
+
 //#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 {val == v.val;}
+	bool operator!=(const fp & v) const {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"
 int main (int argc, char * argv[]) {
-	piCout << PIDir::allEntries(argv[1]);
+	FixedPoint<16, long long> a, b;
+	a = 10;
+	b = 3;
+	piCout << a << b << a/b;
+	FixedPoint<7,ushort> c = 507.03;
+	piCout << c;
+//	gmp::mpint m1("1003456789098765432334567890743278908743789087345678909876543213456789098765422"),
+//			m2("523456789085039345678909856787656787654383071478723617832987864856248765784547826784659267894659782645824317172186776677");
+//	FixedPoint<1, gmp::mpint> mf1(m1);
+//	PITimeMeasurer tm3;
+//	for (int i=0; i< 1000; i++)
+//		m1 = m1*m2;//gmp::mpint(1);
+////	m1 = m1 >> 64;
+//	piCout << tm3.elapsed_m();
+//	tm3.reset();
+//	piCout << m1;
+//	piCout << tm3.elapsed_m();
+	//m1++;
+	complex<FixedPoint<8,int> > ccc;
+	piCout << ccc;
+	return 0;
+
+	FixedPoint<4> x,y,z;
+	y = 20;
+	z = 0.01;
+	x = z*y;
+	piCout << x;
+	piCout << y;
+	piCout << z;
 	return 0;
 	/*
 	hostent * he = 0;