projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
few details
[valse.git]
/
R
/
valse.R
diff --git
a/R/valse.R
b/R/valse.R
index
e5205a5
..
f84c2c5
100644
(file)
--- a/
R/valse.R
+++ b/
R/valse.R
@@
-40,15
+40,13
@@
valse = function(X,Y,procedure,selecMod,gamma = 1,mini = 10,
piInit <<- init$piInit
gamInit <<- init$gamInit
piInit <<- init$piInit
gamInit <<- init$gamInit
- gridLambda <<- gridLambda(phiInit, rhoInit, piInit,
tau
Init, X, Y, gamma, mini, maxi, eps)
+ gridLambda <<- gridLambda(phiInit, rhoInit, piInit,
gam
Init, X, Y, gamma, mini, maxi, eps)
print("Compute relevant parameters")
#select variables according to each regularization parameter
#from the grid: A1 corresponding to selected variables, and
#A2 corresponding to unselected variables.
print("Compute relevant parameters")
#select variables according to each regularization parameter
#from the grid: A1 corresponding to selected variables, and
#A2 corresponding to unselected variables.
- params = selectiontotale(phiInit,rhoInit,piInit,tauInit,
- mini,maxi,gamma,gridLambda,
- X,Y,thresh,eps)
+ params = selectiontotale(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,gridLambda,X,Y,1e-8,eps)
A1 <<- params$A1
A2 <<- params$A2
Rho <<- params$Rho
A1 <<- params$A1
A2 <<- params$A2
Rho <<- params$Rho