Inflict Qt4 upon the codebase

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

diff --git a/src/real.h b/src/real.h
index 8dea953..406cb8e 100644 (file)
--- a/src/real.h
+++ b/src/real.h
@@ -2,12 +2,13 @@
 #define _REAL_H
 
 #include "common.h"
 #define _REAL_H
 
 #include "common.h"

+#include <cmath>

 
 
 #define REAL_SINGLE 0
 #define REAL_DOUBLE 1
 #define REAL_LONG_DOUBLE 2
 
 
 #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_RATIONAL 4
 #define REAL_RATIONAL_ARBINT 5
 


@@ -15,9 +16,9 @@
        #error "REAL was not defined!"
 #endif
 
        #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"
 
 #if REAL == REAL_RATIONAL
        #include "rational.h"


@@ -26,6 +27,7 @@
 #if REAL == REAL_RATIONAL_ARBINT
        #include "rational.h"
        #include "arbint.h"
 #if REAL == REAL_RATIONAL_ARBINT
        #include "rational.h"
        #include "arbint.h"

+       #include "gmpint.h"

 #endif //REAL
 
 namespace IPDF
 #endif //REAL
 
 namespace IPDF


@@ -38,25 +40,21 @@ namespace IPDF
        typedef double Real;
 #elif REAL == REAL_LONG_DOUBLE
        typedef long double Real;
        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::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 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<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;
+       #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 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
 #else
        #error "Type of Real unspecified."
 #endif //REAL


@@ -70,6 +68,22 @@ namespace IPDF
        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 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 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;
+       }
+       
+       
+

 }
 
 #endif //_REAL_H
 }
 
 #endif //_REAL_H