Fix computeW (was random - TODO)

[morpheus.git] / pkg / src / functions.c

diff --git a/pkg/src/functions.c b/pkg/src/functions.c
index 6444b86..79deff4 100644 (file)
--- a/pkg/src/functions.c
+++ b/pkg/src/functions.c
@@ -64,8 +64,9 @@ void Compute_Omega(double* X, int* Y, double* M, int* pnc, int* pn, int* pd, dou
       W[j*dim+k] = 0.0;
   }
   double* g = (double*)malloc(dim*sizeof(double));
-  omp_set_num_threads(nc >= 1 ? nc : omp_get_num_procs());
-  #pragma omp parallel for
+  // TODO: stabilize this (for now, random result)
+//  omp_set_num_threads(nc >= 1 ? nc : omp_get_num_procs());
+//  #pragma omp parallel for
   for (int i=0; i<n; i++)
   {
     // g == gi:
@@ -108,14 +109,14 @@ void Compute_Omega(double* X, int* Y, double* M, int* pnc, int* pn, int* pd, dou
   // Normalize W: x 1/n
   for (int j=0; j<dim; j++)
   {
-    for (int k=0; k<=j; k++)
+    for (int k=j; k<dim; k++)
       W[mi(j,k,dim,dim)] /= n;
   }
-  // Symmetrize W: W[j,k] = W[k,j] for k > j
+  // Symmetrize W: W[k,j] = W[j,k] for k > j
   for (int j=0; j<dim; j++)
   {
-    for (int k=j+1: k<dim; k++)
-      W[mi(j,k,dim,dim)] = W[mi(k,j,dim,dim)];
+    for (int k=j+1; k<dim; k++)
+      W[mi(k,j,dim,dim)] = W[mi(j,k,dim,dim)];
   }
   free(g);
 }