X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2Fsrc%2Ffunctions.c;h=1c7295a4fcd192e2fc3a2011bafdd2c0d9aa9290;hb=19d893c4554f7f2cc9a75111cec40712c698e7e2;hp=68f1b79d60369d596a21c658e2c8e1f5a3aa2213;hpb=4bf8494d8484be5eab39dd2a83e649678a2de713;p=morpheus.git

diff --git a/pkg/src/functions.c b/pkg/src/functions.c
index 68f1b79..1c7295a 100644
--- a/pkg/src/functions.c
+++ b/pkg/src/functions.c
@@ -1,77 +1,66 @@
 #include <stdlib.h>
 
 // Index matrix (by columns)
-int mi(int i, int j, int d1, int d2)
+int inline mi(int i, int j, int d1, int d2)
 {
-	return j*d1 + i;
+  return j*d1 + i;
 }
 
 // Index 3-tensor (by columns, matrices ordered by last dim)
-int ti(int i, int j, int k, int d1, int d2, int d3)
+int inline ti(int i, int j, int k, int d1, int d2, int d3)
 {
-	return k*d1*d2 + j*d1 + i;
+  return k*d1*d2 + j*d1 + i;
 }
 
 // Empirical cross-moment of order 2 between X size nxd and Y size n
 void Moments_M2(double* X, double* Y, int* pn, int* pd, double* M2)
 {
-	int n=*pn, d=*pd;
-	//double* M2 = (double*)calloc(d*d,sizeof(double));
+  int n=*pn, d=*pd;
+  //double* M2 = (double*)calloc(d*d,sizeof(double));
 
-	// M2 = E[Y*X^*2] - E[Y*e^*2] = E[Y (X^*2 - I)]
-	for (int j=0; j<d; j++)
-	{
-		for (int i=0; i<n; i++)
-		{
-			M2[mi(j,j,d,d)] -= Y[i] / n;
-			for (int k=0; k<d; k++)
-				M2[mi(j,k,d,d)] += Y[i] * X[mi(i,j,n,d)]*X[mi(i,k,n,d)] / n;
-		}
-	}
+  // M2 = E[Y*X^*2] - E[Y*e^*2] = E[Y (X^*2 - I)]
+  for (int j=0; j<d; j++)
+  {
+    for (int i=0; i<n; i++)
+    {
+      M2[mi(j,j,d,d)] -= Y[i] / n;
+      for (int k=0; k<d; k++)
+        M2[mi(j,k,d,d)] += Y[i] * X[mi(i,j,n,d)]*X[mi(i,k,n,d)] / n;
+    }
+  }
 }
 
 // Empirical cross-moment of order 3 between X size nxd and Y size n
 void Moments_M3(double* X, double* Y, int* pn, int* pd, double* M3)
 {
-	int n=*pn, d=*pd;
-	//double* M3 = (double*)calloc(d*d*d,sizeof(double));
+  int n=*pn, d=*pd;
+  //double* M3 = (double*)calloc(d*d*d,sizeof(double));
 
-	// M3 = E[Y*X^*3] - E[Y*e*X*e] - E[Y*e*e*X] - E[Y*X*e*e]
-	for (int j=0; j<d; j++)
-	{
-		for (int k=0; k<d; k++)
-		{
-			for (int i=0; i<n; i++)
-			{
-				double tensor_elt = Y[i]*X[mi(i,k,n,d)] / n;
-				M3[ti(j,k,j,d,d,d)] -= tensor_elt;
-				M3[ti(j,j,k,d,d,d)] -= tensor_elt;
-				M3[ti(k,j,j,d,d,d)] -= tensor_elt;
-				for (int o=0; o<d; o++)
-					M3[ti(j,k,o,d,d,d)] += Y[i] * X[mi(i,j,n,d)]*X[mi(i,k,n,d)]*X[mi(i,o,n,d)] / n;
-			}
-		}
-	}
+  // M3 = E[Y*X^*3] - E[Y*e*X*e] - E[Y*e*e*X] - E[Y*X*e*e]
+  for (int j=0; j<d; j++)
+  {
+    for (int k=0; k<d; k++)
+    {
+      for (int i=0; i<n; i++)
+      {
+        double tensor_elt = Y[i]*X[mi(i,k,n,d)] / n;
+        M3[ti(j,k,j,d,d,d)] -= tensor_elt;
+        M3[ti(j,j,k,d,d,d)] -= tensor_elt;
+        M3[ti(k,j,j,d,d,d)] -= tensor_elt;
+        for (int o=0; o<d; o++)
+          M3[ti(j,k,o,d,d,d)] += Y[i] * X[mi(i,j,n,d)]*X[mi(i,k,n,d)]*X[mi(i,o,n,d)] / n;
+      }
+    }
+  }
 }
 
