X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Freal.h;h=406cb8e730cb018abbd686c6bd77c3b79b3d7f3e;hp=798ea0bd0f1350b22936bf3edc28bbbf0b17aff7;hb=398e6b2732decd57cdb57deb3f91d3ff08669e8b;hpb=e8e6ff92ef0978cbec24dd69a85dbf1bd81681ad

diff --git a/src/real.h b/src/real.h
index 798ea0b..406cb8e 100644
--- a/src/real.h
+++ b/src/real.h
@@ -2,12 +2,13 @@
 #define _REAL_H
 
 #include "common.h"
+#include <cmath>
 
 
 #define REAL_SINGLE 0
 #define REAL_DOUBLE 1
 #define REAL_LONG_DOUBLE 2
-#define REAL_SINGLE_FAST2SUM 3 //TODO: Remove, is FITH
+#define REAL_VFPU 3
 #define REAL_RATIONAL 4
 #define REAL_RATIONAL_ARBINT 5
 
@@ -15,9 +16,9 @@
 	#error "REAL was not defined!"
 #endif
 
-#if REAL >= REAL_SINGLE_FAST2SUM
-	#include "real_fast2sum.h"
-#endif //REAL
+#if REAL == REAL_VFPU
+	#include "vfpu.h"
+#endif
 
 #if REAL == REAL_RATIONAL
 	#include "rational.h"
@@ -39,12 +40,11 @@ namespace IPDF
 	typedef double Real;
 #elif REAL == REAL_LONG_DOUBLE
 	typedef long double Real;
-#elif REAL == REAL_SINGLE_FAST2SUM
-	typedef RealF2S<float> Real;
+#elif REAL == REAL_VFPU
+	typedef VFPU::VFloat Real;
 	inline float Float(const Real & r) {return r.m_value;}
 	inline double Double(const Real & r) {return r.m_value;}
 #elif REAL == REAL_RATIONAL
-	
 	typedef Rational<int64_t> Real;
 	inline float Float(const Real & r) {return (float)r.ToDouble();}
 	inline double Double(const Real & r) {return r.ToDouble();}
@@ -54,12 +54,7 @@ namespace IPDF
 	typedef Rational<ARBINT> Real;
 	inline float Float(const Real & r) {return (float)r.ToDouble();}
 	inline double Double(const Real & r) {return r.ToDouble();}
-	inline Rational<ARBINT> pow(const Rational<ARBINT> & a, const Rational<ARBINT> & b)
-	{
-		ARBINT P(std::pow(static_cast<double>(a.P), b.ToDouble()));
-		ARBINT Q(std::pow(static_cast<double>(a.Q), b.ToDouble()));
-		return Rational<ARBINT>(P,Q);
-	}
+
 #else
 	#error "Type of Real unspecified."
 #endif //REAL
@@ -73,6 +68,22 @@ namespace IPDF
 	inline double Double(float f) {return (double)f;}
 	inline double Double(double f) {return (double)f;}
 	inline double Double(long double f) {return (double)(f);}
+	inline double Sqrt(double f) {return sqrt(f);}
+	
+	inline Real Power(const Real & a, int n)
+	{
+		if (n < 0)
+		{
+			return Power(Real(1)/a, -n);
+		}
+		Real r(1);
+		for (int i = 0; i < n; ++i)
+			r *= a;
+		return r;
+	}
+	
+	
+
 }
 
 #endif //_REAL_H