More debugging, harder realops test

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

diff --git a/src/rational.h b/src/rational.h
index 9dde43a..61a38ab 100644 (file)
--- a/src/rational.h
+++ b/src/rational.h
@@ -8,9 +8,17 @@
 #include "common.h"
 #include <cmath>
 #include <cassert>
+#include "arbint.h"
 
 namespace IPDF
 {
+       
+template <class T> T Tabs(const T & a)
+{
+       return abs(a);
+}
+template <> Arbint Tabs(const Arbint & a);
+
 
 /* Recursive version  of GCD
 template <class T>
@@ -65,10 +73,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)
@@ -93,7 +97,12 @@ struct Rational
                        Q = T(1);
                        return;
                }
-               T g = gcd(T(llabs(P)),T(llabs(Q)));
+               if (P == Q)
+               {
+                       P = Q = T(1);
+                       return;
+               }
+               T g = gcd(Tabs(P), Tabs(Q));
                //Debug("Got gcd!");
                P /= g;
                Q /= g;
@@ -115,34 +124,34 @@ 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);
-               if (!result.CheckAccuracy(ToDouble() * r.ToDouble(),"+"))
-               {
-                       Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
-               }
+               //if (!result.CheckAccuracy(ToDouble() * r.ToDouble(),"+"))
+               //{
+               //      Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
+               //}
                return result;
        }
        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 
        {
                Rational result(P * r.P, Q * r.Q);
-               if (!result.CheckAccuracy(ToDouble() * r.ToDouble(),"*"))
-               {
-                       Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
-               }
+               //if (!result.CheckAccuracy(ToDouble() * r.ToDouble(),"*"))
+               //{
+               //      Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
+               //}
                return result;
        }
        Rational operator/(const Rational & r) const 
        {
                Rational result(P * r.Q, Q*r.P);
-               if (!result.CheckAccuracy(ToDouble() / r.ToDouble(),"/"))
-               {
-                       Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
-               }
+               //if (!result.CheckAccuracy(ToDouble() / r.ToDouble(),"/"))
+               //{
+               //      Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
+               //}
                return result;
        }       
 
@@ -152,13 +161,17 @@ 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;}
+       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 
+       {
+               return (double)P/(double)Q;
+       }
        bool CheckAccuracy(double d, const char * msg, double threshold = 1e-3) const
        {
                double result = fabs(ToDouble() - d);
@@ -192,6 +205,7 @@ inline Rational<int64_t> pow(const Rational<int64_t> & a, const Rational<int64_t
 
 
 
+
 }
 
 #endif //_RATIONAL_H