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
/
constructionModelesLassoRank.c
diff --git
a/src/sources/constructionModelesLassoRank.c
b/src/sources/constructionModelesLassoRank.c
index
eaa83c4
..
e7712a9
100644
(file)
--- a/
src/sources/constructionModelesLassoRank.c
+++ b/
src/sources/constructionModelesLassoRank.c
@@
-1,11
+1,11
@@
-#include "EMGrank.h"
-#include "constructionModelesLassoRank.h"
-#include <gsl/gsl_linalg.h>
+#include <stdlib.h>
#include <omp.h>
#include <omp.h>
-#include "omp_num_threads.h"
+#include <gsl/gsl_linalg.h>
+#include "EMGrank.h"
+#include "utils.h"
// TODO: comment on constructionModelesLassoRank purpose
// TODO: comment on constructionModelesLassoRank purpose
-void constructionModelesLassoRank(
+void constructionModelesLassoRank
_core
(
// IN parameters
const double* Pi,// parametre initial des proportions
const double* Rho, // parametre initial de variance renormalisé
// IN parameters
const double* Pi,// parametre initial des proportions
const double* Rho, // parametre initial de variance renormalisé
@@
-96,10
+96,10
@@
for (int r=0; r<k; r++)
for (int v=0; v<m; v++)
{
for (int r=0; r<k; r++)
for (int v=0; v<m; v++)
{
for (int r=0; r<k; r++)
- RhoLambda[ai(u
u
,v,r,m,m,k)] = Rho[ai4(u,v,r,lambdaIndex,m,m,k,L)];
+ RhoLambda[ai(u,v,r,m,m,k)] = Rho[ai4(u,v,r,lambdaIndex,m,m,k,L)];
}
}
}
}
- EMGrank(PiLambda,RhoLambda,mini,maxi,Xactive,Y,tau,rank,
+ EMGrank
_core
(PiLambda,RhoLambda,mini,maxi,Xactive,Y,tau,rank,
phiLambda,&LLF,
n,longueurActive,m,k);
free(rank);
phiLambda,&LLF,
n,longueurActive,m,k);
free(rank);