X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Frational.h;h=595f5f25288c4ac87e9ccbce733a7f248cc2531e;hp=6269ef181c3c6ad7a7126ab17f743a077487448f;hb=b3c2d3472c3b3d77eae0f66731a32b852dce11f0;hpb=a7da45c62d5a0604785479f5dfeb1c2a65d0f9de

diff --git a/src/rational.h b/src/rational.h
index 6269ef1..595f5f2 100644
--- a/src/rational.h
+++ b/src/rational.h
@@ -8,9 +8,18 @@
 #include "common.h"
 #include <cmath>
 #include <cassert>
+#include "arbint.h"
+#include "gmpint.h"
 
 namespace IPDF
 {
+	
+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>
@@ -65,7 +74,6 @@ struct Rational
 	Rational(double d=0) : P(d*1e6), Q(1e6) // Possibly the worst thing ever...
 	{
 		Simplify();
-		CheckAccuracy(d, "Construct from double");
 	}
 
 	Rational(const T & _P, const T & _Q) : P(_P), Q(_Q)
@@ -90,8 +98,13 @@ struct Rational
 			Q = T(1);
 			return;
 		}
-		T g = gcd(T(llabs(P)),T(llabs(Q)));
-		Debug("Got gcd!");
+		if (P == Q)
+		{
+			P = Q = T(1);
+			return;
+		}
+		T g = gcd(Tabs(P), Tabs(Q));
+		//Debug("Got gcd!");
 		P /= g;
 		Q /= g;
 	}
@@ -112,31 +125,34 @@ 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(),"+");
+		//if (!result.CheckAccuracy(ToDouble() * r.ToDouble(),"+"))
+		//{
+		//	Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
+		//}
 		return result;
 	}
 	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 
 	{
 		Rational result(P * r.P, Q * r.Q);
-		if (!result.CheckAccuracy(ToDouble() * r.ToDouble(),"*"))
-		{
-			Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
-		}
+		//if (!result.CheckAccuracy(ToDouble() * r.ToDouble(),"*"))
+		//{
+		//	Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
+		//}
 		return result;
 	}
 	Rational operator/(const Rational & r) const 
 	{
 		Rational result(P * r.Q, Q*r.P);
-		if (!result.CheckAccuracy(ToDouble() / r.ToDouble(),"/"))
-		{
-			Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
-		}
+		//if (!result.CheckAccuracy(ToDouble() / r.ToDouble(),"/"))
+		//{
+		//	Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
+		//}
 		return result;
 	}	
 
@@ -146,19 +162,25 @@ 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) / d;
+		double result = fabs(ToDouble() - d);
+		if (d != 0e0) result /= d;
 		if (result > threshold)
 		{
 			Warn("(%s) : Rational %s (%f) is not close enough at representing %f (%f vs %f)", msg, Str().c_str(), ToDouble(), d, result, threshold);
+			Backtrace();
 			return false;
 		}
 		return true;
@@ -166,7 +188,7 @@ struct Rational
 	std::string Str() const
 	{
 		std::stringstream s;
-		s << (int64_t)P << "/" << (int64_t)Q;
+		s << int64_t(P) << "/" << int64_t(Q);
 		return s.str();
 	}
 	
@@ -174,13 +196,7 @@ 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);
-}
+