Add VFPU::Float (but it is broken)

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

diff --git a/src/real.h b/src/real.h
index 8dea953..4b2db1c 100644 (file)
--- a/src/real.h
+++ b/src/real.h
@@ -7,7 +7,7 @@
 #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
 
@@ -15,9 +15,9 @@
        #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"
@@ -26,6 +26,7 @@
 #if REAL == REAL_RATIONAL_ARBINT
        #include "rational.h"
        #include "arbint.h"
+       #include "gmpint.h"
 #endif //REAL
 
 namespace IPDF
@@ -38,8 +39,8 @@ 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
@@ -48,14 +49,16 @@ namespace IPDF
        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 Rational<Arbint> pow(const Rational<Arbint> & a, const Rational<Arbint> & b)
+       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);
+               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."