X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=src%2Ftest%2Fgenerate_test_data%2Fhelpers%2FEMGrank.R;h=a1e3df7df5bf178f398faa4ede76ffa2f9e9c565;hp=e34e0beb226677c65d4e399a7e9ba15229e23f4c;hb=9ade3f1b66fa07ad9f1a3b09fc05462c783841de;hpb=c3b2c1ab166494627b3b41f309fd747e1df61aa2 diff --git a/src/test/generate_test_data/helpers/EMGrank.R b/src/test/generate_test_data/helpers/EMGrank.R index e34e0be..a1e3df7 100644 --- 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 @@ -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){ - Z_bin = vec_bin(Z,r) + Z_bin = valse:::vec_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){ @@ -82,4 +81,4 @@ EMGrank = function(Pi, Rho, mini, maxi, X, Y, tau, rank){ } return(list(phi=phi, LLF=LLF)) -} \ No newline at end of file +}