X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Frational.h;fp=src%2Frational.h;h=9dde43a4dad9006713ccd819c265adb200d886b3;hp=6269ef181c3c6ad7a7126ab17f743a077487448f;hb=39599aa6423d3e0181fbfe2aac8f78f388a3f372;hpb=35e4687acd16a28fc923a75d254cdb4fd2fbc524

diff --git a/src/rational.h b/src/rational.h
index 6269ef1..9dde43a 100644
--- a/src/rational.h
+++ b/src/rational.h
@@ -65,7 +65,10 @@ struct Rational
 	Rational(double d=0) : P(d*1e6), Q(1e6) // Possibly the worst thing ever...
 	{
 		Simplify();
-		CheckAccuracy(d, "Construct from double");
+		if (!CheckAccuracy(d, "Construct from double"))
+		{
+			//Fatal("Bwah bwah :(");
+		}
 	}
 
 	Rational(const T & _P, const T & _Q) : P(_P), Q(_Q)
@@ -91,7 +94,7 @@ struct Rational
 			return;
 		}
 		T g = gcd(T(llabs(P)),T(llabs(Q)));
-		Debug("Got gcd!");
+		//Debug("Got gcd!");
 		P /= g;
 		Q /= g;
 	}
@@ -112,7 +115,10 @@ 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 
@@ -155,10 +161,12 @@ struct Rational
 	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 +174,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();
 	}