X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Frational.h;h=0fa5d9910f3b7fa8136717bc971c5a7b6f23487a;hp=595f5f25288c4ac87e9ccbce733a7f248cc2531e;hb=888817a67a9d840be66b52811b01eb77f10ff3e6;hpb=9e1a33043e1242c4605f2a3a48bd948fc760d948

diff --git a/src/rational.h b/src/rational.h
index 595f5f2..0fa5d99 100644
--- a/src/rational.h
+++ b/src/rational.h
@@ -10,6 +10,8 @@
 #include <cassert>
 #include "arbint.h"
 #include "gmpint.h"
+#include <climits>
+#include <values.h>
 
 namespace IPDF
 {
@@ -21,6 +23,7 @@ template <class T> T Tabs(const T & a)
 template <> Arbint Tabs(const Arbint & a);
 template <> Gmpint Tabs(const Gmpint & a);
 
+
 /* Recursive version  of GCD
 template <class T>
 T gcd(const T & a, const T & b)
@@ -75,6 +78,8 @@ struct Rational
 	{
 		Simplify();
 	}
+	
+
 
 	Rational(const T & _P, const T & _Q) : P(_P), Q(_Q)
 	{
@@ -162,16 +167,31 @@ 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(*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;}
+	Rational Sqrt() const
+	{
+		return Rational(sqrt(ToDouble()));
+	}
+
+	int64_t ToInt64() const
+	{
+		return (int64_t)ToDouble();
+	}
 
 	double ToDouble() const 
 	{
-		return (double)P/(double)Q;
+		T num = P, denom = Q;
+		while (Tabs(num) > T(1e10))
+		{
+			num /= T(16);
+			denom /= T(16);
+		}
+		return ((double)(num))/((double)(denom));
 	}
 	bool CheckAccuracy(double d, const char * msg, double threshold = 1e-3) const
 	{
@@ -197,8 +217,11 @@ struct Rational
 };
 
 
-
-
+template <class P>
+Rational<P> Abs(const Rational<P> & a)
+{
+	return Rational<P>(Tabs(a.P), a.Q);
+}
 
 }