projects
/
morpheus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove traces in functions.c
[morpheus.git]
/
pkg
/
src
/
functions.c
diff --git
a/pkg/src/functions.c
b/pkg/src/functions.c
index
c8d51dd
..
f311a34
100644
(file)
--- a/
pkg/src/functions.c
+++ b/
pkg/src/functions.c
@@
-60,13
+60,20
@@
void Compute_Omega(double* X, double* Y, double* M, int* pn, int* pd, double* W)
{
int n=*pn, d=*pd;
int dim = d + d*d + d*d*d;
{
int n=*pn, d=*pd;
int dim = d + d*d + d*d*d;
- //double* W = (double*)calloc(dim*dim,sizeof(double));
- double* g = (double*)malloc(dim * sizeof(double));
+ //double* W = (double*)malloc(dim*dim*sizeof(double));
+
+ // (Re)Initialize W:
+ for (int j=0; j<dim; j++)
+ {
+ for (int k=0; k<dim; k++)
+ W[j*dim+k] = 0.0;
+ }
+ double* g = (double*)malloc(dim*sizeof(double));
for (int i=0; i<n; i++)
{
for (int i=0; i<n; i++)
{
- //
Fill
gi:
+ //
g ==
gi:
for (int j=0; j<d; j++)
for (int j=0; j<d; j++)
- g[j] = Y[i] * X[mi(i,j,n,d)] - M[
i
];
+ g[j] = Y[i] * X[mi(i,j,n,d)] - M[
j
];
for (int j=d; j<d+(d*d); j++)
{
int idx1 = (j-d) % d; //num row
for (int j=d; j<d+(d*d); j++)
{
int idx1 = (j-d) % d; //num row
@@
-74,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] = 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[
i
];
+ 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++)
{
}
for (int j=d+d*d; j<dim; j++)
{
@@
-88,7
+95,7
@@
void Compute_Omega(double* X, double* Y, double* M, int* pn, int* pd, double* W)
g[j] -= Y[i] * X[mi(i,idx2,n,d)];
if (idx2 == idx3)
g[j] -= Y[i] * X[mi(i,idx1,n,d)];
g[j] -= Y[i] * X[mi(i,idx2,n,d)];
if (idx2 == idx3)
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[
i
];
+ g[j] += Y[i] * X[mi(i,idx1,n,d)]*X[mi(i,idx2,n,d)]*X[mi(i,idx3,n,d)] - M[
j
];
}
// Add 1/n t(gi) %*% gi to W
for (int j=0; j<dim; j++)
}
// Add 1/n t(gi) %*% gi to W
for (int j=0; j<dim; j++)