Because merging is going to be fun.

[ipdf/code.git] / src / real.h

diff --git a/src/real.h b/src/real.h
index 2be3fdd..b107649 100644 (file)
--- a/src/real.h
+++ b/src/real.h
@@ -11,6 +11,7 @@
 #define REAL_VFPU 3
 #define REAL_RATIONAL 4
 #define REAL_RATIONAL_ARBINT 5
+#define REAL_MPFRCPP 6
 
 #ifndef REAL
        #error "REAL was not defined!"
@@ -30,6 +31,10 @@
        #include "gmpint.h"
 #endif //REAL
 
+#if REAL == REAL_MPFRCPP
+       #include <mpreal.h>
+#endif //REAL
+
 namespace IPDF
 {      
        extern const char * g_real_name[];
@@ -54,7 +59,15 @@ namespace IPDF
        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 REAL == 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());}
 #else
        #error "Type of Real unspecified."
 #endif //REAL
@@ -69,6 +82,8 @@ namespace IPDF
        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)
        {
@@ -81,13 +96,14 @@ namespace IPDF
                        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) {}
+               Vec2(const std::pair<int64_t, int64_t> & p) : x(p.first), y(p.second) {}
        
                bool operator==(const Vec2& other) const { return (x == other.x) && (y == other.y); }
                bool operator!=(const Vec2& other) const { return !(*this == other); }