X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fdelta_plot.c;fp=src%2Fdelta_plot.c;h=193c1093dcfbb511d08cfca0e60577c1b6a5b57c;hb=1df144a18356d9b329324324bc2f78cfdf1cea3d;hp=73afbd4dc188c28979bbf12643faa739272aeda0;hpb=477a8f1b7e5841202ef29d3d8af3c93acd35c043;p=ape.git

diff --git a/src/delta_plot.c b/src/delta_plot.c
index 73afbd4..193c109 100644
--- a/src/delta_plot.c
+++ b/src/delta_plot.c
@@ -22,31 +22,11 @@ void delta_plot(double *D, int *size, int *nbins, int *counts, double *deltabar)
 			xu = xy + 1;
 			for (u = y + 1; u < n - 1; u++, xu++, yu++) {
 				uv = u*n - u*(u + 1)/2; /* do NOT factorize */
-				dxu = D[xu];
-				dyu = D[yu];
-				xv = xu + 1;
-				yv = yu + 1;
+				dxu = D[xu]; dyu = D[yu];
+				xv = xu + 1; yv = yu + 1;
 				for (v = u + 1; v < n; v++, xv++, yv++, uv++) {
-					dxv = D[xv];
-					dyv = D[yv];
-					duv = D[uv];
-				/* 	if (dxy <= dxu && dxy <= dxv && dxy <= dyu && dxy <= dyv && dxy <= duv) k=1; */
-/* 					else if (duv <= dxy && duv <= dxu && duv <= dxv && duv <= dyu && duv <= dyv) k=1; */
-/* 					else if (dxu <= dxy && dxu <= dxv && dxu <= dyu && dxu <= dyv && dxu <= duv) k=2; */
-/* 					else if (dyv <= dxy && dyv <= dxu && dyv <= dxv && dyv <= dyu && dyv <= duv) k=2; */
-/* 					else if (dxv <= dxy && dxv <= dxu && dxv <= dyu && dxv <= dyv && dxv <= duv) k=3; */
-/* 					else if (dyu <= dxy && dyu <= dxu && dyu <= dxv && dyu <= dyv && dyu <= duv) k=3; */
-					//Rprintf("%d\t%d\t%d\t%d\t%d\t%d\t\n", xy, xu, xv, yu, yv, uv);
-					//Rprintf("dxy = %f\tdxu = %f\tdyu = %f\n", dxy, dxu, dyu);
-					//Rprintf("D[xv] = %f\tD[yv] = %f\tD[uv] = %f\n", D[xv], D[yv], D[uv]);
-					/* switch (k) { */
-/* 					case 1 : A = dxv + dyu; B = dxu + dyv; C = dxy + duv; break; */
-/* 					case 2 : A = dxv + dyu; B = dxy + duv; C = dxu + dyv; break; */
-/* 					case 3 : A = dxu + dyv; B = dxy + duv; C = dxv + dyu; break; */
-/* 					} */
-					//Rprintf("A = %f\tB = %f\tC = %f\n", A, B, C);
+					dxv = D[xv]; dyv = D[yv]; duv = D[uv];
 					A = dxv + dyu; B = dxu + dyv; C = dxy + duv;
-					//Rprintf("A = %f\tB = %f\tC = %f\n", A, B, C);
 					if (A == B && B == C) delta = 0; else while (1) {
 						if (C <= B && B <= A) {delta = (A - B)/(A - C); break;}
 						if (B <= C && C <= A) {delta = (A - C)/(A - B); break;}
@@ -57,7 +37,6 @@ void delta_plot(double *D, int *size, int *nbins, int *counts, double *deltabar)
 					}
 					/* if (delta == 1) i = nb - 1; else */
 					i = delta * nb;
-					//Rprintf("delta = %f\ti = %d\n", delta, i);
 					counts[i] += 1;
 					deltabar[x] += delta;
 					deltabar[y] += delta;