X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Frational.h;h=61a38ab76e305edf9caf45cb0eece53f57d06165;hp=e74567db3529cd2e2ee520eac3e5c4eb70558268;hb=b02dcbab39b8c28b9baa41436842ca9fe4ae7ffd;hpb=e297312c8c82e52abd3507c861e85db497ca7e81

diff --git a/src/rational.h b/src/rational.h
index e74567d..61a38ab 100644
--- a/src/rational.h
+++ b/src/rational.h
@@ -15,9 +15,9 @@ 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 +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)
@@ -101,6 +97,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 +133,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 +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);