Go nuts with Qt

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

diff --git a/src/rational.h b/src/rational.h
index 61a38ab..b019505 100644 (file)
--- a/src/rational.h
+++ b/src/rational.h
@@ -9,6 +9,9 @@
 #include <cmath>
 #include <cassert>
 #include "arbint.h"
+#include "gmpint.h"
+#include <climits>
+#include <values.h>
 
 namespace IPDF
 {
@@ -18,7 +21,7 @@ template <class T> T Tabs(const T & a)
        return abs(a);
 }
 template <> Arbint Tabs(const Arbint & a);
-
+template <> Gmpint Tabs(const Gmpint & a);
 
 /* Recursive version  of GCD
 template <class T>
@@ -161,7 +164,7 @@ struct Rational
        //Rational operator*(const Rational & r) const {return Rational(ToDouble()*r.ToDouble());}
        //Rational operator/(const Rational & r) const {return Rational(ToDouble()/r.ToDouble());}
 
-       Rational operator-() const {Rational r(*this); r.P = -r.P;}
+       Rational operator-() const {Rational r(*this); r.P = -r.P; return r;}
        Rational & operator=(const Rational & r) {P = r.P; Q = r.Q; Simplify(); return *this;}
        Rational & operator+=(const Rational & r) {this->operator=(*this+r); return *this;}
        Rational & operator-=(const Rational & r) {this->operator=(*this-r); return *this;}
@@ -170,7 +173,13 @@ struct Rational
 
        double ToDouble() const 
        {
-               return (double)P/(double)Q;
+               T num = P, denom = Q;
+               while (Tabs(num) > T(DBL_MAX))
+               {
+                       num /= T(16);
+                       denom /= T(16);
+               }
+               return ((double)(num))/((double)(denom));
        }
        bool CheckAccuracy(double d, const char * msg, double threshold = 1e-3) const
        {
@@ -195,13 +204,6 @@ struct Rational
        T Q;
 };
 
-inline Rational<int64_t> pow(const Rational<int64_t> & a, const Rational<int64_t> & b)
-{
-       //TODO:Implement properly
-       int64_t P = std::pow((double)a.P, b.ToDouble());
-       int64_t Q = std::pow((double)a.Q, b.ToDouble());
-       return Rational<int64_t>(P, Q);
-}