prepare structure for R package
authorBenjamin Auder <benjamin.auder@somewhere>
Mon, 28 Nov 2016 17:04:45 +0000 (18:04 +0100)
committerBenjamin Auder <benjamin.auder@somewhere>
Mon, 28 Nov 2016 17:04:45 +0000 (18:04 +0100)
52 files changed:
DESCRIPTION [new file with mode: 0644]
OLD_MATLAB/InputParameters/basicInitParameters.m [moved from InputParameters/basicInitParameters.m with 100% similarity]
OLD_MATLAB/InputParameters/compileMex.m [moved from InputParameters/compileMex.m with 100% similarity]
OLD_MATLAB/InputParameters/generateIO.m [moved from InputParameters/generateIO.m with 100% similarity]
OLD_MATLAB/InputParameters/generateIOdefault.m [moved from InputParameters/generateIOdefault.m with 100% similarity]
OLD_MATLAB/InputParameters/grillelambda.m [moved from InputParameters/grillelambda.m with 100% similarity]
OLD_MATLAB/InputParameters/initSmallEM.m [moved from InputParameters/initSmallEM.m with 100% similarity]
OLD_MATLAB/InputParameters/selectiontotale.m [moved from InputParameters/selectiontotale.m with 100% similarity]
OLD_MATLAB/ProcLassoMLE/EMGLLF.m [moved from ProcLassoMLE/EMGLLF.m with 100% similarity]
OLD_MATLAB/ProcLassoMLE/compileMex.m [moved from ProcLassoMLE/compileMex.m with 100% similarity]
OLD_MATLAB/ProcLassoMLE/constructionModelesLassoMLE.m [moved from ProcLassoMLE/constructionModelesLassoMLE.m with 100% similarity]
OLD_MATLAB/ProcLassoRank/EMGrank.m [moved from ProcLassoRank/EMGrank.m with 100% similarity]
OLD_MATLAB/ProcLassoRank/compileMex.m [moved from ProcLassoRank/compileMex.m with 100% similarity]
OLD_MATLAB/ProcLassoRank/constructionModelesLassoRank.m [moved from ProcLassoRank/constructionModelesLassoRank.m with 100% similarity]
OLD_MATLAB/SelectModel/selectionModelesLassoMLE.m [moved from SelectModel/selectionModelesLassoMLE.m with 100% similarity]
OLD_MATLAB/SelectModel/selectionModelesLassoRank.m [moved from SelectModel/selectionModelesLassoRank.m with 100% similarity]
OLD_MATLAB/SelectModel/selectiondindice.m [moved from SelectModel/selectiondindice.m with 100% similarity]
OLD_MATLAB/SelectModel/selectionmodele.m [moved from SelectModel/selectionmodele.m with 100% similarity]
OLD_MATLAB/SelectModel/suppressionmodelesegaux.m [moved from SelectModel/suppressionmodelesegaux.m with 100% similarity]
OLD_MATLAB/SelectModel/suppressionmodelesegaux2.m [moved from SelectModel/suppressionmodelesegaux2.m with 100% similarity]
R/basicInitParameters.R [moved from InputParameters/basicInitParameters.R with 100% similarity]
R/generateIO.R [moved from InputParameters/generateIO.R with 100% similarity]
R/generateIOdefault.R [moved from InputParameters/generateIOdefault.R with 100% similarity]
R/gridLambda.R [moved from InputParameters/gridLambda.R with 100% similarity]
R/initSmallEM.R [moved from InputParameters/initSmallEM.R with 100% similarity]
R/main.R [moved from selmix.m with 99% similarity]
R/selectionindice.R [moved from SelectModel/selectionindice.R with 100% similarity]
R/selectionmodele.R [moved from SelectModel/selectionmodele.R with 100% similarity]
R/suppressionmodelesegaux.R [moved from SelectModel/suppressionmodelesegaux.R with 100% similarity]
R/suppressionmodelesegaux2.R [moved from SelectModel/suppressionmodelesegaux2.R with 100% similarity]
README.md
data/TODO [new file with mode: 0644]
man/TODO [new file with mode: 0644]
src/Makevars [new file with mode: 0644]
src/adapters/EMGLLF_interface.c [moved from ProcLassoMLE/EMGLLF_interface.c with 100% similarity]
src/adapters/EMGrank_interface.c [moved from ProcLassoRank/EMGrank_interface.c with 100% similarity]
src/adapters/constructionModelesLassoMLE_interface.c [moved from ProcLassoMLE/constructionModelesLassoMLE_interface.c with 100% similarity]
src/adapters/constructionModelesLassoRank_interface.c [moved from ProcLassoRank/constructionModelesLassoRank_interface.c with 100% similarity]
src/adapters/selectiontotale_interface.c [moved from InputParameters/selectiontotale_interface.c with 100% similarity]
src/sources/EMGLLF.c [moved from ProcLassoMLE/EMGLLF.c with 100% similarity]
src/sources/EMGLLF.h [moved from ProcLassoMLE/EMGLLF.h with 100% similarity]
src/sources/EMGrank.c [moved from ProcLassoRank/EMGrank.c with 100% similarity]
src/sources/EMGrank.h [moved from ProcLassoRank/EMGrank.h with 100% similarity]
src/sources/constructionModelesLassoMLE.c [moved from ProcLassoMLE/constructionModelesLassoMLE.c with 100% similarity]
src/sources/constructionModelesLassoMLE.h [moved from ProcLassoMLE/constructionModelesLassoMLE.h with 100% similarity]
src/sources/constructionModelesLassoRank.c [moved from ProcLassoRank/constructionModelesLassoRank.c with 100% similarity]
src/sources/constructionModelesLassoRank.h [moved from ProcLassoRank/constructionModelesLassoRank.h with 100% similarity]
src/sources/selectiontotale.c [moved from InputParameters/selectiontotale.c with 100% similarity]
src/sources/selectiontotale.h [moved from InputParameters/selectiontotale.h with 100% similarity]
src/sources/utils/ioutils.c [moved from Util/ioutils.c with 100% similarity]
src/sources/utils/ioutils.h [moved from Util/ioutils.h with 100% similarity]
src/sources/utils/omp_num_threads.h [moved from Util/omp_num_threads.h with 100% similarity]

