projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
few updates
[valse.git]
/
pkg
/
R
/
main.R
diff --git
a/pkg/R/main.R
b/pkg/R/main.R
index
2ae01e6
..
a2e5697
100644
(file)
--- a/
pkg/R/main.R
+++ b/
pkg/R/main.R
@@
-123,7
+123,7
@@
valse = function(X, Y, procedure='LassoMLE', selecMod='DDSE', gamma=1, mini=10,
data.frame(model=paste(i,".",seq_along(models),sep=""),
pen=sumPen/n, complexity=sumPen, contrast=LLH)
} ) )
data.frame(model=paste(i,".",seq_along(models),sep=""),
pen=sumPen/n, complexity=sumPen, contrast=LLH)
} ) )
-print(tableauRecap)
+
modSel = capushe::capushe(tableauRecap, n)
indModSel <-
if (selecMod == 'DDSE')
modSel = capushe::capushe(tableauRecap, n)
indModSel <-
if (selecMod == 'DDSE')
@@
-138,7
+138,7
@@
print(tableauRecap)
mod = as.character(tableauRecap[indModSel,1])
listMod = as.integer(unlist(strsplit(mod, "[.]")))
if (plot){
mod = as.character(tableauRecap[indModSel,1])
listMod = as.integer(unlist(strsplit(mod, "[.]")))
if (plot){
- print(plot_valse())
+ print(plot_valse(
models_list[[listMod[1]]][[listMod[2]]],n
))
}
models_list[[listMod[1]]][[listMod[2]]]
}
models_list[[listMod[1]]][[listMod[2]]]