-#include <stdio.h>
-
 // W = 1/N sum( t(g(Zi,theta)) g(Zi,theta) )
 // with g(Zi, theta) = i-th contribution to all moments (size dim) - real moments
-void Compute_Omega(double* X, double* Y, double* M, int* pn, int* pd, double* W)
+void Compute_Omega(double* X, int* Y, double* M, int* pn, int* pd, double* W)
 {
-	int n=*pn, d=*pd;
+  int n=*pn, d=*pd;
   int dim = d + d*d + d*d*d;
-
-//printf("X: \n");
-//for (int kk=0; kk<d*n; kk++) printf("%f ",X[kk]);
-//printf("\n");
-//printf("Y: \n");
-//for (int kk=0; kk<n; kk++) printf("%f ",Y[kk]);
-//printf("\n");
-//printf("M: \n");
-//for (int kk=0; kk<dim; kk++) printf("%f ",M[kk]);
-//printf("\n");
+  //double* W = (double*)malloc(dim*dim*sizeof(double));
 
   // (Re)Initialize W:
   for (int j=0; j<dim; j++)
@@ -79,12 +68,10 @@ void Compute_Omega(double* X, double* Y, double* M, int* pn, int* pd, double* W)
     for (int k=0; k<dim; k++)
       W[j*dim+k] = 0.0;
   }
-
-  //double* W = (double*)calloc(dim*dim,sizeof(double));
   double* g = (double*)malloc(dim*sizeof(double));
   for (int i=0; i<n; i++)
   {
-    // Fill gi:
+    // g == gi:
     for (int j=0; j<d; j++)
       g[j] = Y[i] * X[mi(i,j,n,d)] - M[j];
     for (int j=d; j<d+(d*d); j++)
@@ -94,7 +81,7 @@ void Compute_Omega(double* X, double* Y, double* M, int* pn, int* pd, double* W)
       g[j] = 0.0;
       if (idx1 == idx2)
         g[j] -= Y[i];
-			g[j] += Y[i] * X[mi(i,idx1,n,d)]*X[mi(i,idx2,n,d)] - M[j];
+      g[j] += Y[i] * X[mi(i,idx1,n,d)]*X[mi(i,idx2,n,d)] - M[j];
     }
     for (int j=d+d*d; j<dim; j++)
     {
@@ -110,11 +97,6 @@ void Compute_Omega(double* X, double* Y, double* M, int* pn, int* pd, double* W)
         g[j] -= Y[i] * X[mi(i,idx1,n,d)];
       g[j] += Y[i] * X[mi(i,idx1,n,d)]*X[mi(i,idx2,n,d)]*X[mi(i,idx3,n,d)] - M[j];
     }
-
-//printf("i=%i, g=: \n", i);
-//for (int kk=0; kk<d; kk++) printf("%f ",g[kk]);
-//printf("\n");
-
     // Add 1/n t(gi) %*% gi to W
     for (int j=0; j<dim; j++)
     {
@@ -123,11 +105,4 @@ void Compute_Omega(double* X, double* Y, double* M, int* pn, int* pd, double* W)
     }
   }
   free(g);
-
-//  for (int j=0; j<dim; j++)
-//  {
-//    printf("\n");
-//    for (int k=0; k<dim; k++)
-//      printf("%f ",W[j*dim+k]);
-//  }
 }