X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=R%2FdiscardSimilarModels.R;h=5f6a8c8e3f3a37aa64491030e4b9fdedaf89d89e;hp=29d8f10a8eeaa789ced06a14cecdc24a7d2834ce;hb=ef67d338c7f28ba041abe40ca9a8ab69f8365a90;hpb=c3bc47052f3ccb659659c59a82e9a99ea842398d

diff --git a/R/discardSimilarModels.R b/R/discardSimilarModels.R
index 29d8f10..5f6a8c8 100644
--- a/R/discardSimilarModels.R
+++ b/R/discardSimilarModels.R
@@ -1,4 +1,4 @@
-#' Discard models which have the same relevant variables
+#' Discard models which have the same relevant variables - for EMGLLF
 #'
 #' @param B1 array of relevant coefficients (of size p*m*length(gridlambda))
 #' @param B2 array of irrelevant coefficients (of size p*m*length(gridlambda))
@@ -9,7 +9,7 @@
 #' @return a list with update B1, B2, glambda, rho and pi, and ind the vector of indices
 #'	of selected models.
 #' @export
-discardSimilarModels = function(B1,B2,glambda,rho,pi)
+discardSimilarModels_EMGLLF = function(B1,B2,glambda,rho,pi)
 {
 	ind = c()
 	for (j in 1:length(glambda))
@@ -27,5 +27,27 @@ discardSimilarModels = function(B1,B2,glambda,rho,pi)
 	rho = rho[,,,-ind] 
 	pi = pi[,-ind]
 
-	return (list(B1=B1,B2=B2,glambda=glambda,rho=rho,pi=pi,ind=ind))
+	return (list("B1"=B1,"B2"=B2,"glambda"=glambda,"rho"=rho,"pi"=pi,"ind"=ind))
+}
+
+#' Discard models which have the same relevant variables
+#'   - for Lasso-rank procedure (focus on columns)
+#'
+#' @param B1 array of relevant coefficients (of size p*m*length(gridlambda))
+#' @param rho covariance matrix
+#' @param pi weight parameters
+#'
+#' @return a list with B1, in, rho, pi
+#' @export
+discardSimilarModels_EMGrank = function(B1,rho,pi)
+{
+	ind = c()
+	dim_B1 = dim(B1)
+	B2 = array(0,dim=c(dim_B1[1],dim_B1[2],dim_B1[3]))
+	sizeLambda=dim_B1[3]
+	glambda = rep(0,sizeLambda)
+
+	suppressmodel = discardSimilarModels_EMGLLF(B1,B2,glambda,rho,pi)
+	return (list("B1" = suppressmodel$B1, "ind" = suppressmodel$ind,
+		"rho" = suppressmodel$rho, "pi" = suppressmodel$pi))
 }