X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Freal.h;h=ab90384c69d118c21b56c247a9f4394ddd227b2f;hp=57036713cca488cef07bcca4a833720250363295;hb=33356addacfe4296ecb613c6c4696f082e351159;hpb=a269b3e29535918a390f448829a3459e4853425b;ds=sidebyside

diff --git a/src/real.h b/src/real.h
index 5703671..ab90384 100644
--- a/src/real.h
+++ b/src/real.h
@@ -3,54 +3,57 @@
 
 #include "common.h"
 
-namespace IPDF
-{
 
-#define REAL_SINGLE
-//#define REAL_DOUBLE
-//#define REAL_HALF
+#define REAL_SINGLE 0
+#define REAL_DOUBLE 1
+#define REAL_LONG_DOUBLE 2
+#define REAL_SINGLE_FAST2SUM 3 //TODO: Remove, is FITH
+#define REAL_RATIONAL 4
+
+#ifndef REAL
+	#error "REAL was not defined!"
+#endif
+
+#if REAL >= REAL_SINGLE_FAST2SUM
+	#include "real_fast2sum.h"
+#endif //REAL
+
+#if REAL == REAL_RATIONAL
+	#include "rational.h"
+#endif //REAL
 
-#ifdef REAL_SINGLE
+namespace IPDF
+{	
+	extern const char * g_real_name[];
+
+#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
-	{
-		Real() = default;
-		Real(double r) : value(r) 
-		{
-			int & a = *((int*)(&value)); // um...
-			// mask out extra bits in exponent
-			 //1000 1111 1000 0000 0000 0011 1111 1111
-			// Endianness matters
-			a &= 0xFFC001F1; //0x8F8003FF;
-
-		}	
-	
-		Real operator+(float f) const {return Real(value+f);}
-		Real operator-(float f) const {return Real(value+f);}
-		Real operator/(float f) const {return Real(value/f);}
-		Real operator*(float f) const {return Real(value*f);}
-		Real operator+(const Real & r) const {return Real(this->value + r.value);}
-		Real operator-(const Real & r) const {return Real(this->value - r.value);}
-		Real operator*(const Real & r) const {return Real(this->value * r.value);}
-		Real operator/(const Real & r) const {return Real(this->value / r.value);}
-		Real & operator+=(const Real & r) {this->value += r.value; return *this;}
-		Real & operator-=(const Real & r) {this->value -= r.value; return *this;}
-		Real & operator/=(const Real & r) {this->value /= r.value; return *this;}
-		Real & operator*=(const Real & r) {this->value *= r.value; return *this;}
-
-		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
-
+#elif REAL == REAL_LONG_DOUBLE
+	typedef long double Real;
+#elif REAL == REAL_SINGLE_FAST2SUM
+	typedef RealF2S<float> 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();}
+#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);}
 }
 
 #endif //_REAL_H