X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Frational.h;h=2c98e1ad1672d7e656c64c0659f4af7e5ce7e5bd;hp=53f7d02fd1caa5c91e727f85b6ba633528d02b60;hb=924cb525f587c58440c43bcae6ccfd9b2e41c99c;hpb=ba945308b9273fcd420b3d4f1395b44bd6625929;ds=sidebyside diff --git a/src/rational.h b/src/rational.h index 53f7d02..2c98e1a 100644 --- a/src/rational.h +++ b/src/rational.h @@ -15,9 +15,10 @@ namespace IPDF template T Tabs(const T & a) { - return llabs(a); + return abs(a); } +template <> Arbint Tabs(const Arbint & a); /* Recursive version of GCD @@ -97,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; @@ -156,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;}