From: emilie <emilie@devijver.org>
Date: Thu, 16 Mar 2017 16:27:09 +0000 (+0100)
Subject: update biblio
X-Git-Url: https://git.auder.net/variants/%24%7Bvname%7D/current/app_dev.php?a=commitdiff_plain;h=610cfd0d7ee1061c884583c8f3f456b246eadbf8;p=valse.git

update biblio
---

diff --git a/.gitattributes b/.gitattributes
index 37e13e5..9a4addf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,8 @@
 *.png filter=fat
 *.jpg filter=fat
 *.ps filter=fat
+*.pdf filter=fat
+*.tar.xz filter=fat
+*.png filter=fat
+*.jpg filter=fat
+*.ps filter=fat
diff --git a/biblio/Sparse_Variable_Model_Selection-Devijver2014.pdf b/biblio/Sparse_Variable_Model_Selection-Devijver2014.pdf
deleted file mode 100644
index aa2cd4d..0000000
--- a/biblio/Sparse_Variable_Model_Selection-Devijver2014.pdf
+++ /dev/null
@@ -1 +0,0 @@
-#$# git-fat cfe2746476d82691a70ac9243b737e0dd6816e4b               284568
diff --git a/biblio/These_Emilie.pdf b/biblio/These_Emilie.pdf
deleted file mode 100644
index 47bd562..0000000
--- a/biblio/These_Emilie.pdf
+++ /dev/null
@@ -1 +0,0 @@
-#$# git-fat 7f07727d66d742a124d6529eef942c2382d44673              3764608
diff --git a/biblio/articleMethodeDevijverADAC.pdf b/biblio/articleMethodeDevijverADAC.pdf
new file mode 100644
index 0000000..9aad91e
--- /dev/null
+++ b/biblio/articleMethodeDevijverADAC.pdf
@@ -0,0 +1 @@
+#$# git-fat 31158da74f93ba8b9e3883e8d4173e2da02255cf              1930037
diff --git a/biblio/these_Emilie.pdf b/biblio/these_Emilie.pdf
new file mode 100644
index 0000000..1262e1d
--- /dev/null
+++ b/biblio/these_Emilie.pdf
@@ -0,0 +1 @@
+#$# git-fat c89e92fb27bcb2c94bc0eddb2af5e724ff676b9a              2049044
diff --git a/pkg/R/selectiontotale.R b/pkg/R/selectiontotale.R
index 5b0112c..042c70b 100644
--- a/pkg/R/selectiontotale.R
+++ b/pkg/R/selectiontotale.R
@@ -37,7 +37,7 @@ 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]
-      selectedVariables[[lambdaIndex]] = lapply(1:p, function(j) {
+      selectedVariables[[lambdaIndex]] = sapply(1:p, function(j) {
         #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 ) ]