X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Ftests%2Frealops.cpp;h=61d747cb13e29e672c6d366203e325b2964d3c7f;hp=0aeeeb6189fca90a9d3e65a0f8f9d5534d3b5db0;hb=e35bf651e7ebfe4932e877780bb00397c41a7ec2;hpb=a182cbba4fe9e6a36c5063735dbec1c5340da04c

diff --git a/src/tests/realops.cpp b/src/tests/realops.cpp
index 0aeeeb6..61d747c 100644
--- a/src/tests/realops.cpp
+++ b/src/tests/realops.cpp
@@ -1,14 +1,22 @@
+/**
+ * Test mathematical operations on the Real type and consistency with double
+ */
+
 #include "main.h"
 #include "real.h"
 
 using namespace std;
 using namespace IPDF;
 
-#define TEST_CASES 100
+#define TEST_CASES 1000
+
+static double g_totalerror = 0;
 
-bool NotEqual(double a, double b, double threshold=1e-4)
+bool NotEqual(double a, double b, double threshold=1e-1)
 {
-	return (fabs(a-b) > threshold);
+	double error = fabs(a-b);
+	g_totalerror += error;
+	return (error > threshold);
 }
 
 int main(int argc, char ** argv)
@@ -18,13 +26,30 @@ int main(int argc, char ** argv)
 	unsigned failures = 0;
 	for (unsigned i = 0; i < TEST_CASES; ++i)
 	{
-		double da = (double)(rand()) / (double)(rand());
-		double db = (double)(rand()) / (double)(rand());
+		//Debug("Test %u of %u", i, TEST_CASES);
+		double da = (double)(rand() + 1) / (double)(rand() + 1);
+		double db = (double)(rand() + 1) / (double)(rand() + 1);
+		
+		if (rand() % 2 == 0)
+			da = -da;
+		if (rand() % 2 == 0)
+			db = -db;
 		
 		Real a(da);
 		Real b(db);
-		
-		
+		Real aa(a);
+		Real bb(b);
+		unsigned old_failures = failures;
+		if (NotEqual(Double(a), Double(aa)))
+		{
+			failures++;
+			Warn("a != Real(a); %f vs %f", Double(a), Double(aa));
+		}
+		if (NotEqual(Double(b), Double(bb)))
+		{
+			failures++;
+			Warn("b != Real(b); %f vs %f", Double(b), Double(bb));
+		}
 		
 		if (NotEqual(Double(a), da))
 		{
@@ -67,28 +92,40 @@ int main(int argc, char ** argv)
 			failures++;			
 			Warn("b has changed after +-*/ from %f to %f", db, Double(b));
 		}
-
+		Real abeforeop(a);
 		if (NotEqual(Double(a+=b), da+=db))
 		{
 			failures++;			
-			Warn("a += b = %f should be %f", Double(a), da);
+			Warn("a += b = %f should be %f, a before op was %f", Double(a), da, Double(abeforeop));
 		}
+		abeforeop = a;
 		if (NotEqual(Double(a-=b), da-=db))
 		{
 			failures++;			
-			Warn("a -= b = %f should be %f", Double(a), da);
+			Warn("a -= b = %f should be %f, a before op was %f", Double(a), da, Double(abeforeop));
 		}
+		abeforeop = a;
 		if (NotEqual(Double(a*=b), da*=db))
 		{
 			failures++;			
-			Warn("a *= b = %f should be %f", Double(a), da);
+			Warn("a *= b = %f should be %f, a before op was %f", Double(a), da, Double(abeforeop));
 		}
+		abeforeop = a;
 		if (NotEqual(Double(a/=b), da/=db))
 		{
 			failures++;
-			Warn("a /= b = %f should be %f", Double(a), da);
+			Warn("a /= b = %f should be %f, a before op was %f", Double(a), da, Double(abeforeop));
 		}		
+		
+		if (failures > old_failures)
+		{
+			Error("%u failures on case %u da = %f, db = %f, a = %f, b = %f, aa = %f, bb = %f", failures-old_failures, i, da, db, Double(a), Double(b), Double(aa), Double(bb));
+			#if REAL == REAL_RATIONAL || REAL == REAL_RATIONAL_ARBINT
+				Debug("\tStrings are a = %s, b = %s, aa = %s, bb = %s", a.Str().c_str(), b.Str().c_str(), aa.Str().c_str(), bb.Str().c_str());
+			#endif
+		}
 	}
 	Debug("Completed %u test cases with total of %u operations, %u failures", TEST_CASES, 12*TEST_CASES, failures);
+	Debug("Total accumulated difference between Real and Double operations was %f", g_totalerror);
 
 }