X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Frational.h;h=6bc5aec2edd6ec7edeffef62e64915c8e38b2306;hp=2c98e1ad1672d7e656c64c0659f4af7e5ce7e5bd;hb=e8e6ff92ef0978cbec24dd69a85dbf1bd81681ad;hpb=924cb525f587c58440c43bcae6ccfd9b2e41c99c;ds=sidebyside

diff --git a/src/rational.h b/src/rational.h
index 2c98e1a..6bc5aec 100644
--- a/src/rational.h
+++ b/src/rational.h
@@ -9,6 +9,7 @@
 #include <cmath>
 #include <cassert>
 #include "arbint.h"
+#include "gmpint.h"
 
 namespace IPDF
 {
@@ -17,9 +18,8 @@ template <class T> T Tabs(const T & a)
 {
 	return abs(a);
 }
-
 template <> Arbint Tabs(const Arbint & a);
-
+template <> Gmpint Tabs(const Gmpint & a);
 
 /* Recursive version  of GCD
 template <class T>
@@ -103,7 +103,6 @@ struct Rational
 			P = Q = T(1);
 			return;
 		}
-		
 		T g = gcd(Tabs(P), Tabs(Q));
 		//Debug("Got gcd!");
 		P /= g;
@@ -135,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 
@@ -163,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(*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);