Change Rational<Arbint> -> Rational<Gmpint>

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

diff --git a/src/rational.h b/src/rational.h
index 53f7d02..6bc5aec 100644 (file)
--- a/src/rational.h
+++ b/src/rational.h
@@ -9,16 +9,17 @@
 #include <cmath>
 #include <cassert>
 #include "arbint.h"
+#include "gmpint.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>
@@ -97,6 +98,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;
@@ -128,7 +134,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 
@@ -156,13 +162,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);