X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Frational.h;h=b01950533ad6810653c724f8924f68d4f982690c;hp=53f7d02fd1caa5c91e727f85b6ba633528d02b60;hb=da646c739f87bf28c5a7af2bc180b93b3444321b;hpb=ba945308b9273fcd420b3d4f1395b44bd6625929

diff --git a/src/rational.h b/src/rational.h
index 53f7d02..b019505 100644
--- a/src/rational.h
+++ b/src/rational.h
@@ -9,16 +9,19 @@
 #include <cmath>
 #include <cassert>
 #include "arbint.h"
+#include "gmpint.h"
+#include <climits>
+#include <values.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 +100,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 +136,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 +164,23 @@ 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; return r;}
+	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 
+	{
+		T num = P, denom = Q;
+		while (Tabs(num) > T(DBL_MAX))
+		{
+			num /= T(16);
+			denom /= T(16);
+		}
+		return ((double)(num))/((double)(denom));
+	}
 	bool CheckAccuracy(double d, const char * msg, double threshold = 1e-3) const
 	{
 		double result = fabs(ToDouble() - d);
@@ -186,13 +204,6 @@ struct Rational
 	T Q;
 };
 
-inline Rational<int64_t> pow(const Rational<int64_t> & a, const Rational<int64_t> & b)
-{
-	//TODO:Implement properly
-	int64_t P = std::pow((double)a.P, b.ToDouble());
-	int64_t Q = std::pow((double)a.Q, b.ToDouble());
-	return Rational<int64_t>(P, Q);
-}