From: Sam Moore <matches@ucc.asn.au>
Date: Thu, 3 Apr 2014 09:19:35 +0000 (+0800)
Subject: Add tester for numerical calculation of PI
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=fdc6f69d40cf7e872218ec48493534cc3b85c852;p=ipdf%2Fcode.git

Add tester for numerical calculation of PI

Calculate PI using float, double and Real and compare the error and performance.

Traditional floats have a point (hardware dependent) where the error starts to behave unpredictably
rather than decreasing with number of intervals - due to rounding/precision errors.
Can see that doubles are better than single precision floats but they still do it.

An infinite precision Real would not have these problems (hah!)
We can at least aim to do better than double.

Based on PHYS CQM/pprog courses from 2012.
Should probably find a literature reference for this.
---

diff --git a/src/real.h b/src/real.h
index 7b30949..a7f56be 100644
--- a/src/real.h
+++ b/src/real.h
@@ -20,7 +20,7 @@ namespace IPDF
 	struct Real
 	{
 		Real() = default;
-		Real(float r) : value(r) 
+		Real(double r) : value(r) 
 		{
 			int & a = *((int*)(&value)); // um...
 			// mask out extra bits in exponent
@@ -30,14 +30,19 @@ namespace IPDF
 
 		}	
 	
-		Real operator+(float f) {return Real(value+f);}
-		Real operator-(float f) {return Real(value+f);}
-		Real operator/(float f) {return Real(value/f);}
-		Real operator*(float f) {return Real(value*f);}
-		Real operator+(const Real & r) {return this->operator+(r.value);}
-		Real operator-(const Real & r) {return this->operator-(r.value);}
-		Real operator*(const Real & r) {return this->operator*(r.value);}
-		Real operator/(const Real & r) {return this->operator/(r.value);}
+		Real operator+(float f) const {return Real(value+f);}
+		Real operator-(float f) const {return Real(value+f);}
+		Real operator/(float f) const {return Real(value/f);}
+		Real operator*(float f) const {return Real(value*f);}
+		Real operator+(const Real & r) const {return Real(this->value + r.value);}
+		Real operator-(const Real & r) const {return Real(this->value - r.value);}
+		Real operator*(const Real & r) const {return Real(this->value * r.value);}
+		Real operator/(const Real & r) const {return Real(this->value / r.value);}
+		Real & operator+=(const Real & r) {this->value += r.value; return *this;}
+		Real & operator-=(const Real & r) {this->value -= r.value; return *this;}
+		Real & operator/=(const Real & r) {this->value /= r.value; return *this;}
+		Real & operator*=(const Real & r) {this->value *= r.value; return *this;}
+
 		float value;
 	};
 	inline float Float(Real r) {return r.value;}
diff --git a/src/tests/calculatepi.cpp b/src/tests/calculatepi.cpp
new file mode 100644
index 0000000..46348ff
--- /dev/null
+++ b/src/tests/calculatepi.cpp
@@ -0,0 +1,63 @@
+/**
+ * Tester
+ * Calculates PI using integration
+ * Compares results obtained with float, double, and Real.
+ */
+#include "main.h"
+#include <cmath> // for PI
+#include <ctime> // for performance measurements
+
+/** Function to integrate
+ *
+ */
+template <class T> T f(const T & x)
+{
+	// Use reference because Real might get big
+	return T(4.0) / (T(1.0) + x*x);
+}
+
+/**
+ * Integrate f using the simpson rule
+ */
+template <class T> T Integrate(T(*f)(const T&), const T & xmin, const T & xmax, uint64_t intervals)
+{
+	T sum = 0.0;
+	T dx = (xmax - xmin) / T(intervals);
+	
+	T odd = 0.0;
+	T even = 0.0;
+	uint64_t i = 0; 
+	for (i = 1; i < intervals-1; i+=2)
+		odd += f(xmin + dx*T(i));
+	for (i = 2; i < intervals-1; i+=2)
+		even += f(xmin + dx*T(i));
+
+	sum = (f(xmin) + T(4.0)*odd + T(2.0)*even + f(xmin+T(intervals)*dx))*dx / T(3.0);
+	return sum;
+
+}
+
+#define MAX_INTERVALS 1e9
+
+/**
+ * main
+ */
+int main(int argc, char ** argv)
+{
+	printf("# intervals\terror_float\tclock_float\terror_double\tclock_double\terror_real\tclock_real\n");
+	for (uint64_t intervals = 1; intervals < (uint64_t)(MAX_INTERVALS); intervals*=10)
+	{
+		clock_t start = clock();
+		float error_float = Integrate<float>(f<float>, 0.0, 1.0, intervals) - (float)(M_PI);
+		clock_t clock_float = clock() - start;
+		start = clock();
+		double error_double = Integrate<double>(f<double>, 0.0, 1.0, intervals) - (double)(M_PI);
+		clock_t clock_double = clock() - start;
+		start = clock();
+		Real error_real = Integrate<Real>(f<Real>, 0.0, 1.0, intervals) - Real(M_PI);
+		clock_t clock_real = clock() - start;
+	
+		printf("%lu\t%.30f\t%li\t%.30f\t%li\t%.30f\t%li\n", intervals, error_float, clock_float, error_double, clock_double, Float(error_real), clock_real);
+	}
+}
+