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

diff --git a/src/real.h b/src/real.h
index f65bb98..406cb8e 100644
--- a/src/real.h
+++ b/src/real.h
@@ -2,14 +2,33 @@
 #define _REAL_H
 
 #include "common.h"
+#include <cmath>
+
 
 #define REAL_SINGLE 0
 #define REAL_DOUBLE 1
+#define REAL_LONG_DOUBLE 2
+#define REAL_VFPU 3
+#define REAL_RATIONAL 4
+#define REAL_RATIONAL_ARBINT 5
 
 #ifndef REAL
 	#error "REAL was not defined!"
 #endif
 
+#if REAL == REAL_VFPU
+	#include "vfpu.h"
+#endif
+
+#if REAL == REAL_RATIONAL
+	#include "rational.h"
+#endif //REAL
+
+#if REAL == REAL_RATIONAL_ARBINT
+	#include "rational.h"
+	#include "arbint.h"
+	#include "gmpint.h"
+#endif //REAL
 
 namespace IPDF
 {	
@@ -17,14 +36,54 @@ namespace IPDF
 
 #if REAL == REAL_SINGLE
 	typedef float Real;
-	inline float Float(Real r) {return r;}
 #elif REAL == REAL_DOUBLE
 	typedef double Real;
-	inline double Float(Real r) {return r;}
+#elif REAL == REAL_LONG_DOUBLE
+	typedef long double 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();}
+#elif REAL == REAL_RATIONAL_ARBINT
+	#define ARBINT Gmpint // Set to Gmpint or Arbint here
+	
+	typedef Rational<ARBINT> Real;
+	inline float Float(const Real & r) {return (float)r.ToDouble();}
+	inline double Double(const Real & r) {return r.ToDouble();}
+
 #else
 	#error "Type of Real unspecified."
 #endif //REAL
 
+	// Allow us to call Float on the primative types
+	// Useful so I can template some things that could be either (a more complicated) Real or a primitive type
+	// Mostly in the testers.
+	inline float Float(float f) {return (float)f;}
+	inline float Float(double f) {return (float)f;}
+	inline float Float(long double f) {return (float)(f);}
+	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