projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
essaiPlot almost ok : add a color per cluster? For now, it is a script
[valse.git]
/
pkg
/
R
/
selectiontotale.R
diff --git
a/pkg/R/selectiontotale.R
b/pkg/R/selectiontotale.R
index
042c70b
..
7209fed
100644
(file)
--- a/
pkg/R/selectiontotale.R
+++ b/
pkg/R/selectiontotale.R
@@
-29,6
+29,7
@@
selectiontotale = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambd
selectedVariables = list()
Rho = list()
Pi = list()
selectedVariables = list()
Rho = list()
Pi = list()
+ cpt = 0
#Pour chaque lambda de la grille, on calcule les coefficients
for (lambdaIndex in 1:length(glambda)){
print(lambdaIndex)
#Pour chaque lambda de la grille, on calcule les coefficients
for (lambdaIndex in 1:length(glambda)){
print(lambdaIndex)
@@
-37,13
+38,16
@@
selectiontotale = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambd
p = dim(phiInit)[1]
m = dim(phiInit)[2]
#selectedVariables: list where element j contains vector of selected variables in [1,m]
p = dim(phiInit)[1]
m = dim(phiInit)[2]
#selectedVariables: list where element j contains vector of selected variables in [1,m]
- selectedVariables[[lambdaIndex]] = sapply(1:p, function(j) {
+ if (sum(params$phi) != 0){
+ cpt = cpt+1
+ selectedVariables[[cpt]] = sapply(1:p, function(j) {
#from boolean matrix mxk of selected variables obtain the corresponding boolean m-vector,
#and finally return the corresponding indices
#from boolean matrix mxk of selected variables obtain the corresponding boolean m-vector,
#and finally return the corresponding indices
- seq_len(m)[ apply( abs(params$phi[j,,]) > thresh, 1, any ) ]
+ c(seq_len(m)[ apply( abs(params$phi[j,,]) > thresh, 1, any ) ], rep(0, m-length(seq_len(m)[ apply( abs(params$phi[j,,]) > thresh, 1, any ) ] ) ))
})
})
- Rho[[lambdaIndex]] = params$Rho
- Pi[[lambdaIndex]] = params$Pi
+ Rho[[cpt]] = params$rho
+ Pi[[cpt]] = params$pi
+ }
}
list("selected"=selectedVariables,"Rho"=Rho,"Pi"=Pi)
}
}
list("selected"=selectedVariables,"Rho"=Rho,"Pi"=Pi)
}