X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Freal.h;h=8dea9533c1a2dccf43b8e46913f9a431898070af;hp=0068472c040b3b4a4b3e682af2ca9436f3957bfe;hb=a2fab335f6502b3a0a37055486620615e643ad35;hpb=c9ce50e17952b0feeec68758444a50302a0aafba

diff --git a/src/real.h b/src/real.h
index 0068472..8dea953 100644
--- a/src/real.h
+++ b/src/real.h
@@ -3,31 +3,73 @@
 
 #include "common.h"
 
+
 #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
+#define REAL_RATIONAL_ARBINT 5
 
 #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
+
+#if REAL == REAL_RATIONAL_ARBINT
+	#include "rational.h"
+	#include "arbint.h"
+#endif //REAL
+
 namespace IPDF
 {	
 	extern const char * g_real_name[];
 
 #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;
-	inline long double Float(Real r) {return r;}
+#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();}
+#elif REAL == REAL_RATIONAL_ARBINT
+	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
 
+	// 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