diff --git a/DESCRIPTION b/DESCRIPTION
new file mode 100644 (file)
index 0000000..8902f1a
--- /dev/null
@@ -0,0 +1,13 @@
+Package: valse
+Title: Variable selection with mixture of models
+Date: 2016-12-01
+Version: 0.1-0
+Description: TODO
+Authors@R: c( person("Benjamin Auder", "Developer", role=c("ctb","cre"), email="Benjamin.Auder@math.u-psud.fr"),
+       person("Benjamin Goehry", "User", role="aut", email = "Benjamin.Goehry@math.u-psud.fr"),
+       person("Emilie Devijver", "User", role="ctb", email = "Emilie.Devijver@kuleuven.be"))
+Depends:
+    R (>= 2.15)
+LazyData: yes
+URL: http://git.auder.net/?p=valse.git
+License: MIT
similarity index 100%
rename from InputParameters/generateIO.R
rename to R/generateIO.R
similarity index 100%
rename from InputParameters/gridLambda.R
rename to R/gridLambda.R
similarity index 99%
rename from selmix.m
rename to R/main.R
index a4bea19..b5b5144 100644 (file)
--- a/selmix.m
+++ b/R/main.R
@@ -1,3 +1,5 @@
+## TODO: turn this code into R
+
 classdef selmix < handle
     
     properties (SetAccess = private)
index b48c505..ada56d8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,53 +1,7 @@
-# model SELECTion
+# VAriable seLection with mixtureS of modEls
 
-This code is the applied part of the PhD thesis of [Emilie Devijver](http://www.math.u-psud.fr/~devijver/).
+This code is the applied part of the PhD thesis of [Benjamin Gohehry](http://www.math.u-psud.fr/~goehry/).
 
 ## Description
 
-The function selmix delivers a multivariate Gaussian mixture in regression model collection. 
-According to the parameter estimation, we can compute classical model selection criterion, as BIC or AIC, or slope heuristic, using the CAPUSHE package. 
-The methodology used is described in 'Model-Based Clustering for High-Dimensional Data. Application to Functional Data.', 
-available at [this location](https://hal.archives-ouvertes.fr/hal-01060063)
-
-## Arguments
-
-Regressors, denoted by X (of size n x p) and responses, denoted by Y (of size n x q) are must-have arguments. 
-
-Optionally, we could add
-
-* gamma: weight power in the Lasso penalty (according to Stadler et al., $\gamma \in \{0,1/2,1\}$;
-* mini: the minimum number of iterations;
-* maxi: the maximum number of iterations;
-* tau: the threshold for stopping EM algorithm;
-* kmin and kmax: the bounds of interesting number of components,
-* rangmin and rangmax: the bounds of interesting rank values.
-
-## Usage
-
-       objet = selmix(X,Y)
-       objet.run(index)
-
-For index=1, it computes the Lasso-MLE procedure.
-For index=2, it computes the Lasso-Rank procedure.
-
-/!\ Be careful to the current path /!\
-
-## Values
-
-* phiInit, rhoInit, piInit, gamInit: the initialization of the matrices phi, rho, pi and gamma,
-* gridLambda: grid of regularization parameters used to select relevant variables (if kmax-kmin=0, it is, if not, it is the last grid of regularization parameters)
-* A1,A2: indices of variables selected or not selected (matrices of size (p+1) x q x size(gridLambda))
-* Phi,Rho,Pi: estimations of each parameter thanks to the procedure LassoMLE if compute index=1, and thanks to the procedure LassoRank if computed index=2.
-
-
-## Example
-
-       n=10;
-       p=10;
-       q=5;
-       X=randn(n,p);
-       Y=randn(n,q);
-
-       objet=selmix(X,Y);
-       objet.run(1);
-       objet.run(2);
+TODO : see R package
diff --git a/data/TODO b/data/TODO
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/man/TODO b/man/TODO
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/Makevars b/src/Makevars
new file mode 100644 (file)
index 0000000..aa08234
--- /dev/null
@@ -0,0 +1,7 @@
+PKG_CFLAGS=-g -I.
+
+PKG_LIBS=-lm
+
+SOURCES = $(wildcard adapters/*.c sources/*.c sources/utils/*.c)
+
+OBJECTS = $(SOURCES:.c=.o)
similarity index 100%
rename from ProcLassoMLE/EMGLLF.c
rename to src/sources/EMGLLF.c
similarity index 100%
rename from ProcLassoMLE/EMGLLF.h
rename to src/sources/EMGLLF.h
similarity index 100%
rename from Util/ioutils.c
rename to src/sources/utils/ioutils.c
similarity index 100%
rename from Util/ioutils.h
rename to src/sources/utils/ioutils.h