Maybe don't use all of the lines. Or maybe do.

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

diff --git a/src/real.h b/src/real.h
index f052696..ab90384 100644 (file)
--- a/src/real.h
+++ b/src/real.h
@@ -3,10 +3,12 @@
 
 #include "common.h"
 
+
 #define REAL_SINGLE 0
 #define REAL_DOUBLE 1
 #define REAL_LONG_DOUBLE 2
-#define REAL_SINGLE_FAST2SUM 3
+#define REAL_SINGLE_FAST2SUM 3 //TODO: Remove, is FITH
+#define REAL_RATIONAL 4
 
 #ifndef REAL
        #error "REAL was not defined!"
@@ -16,6 +18,10 @@
        #include "real_fast2sum.h"
 #endif //REAL
 
+#if REAL == REAL_RATIONAL
+       #include "rational.h"
+#endif //REAL
+
 namespace IPDF
 {      
        extern const char * g_real_name[];
@@ -28,8 +34,13 @@ namespace IPDF
        typedef long double Real;
 #elif REAL == REAL_SINGLE_FAST2SUM
        typedef RealF2S<float> Real;
-       inline float Float(Real r) {return r.m_value;}
-               
+       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();}
 #else
        #error "Type of Real unspecified."
 #endif //REAL
@@ -37,9 +48,12 @@ namespace IPDF
        // 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 f;}
-       inline double Float(double f) {return f;}
-       inline long double Float(long double f) {return f;}
+       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);}
 }
 
 #endif //_REAL_H