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

diff --git a/src/rational.h b/src/rational.h
index 595f5f2..f9157c7 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
 {
@@ -75,6 +77,8 @@ struct Rational
 	{
 		Simplify();
 	}
+	
+
 
 	Rational(const T & _P, const T & _Q) : P(_P), Q(_Q)
 	{
@@ -162,7 +166,7 @@ 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;}
@@ -171,7 +175,13 @@ struct Rational
 
 	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
 	{
@@ -198,8 +208,6 @@ struct Rational
 
 
 
-
-
 }
 
 #endif //_RATIONAL_H