X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Freal.h;h=917f3e0ca9bd7bd91e5dc053972bbc1021e2dcd3;hp=798ea0bd0f1350b22936bf3edc28bbbf0b17aff7;hb=64b7c42c71c35d520424cf4ca5ecaa99faef8b26;hpb=85e08223a33439f9b4911129b48ee45ff65869eb

diff --git a/src/real.h b/src/real.h
index 798ea0b..917f3e0 100644
--- a/src/real.h
+++ b/src/real.h
@@ -2,77 +2,211 @@
 #define _REAL_H
 
 #include "common.h"
+#include <cmath>
 
 
 #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
+#define REAL_MPFRCPP 6
+#define REAL_IRRAM 7
+#define REAL_PARANOIDNUMBER 8
+#define REAL_GMPRAT 9
 
-#ifndef REAL
-	#error "REAL was not defined!"
+#ifndef REALTYPE
+	#error "REALTYPE was not defined!"
 #endif
 
-#if REAL >= REAL_SINGLE_FAST2SUM
-	#include "real_fast2sum.h"
-#endif //REAL
+#define XSTR(x) STR(x)
+#define STR(x) #x
+//#pragma message "REALTYPE = " XSTR(REALTYPE)
 
-#if REAL == REAL_RATIONAL
+#if REALTYPE == REAL_VFPU
+	#include "vfpu.h"
+#endif
+
+#if REALTYPE == REAL_RATIONAL
 	#include "rational.h"
-#endif //REAL
+#endif //REALTYPE
 
-#if REAL == REAL_RATIONAL_ARBINT
+#if REALTYPE == REAL_RATIONAL_ARBINT
 	#include "rational.h"
 	#include "arbint.h"
 	#include "gmpint.h"
-#endif //REAL
+#endif //REALTYPE
+
+#if REALTYPE == REAL_MPFRCPP
+	#include <mpreal.h>
+#endif //REALTYPE
+
+#if REALTYPE == REAL_IRRAM
+	#include "../contrib/iRRAM/include/iRRAM/lib.h"
+#endif
+
+#if REALTYPE == REAL_PARANOIDNUMBER
+	#include "paranoidnumber.h"
+#endif
+
+#if REALTYPE == REAL_GMPRAT
+	#include "gmprat.h"
+#endif 
 
 namespace IPDF
 {	
 	extern const char * g_real_name[];
 
-#if REAL == REAL_SINGLE
+#if REALTYPE == REAL_SINGLE
 	typedef float Real;
-#elif REAL == REAL_DOUBLE
+	inline Real RealFromStr(const char * str) {return strtof(str, NULL);}
+	inline std::string Str(const Real & a) {std::stringstream s; s << a; return s.str();}
+#elif REALTYPE == REAL_DOUBLE
 	typedef double Real;
-#elif REAL == REAL_LONG_DOUBLE
+	inline Real RealFromStr(const char * str) {return strtod(str, NULL);}
+	inline std::string Str(const Real & a) {std::stringstream s; s << a; return s.str();}
+#elif REALTYPE == REAL_LONG_DOUBLE
 	typedef long double Real;
-#elif REAL == REAL_SINGLE_FAST2SUM
-	typedef RealF2S<float> Real;
+	inline Real RealFromStr(const char * str) {return strtold(str, NULL);}
+	inline std::string Str(const Real & a) {std::stringstream s; s << a; return s.str();}
+#elif REALTYPE == 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
-	
+	inline Real RealFromStr(const char * str) {return Real(strtod(str, NULL));}
+#elif REALTYPE == 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
+	inline Real RealFromStr(const char * str) {return Real(strtod(str, NULL));}
+#elif REALTYPE == REAL_RATIONAL_ARBINT
+	#define ARBINT Arbint // 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);
-	}
+	inline int64_t Int64(const Real & r) {return r.ToInt64();}
+	inline Rational<ARBINT> Sqrt(const Rational<ARBINT> & r) {return r.Sqrt();}
+	inline Real RealFromStr(const char * str) {return Real(strtod(str, NULL));}
+#elif REALTYPE == REAL_MPFRCPP
+	typedef mpfr::mpreal Real;
+	inline double Double(const Real & r) {return r.toDouble();}
+	inline float Float(const Real & r) {return r.toDouble();}
+	inline int64_t Int64(const Real & r) {return r.toLong();}
+	inline Real Sqrt(const Real & r) {return mpfr::sqrt(r, mpfr::mpreal::get_default_rnd());}
+	inline Real Abs(const Real & r) {return mpfr::abs(r, mpfr::mpreal::get_default_rnd());}
+	inline Real RealFromStr(const char * str) {return Real(strtod(str, NULL));}
+#elif REALTYPE == REAL_IRRAM
+	typedef iRRAM::REAL Real;
+	inline double Double(const Real & r) {return r.as_double(53);}
+	inline float Float(const Real & r) {return r.as_double(53);}
+	inline int64_t Int64(const Real & r) {return (int64_t)r.as_double(53);}
+	inline Real Sqrt(const Real & r) {return iRRAM::sqrt(r);}
+	inline Real RealFromStr(const char * str) {return Real(strtod(str, NULL));}
+#elif REALTYPE == REAL_PARANOIDNUMBER
+	typedef ParanoidNumber Real;
+	inline double Double(const Real & r) {return r.Digit();}
+	inline float Float(const Real & r) {return r.Digit();}
+	inline int64_t Int64(const Real & r) {return (int64_t)r.Digit();}
+	inline Real Sqrt(const Real & r) {return Real(sqrt(r.Digit()));}
+	inline Real RealFromStr(const char * str) {return Real(str);}	
+	inline Real Abs(const Real & a) {return Real(fabs(a.Digit()));}
+#elif REALTYPE == REAL_GMPRAT
+	typedef Gmprat Real;
+	inline double Double(const Real & r) {return r.ToDouble();}
+	inline float Float(const Real & r) {return (float)(r.ToDouble());}
+	inline int64_t Int64(const Real & r) {return (int64_t)r.ToDouble();}
+	inline Real Sqrt(const Real & r) {return Real(sqrt(r.ToDouble()));}
+	inline Real RealFromStr(const char * str) {return Real(strtod(str, NULL));}
+	inline Real Abs(const Real & a) {return (a > Real(0)) ? a : Real(0)-a;}
+	inline std::string Str(const Real & a) {return a.Str();}
+	
 #else
 	#error "Type of Real unspecified."
