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

diff --git a/src/real.h b/src/real.h
index ab90384..4b2db1c 100644
--- a/src/real.h
+++ b/src/real.h
@@ -7,21 +7,28 @@
 #define REAL_SINGLE 0
 #define REAL_DOUBLE 1
 #define REAL_LONG_DOUBLE 2
-#define REAL_SINGLE_FAST2SUM 3 //TODO: Remove, is FITH
+#define REAL_VFPU 3
 #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_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[];
@@ -32,15 +39,27 @@ namespace IPDF
 	typedef double Real;
 #elif REAL == REAL_LONG_DOUBLE
 	typedef long double Real;
-#elif REAL == REAL_SINGLE_FAST2SUM
-	typedef RealF2S<float> Real;
+#elif REAL == REAL_VFPU
+	typedef VFPU::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
+	#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();}
+	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