digit_t is now unsigned, asm division for 1 digit

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

diff --git a/src/rational.h b/src/rational.h
index e74567d..2c98e1a 100644 (file)
--- a/src/rational.h
+++ b/src/rational.h
@@ -15,9 +15,10 @@ namespace IPDF
        
 template <class T> T Tabs(const T & a)
 {
-       return llabs(a);
+       return abs(a);
 }
 
+template <> Arbint Tabs(const Arbint & a);
 
 
 /* Recursive version  of GCD
@@ -73,10 +74,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 +98,12 @@ 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;
@@ -160,7 +163,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) {P = r.P; Q = r.Q; return *this;}
+       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;}