projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
R package can now be installed (compilation OK)
[valse.git]
/
src
/
sources
/
EMGrank.c
diff --git
a/src/sources/EMGrank.c
b/src/sources/EMGrank.c
index
2e85ce6
..
0791892
100644
(file)
--- a/
src/sources/EMGrank.c
+++ b/
src/sources/EMGrank.c
@@
-1,5
+1,6
@@
-#include
"EMGrank.h"
+#include
<stdlib.h>
#include <gsl/gsl_linalg.h>
#include <gsl/gsl_linalg.h>
+#include "utils.h"
// Compute pseudo-inverse of a square matrix
static double* pinv(const double* matrix, int dim)
// Compute pseudo-inverse of a square matrix
static double* pinv(const double* matrix, int dim)
@@
-37,7
+38,7
@@
static double* pinv(const double* matrix, int dim)
}
// TODO: comment EMGrank purpose
}
// TODO: comment EMGrank purpose
-void EMGrank(
+void EMGrank
_core
(
// IN parameters
const double* Pi, // parametre de proportion
const double* Rho, // parametre initial de variance renormalisé
// IN parameters
const double* Pi, // parametre de proportion
const double* Rho, // parametre initial de variance renormalisé
@@
-82,8
+83,7
@@
void EMGrank(
int* Z = (int*)calloc(n, sizeof(int));
//Initialize phi to zero, because some M loops might exit before phi affectation
int* Z = (int*)calloc(n, sizeof(int));
//Initialize phi to zero, because some M loops might exit before phi affectation
- for (int i=0; i<p*m*k; i++)
- phi[i] = 0.0;
+ zeroArray(phi, p*m*k);
while (ite<mini || (ite<maxi && sumDeltaPhi>tau))
{
while (ite<mini || (ite<maxi && sumDeltaPhi>tau))
{