Start writing exact version of charf.c.

1 files changed, 9 insertions, 6 deletions

diff --git a/charf.c b/charf.c
index 5ce7321..ccbc265 100644
--- a/charf.c
+++ b/charf.c
@@ -3,12 +3,15 @@
 #include <math.h>
 
 #define EXACT false
-#define VALUETYPE double
-#define EXPTYPE double
 
 #if EXACT
+#include "ratio.h"
 #define VALUETYPE ratio
-#define EXPTYPE int
+#define EXPTYPE unsigned int
+#else
+#include "double.h"
+#define VALUETYPE double
+#define EXPTYPE double
 #endif
 
 
@@ -26,11 +29,11 @@ void differentiate(VALUETYPE** df, int D, int K){
 
 /*given function f on domain [0,D-1] compute pth root of integral of |f|^p*/
 VALUETYPE integrate(VALUETYPE* f, EXPTYPE p, int D){
-	VALUETYPE sum = 0.0;
+	VALUETYPE integralp = 0.0;
 	for(int i=0;i<D;i++){
-		sum += pow(fabs(f[i]),p);
+		integralp += pow(fabs(f[i]),p);
 	}
-	return pow(sum,1/p);
+	return pow(integralp,1/p);
 }
 
 void compute_maximalfunction(VALUETYPE* f, VALUETYPE** Sf, VALUETYPE** Af, VALUETYPE* Mf, int D){