X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Freal.h;h=9ea302dbc8ef83f7a8d4fce6d0aad55aeaa8a9c0;hp=f65bb98e2962ceb24114c9e2e8eed523f9c6bf9d;hb=888817a67a9d840be66b52811b01eb77f10ff3e6;hpb=e164c93218ed4599614f4f6e5e815429a3fedbf7

diff --git a/src/real.h b/src/real.h
index f65bb98..9ea302d 100644
--- a/src/real.h
+++ b/src/real.h
@@ -2,28 +2,143 @@
 #define _REAL_H
 
 #include "common.h"
+#include <cmath>
+
 
 #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
+#define REAL_MPFRCPP 6
+#define REAL_IRRAM 7
+
+#ifndef REALTYPE
+	#error "REALTYPE was not defined!"
+#endif
 
-#ifndef REAL
-	#error "REAL was not defined!"
+#if REALTYPE == REAL_VFPU
+	#include "vfpu.h"
 #endif
 
+#if REALTYPE == REAL_RATIONAL
+	#include "rational.h"
+#endif //REALTYPE
+
+#if REALTYPE == REAL_RATIONAL_ARBINT
+	#include "rational.h"
+	#include "arbint.h"
+	#include "gmpint.h"
+#endif //REALTYPE
+
+#if REALTYPE == REAL_MPFRCPP
+	#include <mpreal.h>
+#endif //REALTYPE
+
+#if REALTYPE == REAL_IRRAM
+	#include "../contrib/iRRAM/include/iRRAM/lib.h"
+#endif
 
 namespace IPDF
 {	
 	extern const char * g_real_name[];
 
-#if REAL == REAL_SINGLE
+#if REALTYPE == REAL_SINGLE
 	typedef float Real;
-	inline float Float(Real r) {return r;}
-#elif REAL == REAL_DOUBLE
+#elif REALTYPE == REAL_DOUBLE
 	typedef double Real;
-	inline double Float(Real r) {return r;}
+#elif REALTYPE == REAL_LONG_DOUBLE
+	typedef long double Real;
+#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 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 REALTYPE == 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 int64_t Int64(const Real & r) {return r.ToInt64();}
+	inline Rational<ARBINT> Sqrt(const Rational<ARBINT> & r) {return r.Sqrt();}
+#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());}
+#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);}
 #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(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 int64_t Int64(double a){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), y(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); }
+	
+	};
+
+
+
 
 }