X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Freal.h;h=406cb8e730cb018abbd686c6bd77c3b79b3d7f3e;hp=4b2db1ce0259a47590420ebf172fadac52bde3b6;hb=2a1715c907ba3ccfb952e9630c3fe305655637e0;hpb=29f315953466e71fc76b1b05c79c1231e5c83074

diff --git a/src/real.h b/src/real.h
index 4b2db1c..406cb8e 100644
--- a/src/real.h
+++ b/src/real.h
@@ -2,6 +2,7 @@
 #define _REAL_H
 
 #include "common.h"
+#include <cmath>
 
 
 #define REAL_SINGLE 0
@@ -40,11 +41,10 @@ namespace IPDF
 #elif REAL == REAL_LONG_DOUBLE
 	typedef long double Real;
 #elif REAL == REAL_VFPU
-	typedef VFPU::Float Real;
+	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