X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Freal.h;h=406cb8e730cb018abbd686c6bd77c3b79b3d7f3e;hp=7b30949bcde0e79b90991cf5995460919232430e;hb=6dd539966821debd18e0b86ed126742cd81d7fc9;hpb=95dd47f77239fd252e0292dca21baac29513bc7b

diff --git a/src/real.h b/src/real.h
index 7b30949..406cb8e 100644
--- a/src/real.h
+++ b/src/real.h
@@ -2,49 +2,87 @@
 #define _REAL_H
 
 #include "common.h"
+#include <cmath>
 
-namespace IPDF
-{
 
-//#define REAL_FLOAT
-//#define REAL_DOUBLE
-#define REAL_HALF
+#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
+{	
+	extern const char * g_real_name[];
 
-#ifdef REAL_SINGLE
+#if REAL == REAL_SINGLE
 	typedef float Real;
-	inline float Float(Real r) {return r;}
-#elif defined REAL_DOUBLE
+#elif REAL == REAL_DOUBLE
 	typedef double Real;
-	inline double Float(Real r) {return r;}
-#elif defined REAL_HALF
-	struct Real
+#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)
 	{
-		Real() = default;
-		Real(float r) : value(r) 
+		if (n < 0)
 		{
-			int & a = *((int*)(&value)); // um...
-			// mask out extra bits in exponent
-			 //1000 1111 1000 0000 0000 0011 1111 1111
-			// Endianness matters
-			a &= 0xFFC001F1; //0x8F8003FF;
-
-		}	
+			return Power(Real(1)/a, -n);
+		}
+		Real r(1);
+		for (int i = 0; i < n; ++i)
+			r *= a;
+		return r;
+	}
+	
 	
-		Real operator+(float f) {return Real(value+f);}
-		Real operator-(float f) {return Real(value+f);}
-		Real operator/(float f) {return Real(value/f);}
-		Real operator*(float f) {return Real(value*f);}
-		Real operator+(const Real & r) {return this->operator+(r.value);}
-		Real operator-(const Real & r) {return this->operator-(r.value);}
-		Real operator*(const Real & r) {return this->operator*(r.value);}
-		Real operator/(const Real & r) {return this->operator/(r.value);}
-		float value;
-	};
-	inline float Float(Real r) {return r.value;}
-
-	inline std::ostream & operator<<(std::ostream & os, Real & r) {return os << r.value;} // yuk
-
-#endif //REAL_HALF
 
 }