-#endif //REAL
+#endif //REALTYPE
 
 	// 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 double Abs(double a) {return fabs(a);}
+	inline double Log10(double a) {return log(a)/log(10.0);}
+	inline size_t Size(double a) {return sizeof(a);}
+	inline size_t Size(float a) {return sizeof(a);}
+	
+
+	inline int64_t Int64(double a)
+	{
+		if (a < INT64_MIN)
+			return INT64_MIN;
+		if (a > INT64_MAX)
+			return INT64_MAX;
+		return (int64_t)(a);
+	}
+	
+	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;
+	}
+	struct Vec2
+	{
+		Real x;
+		Real y;
+		Vec2() : x(0.0), y(0.0) {}
+		Vec2(Real _x, Real _y) : x(_x), y(_y) {}
+		Vec2(const std::pair<Real, Real> & p) : x(p.first), y(p.second) {}
+		#if REALTYPE != REAL_IRRAM
+		Vec2(const std::pair<int64_t, int64_t> & p) : x(p.first), y(p.second) {}
+		#else
+		Vec2(const std::pair<int64_t, int64_t> & p) : x((int)p.first), y((int)p.second) {}
+		// Apparently iRRAM didn't implement -= for a constant argument
+		#endif
+		bool operator==(const Vec2& other) const { return (x == other.x) && (y == other.y); }
+		bool operator!=(const Vec2& other) const { return !(*this == other); }
+		
+		Vec2& operator=(const Vec2& other) { x = other.x; y = other.y; return *this; }
+		Vec2& operator+=(const Vec2& other) { x += other.x; y += other.y; return *this; }
+		Vec2& operator-=(const Vec2& other) { x -= other.x; y -= other.y; return *this; }
+		Vec2& operator*=(const Real& lambda) { x *= lambda; y *= lambda; return *this; }
+		Vec2& operator/=(const Real& lambda) { x /= lambda; y /= lambda; return *this; }
+
+		Vec2 operator+(const Vec2& other) const { return Vec2(x + other.x, y + other.y); }
+		Vec2 operator-(const Vec2& other) const { return Vec2(x - other.x, y - other.y); }
+		Vec2 operator*(const Real& lambda) const { return Vec2(x * lambda, y * lambda); }
+		Vec2 operator/(const Real& lambda) const { return Vec2(x / lambda, y / lambda); }
+
+		const Real SquareLength() const { return (x*x + y*y); }
+	
+	};
+
+	//TODO: Make sure there is actually a RealFromStr(const char * str) function
+	// 		Or this will recurse infinitely
+	//		(If you remove this it will also break).
+	inline Real RealFromStr(const std::string & str) {return RealFromStr(str.c_str());}
+
+
+	inline void DebugRealInfo() 
+	{
+		Debug("Compiled with REAL = %d => \"%s\" sizeof(Real) == %d bytes", REALTYPE, g_real_name[REALTYPE], sizeof(Real));
+		#if REALTYPE == REAL_PARANOIDNUMBER
+			#ifdef PARANOID_SIZE_LIMIT
+				Debug("Size limit of %d is being enforced", PARANOID_SIZE_LIMIT);
+			#endif
+		#endif
+	}
 }
 
 #endif //_REAL_H