X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=pkg%2FR%2FgenerateXY.R;h=fde4b0f3148c8f7980aee803e53fcce2710e674b;hp=d2e00ef81eb6fac6061326a3993fc7f11c96f947;hb=8b28401096c8f1b95a4d83b34b47548ae1b2a425;hpb=0e4d86a2918d9bf9a8e59dcc82606db89ab8b02b

diff --git a/pkg/R/generateXY.R b/pkg/R/generateXY.R
index d2e00ef..fde4b0f 100644
--- a/pkg/R/generateXY.R
+++ b/pkg/R/generateXY.R
@@ -3,26 +3,26 @@
 #' Generate a sample of (X,Y) of size n
 #'
 #' @param n sample size
-#' @param p proportion for each cluster
+#' @param prop proportion for each cluster
 #' @param meanX matrix of group means for covariates (of size p)
 #' @param covX covariance for covariates (of size p*p)
 #' @param beta regression matrix, of size p*m*k
-#' @param covY covariance for the response vector (of size m*m*K)
+#' @param covY covariance for the response vector (of size m*m)
 #'
 #' @return list with X and Y
 #'
 #' @export
-generateXY <- function(n, p, meanX, beta, covX, covY)
+generateXY <- function(n, prop, meanX, beta, covX, covY)
 {
   p <- dim(covX)[1]
   m <- dim(covY)[1]
-  k <- dim(covY)[3]
+  k <- dim(beta)[3]
 
   X <- matrix(nrow = 0, ncol = p)
   Y <- matrix(nrow = 0, ncol = m)
 
   # random generation of the size of each population in X~Y (unordered)
-  sizePop <- stats::rmultinom(1, n, p)
+  sizePop <- stats::rmultinom(1, n, prop)
   class <- c() #map i in 1:n --> index of class in 1:k
 
   for (i in 1:k)
@@ -31,7 +31,7 @@ generateXY <- function(n, p, meanX, beta, covX, covY)
     newBlockX <- MASS::mvrnorm(sizePop[i], meanX, covX)
     X <- rbind(X, newBlockX)
     Y <- rbind(Y, t(apply(newBlockX, 1, function(row) MASS::mvrnorm(1, row %*%
-      beta[, , i], covY[, , i]))))
+      beta[, , i], covY[,]))))
   }
 
   shuffle <- sample(n)