projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix valse pkg functions callings in src/test/generate
[valse.git]
/
src
/
test
/
generate_test_data
/
helpers
/
EMGrank.R
diff --git
a/src/test/generate_test_data/helpers/EMGrank.R
b/src/test/generate_test_data/helpers/EMGrank.R
index
e34e0be
..
a1e3df7
100644
(file)
--- a/
src/test/generate_test_data/helpers/EMGrank.R
+++ b/
src/test/generate_test_data/helpers/EMGrank.R
@@
-1,4
+1,3
@@
-source("/home/goehry/Documents/valse/valse/R/vec_bin.R")
require(MASS)
EMGrank = function(Pi, Rho, mini, maxi, X, Y, tau, rank){
#matrix dimensions
require(MASS)
EMGrank = function(Pi, Rho, mini, maxi, X, Y, tau, rank){
#matrix dimensions
@@
-24,7
+23,7
@@
EMGrank = function(Pi, Rho, mini, maxi, X, Y, tau, rank){
while(ite<=mini || (ite<=maxi && sumDeltaPhi>tau)){
#M step: Mise à jour de Beta (et donc phi)
for(r in 1:k){
while(ite<=mini || (ite<=maxi && sumDeltaPhi>tau)){
#M step: Mise à jour de Beta (et donc phi)
for(r in 1:k){
- Z_bin = vec_bin(Z,r)
+ Z_bin = v
alse:::v
ec_bin(Z,r)
Z_vec = Z_bin$vec #vecteur 0 et 1 aux endroits o? Z==r
Z_indice = Z_bin$indice
if(sum(Z_indice) == 0){
Z_vec = Z_bin$vec #vecteur 0 et 1 aux endroits o? Z==r
Z_indice = Z_bin$indice
if(sum(Z_indice) == 0){
@@
-82,4
+81,4
@@
EMGrank = function(Pi, Rho, mini, maxi, X, Y, tau, rank){
}
return(list(phi=phi, LLF=LLF))
}
return(list(phi=phi, LLF=LLF))
-}
\ No newline at end of file
+}