Fix ymax in GROUP bounding box

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

diff --git a/src/rational.h b/src/rational.h
index e74567d..b019505 100644 (file)
--- a/src/rational.h
+++ b/src/rational.h
@@ -9,16 +9,19 @@
 #include <cmath>
 #include <cassert>
 #include "arbint.h"
+#include "gmpint.h"
+#include <climits>
+#include <values.h>
 
 namespace IPDF
 {
        
 template <class T> T Tabs(const T & a)
 {
-       return llabs(a);
+       return abs(a);
 }
-
-
+template <> Arbint Tabs(const Arbint & a);
+template <> Gmpint Tabs(const Gmpint & a);
 
 /* Recursive version  of GCD
 template <class T>
@@ -73,10 +76,6 @@ struct Rational
        Rational(double d=0) : P(d*1e6), Q(1e6) // Possibly the worst thing ever...
        {
                Simplify();
-               //if (!CheckAccuracy(d, "Construct from double"))
-               {
-                       //Fatal("Bwah bwah :(");
-               }
        }
 
        Rational(const T & _P, const T & _Q) : P(_P), Q(_Q)
@@ -101,6 +100,11 @@ struct Rational
                        Q = T(1);
                        return;
                }
+               if (P == Q)
+               {
+                       P = Q = T(1);
+                       return;
+               }
                T g = gcd(Tabs(P), Tabs(Q));
                //Debug("Got gcd!");
                P /= g;
@@ -132,7 +136,7 @@ struct Rational
        Rational operator-(const Rational & r) const 
        {
                Rational result = (r.P == T(0)) ? Rational(P,Q) : Rational(P*r.Q - r.P*Q, Q*r.Q);
-               result.CheckAccuracy(ToDouble() - r.ToDouble(),"-");
+               //result.CheckAccuracy(ToDouble() - r.ToDouble(),"-");
                return result;
        }
        Rational operator*(const Rational & r) const 
@@ -160,13 +164,23 @@ 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) {P = r.P; Q = r.Q; return *this;}
+       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;}
        Rational & operator*=(const Rational & r) {this->operator=(*this*r); return *this;}
        Rational & operator/=(const Rational & r) {this->operator=(*this/r); return *this;}
 
-       double ToDouble() const {return (double)(P) / (double)(Q);}
+       double ToDouble() const 
+       {
+               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
        {
                double result = fabs(ToDouble() - d);
@@ -190,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);
-}