mirror of
https://github.com/prise6/aVirtualTwins.git
synced 2024-06-18 03:05:00 +02:00
Fix list bug
This commit is contained in:
parent
12e4ab74fd
commit
263e1d6d22
|
@ -26,12 +26,12 @@ vt.forest <- function(forest.type = "one", vt.data, interactions = T, method = "
|
||||||
|
|
||||||
params <- list(...)
|
params <- list(...)
|
||||||
if (forest.type == "one"){
|
if (forest.type == "one"){
|
||||||
if(! "rf" %in% names(params) ){
|
if(! "model" %in% names(params) ){
|
||||||
rf <- randomForest(x = vt.data$getX(interactions = interactions, trt = NULL),
|
rf <- randomForest(x = vt.data$getX(interactions = interactions, trt = NULL),
|
||||||
y = vt.data$getY(),
|
y = vt.data$getY(),
|
||||||
...)
|
...)
|
||||||
} else{
|
} else{
|
||||||
rf <- params["rf"]
|
rf <- params[["model"]]
|
||||||
}
|
}
|
||||||
|
|
||||||
vt.difft <- VT.forest.one(vt.object = vt.data, model = rf, interactions = interactions, method = method)
|
vt.difft <- VT.forest.one(vt.object = vt.data, model = rf, interactions = interactions, method = method)
|
||||||
|
@ -41,19 +41,19 @@ vt.forest <- function(forest.type = "one", vt.data, interactions = T, method = "
|
||||||
y = vt.data$getY(1),
|
y = vt.data$getY(1),
|
||||||
...)
|
...)
|
||||||
} else
|
} else
|
||||||
rf_trt1 <- params["model_trt1"]
|
rf_trt1 <- params[["model_trt1"]]
|
||||||
|
|
||||||
if(! "model_trt0" %in% names(params) ){
|
if(! "model_trt0" %in% names(params) ){
|
||||||
rf_trt0 <- randomForest(x = vt.data$getX(trt = 1, interactions = interactions),
|
rf_trt0 <- randomForest(x = vt.data$getX(trt = 1, interactions = interactions),
|
||||||
y = vt.data$getY(1),
|
y = vt.data$getY(1),
|
||||||
...)
|
...)
|
||||||
} else
|
} else
|
||||||
rf_trt0 <- params["rf_trt0"]
|
rf_trt0 <- params[["model_trt0"]]
|
||||||
|
|
||||||
vt.difft <- VT.forest.double(vt.object = vt.data, model_trt1 = rf_trt1, model_trt0 = rf_trt0, method = method, ...)
|
vt.difft <- VT.forest.double(vt.object = vt.data, model_trt1 = rf_trt1, model_trt0 = rf_trt0, method = method)
|
||||||
} else if (forest.type == "fold"){
|
} else if (forest.type == "fold"){
|
||||||
fold <- ifelse(! "fold" %in% names(params) , 5, params["fold"])
|
fold <- ifelse(! "fold" %in% names(params) , 5, as.numeric(params["fold"]))
|
||||||
fold <- ifelse(! "ratio" %in% names(params) , 1, params["ratio"])
|
ratio <- ifelse(! "ratio" %in% names(params) , 1, as.numeric(params["ratio"]))
|
||||||
vt.difft <- aVirtualTwins:::VT.forest.fold(vt.object = vt.data, fold = fold, ratio = ratio,
|
vt.difft <- aVirtualTwins:::VT.forest.fold(vt.object = vt.data, fold = fold, ratio = ratio,
|
||||||
interactions = interactions, method = method)
|
interactions = interactions, method = method)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue