Skip to content

Rename abstract methods #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 14, 2022
Merged

Rename abstract methods #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f021c5d
rename abstract method ml_nuisance_and_score_elements into nuisance_est
MalteKurz Jun 13, 2022
b021210
rename abstract method ml_nuisance_tuning into nuisance_tuning
MalteKurz Jun 13, 2022
2379930
update oop figure
MalteKurz Jun 13, 2022
8efd9a4
Merge branch 'master' of github.com:DoubleML/doubleml-for-r into m-re…
MalteKurz Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions R/double_ml.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ DoubleML = R6Class("DoubleML",
}

# ml estimation of nuisance models and computation of psi elements
res = private$ml_nuisance_and_score_elements(private$get__smpls())
res = private$nuisance_est(private$get__smpls())
private$psi_a_[, private$i_rep, private$i_treat] = res$psi_a
private$psi_b_[, private$i_rep, private$i_treat] = res$psi_b
if (store_predictions) {
Expand Down Expand Up @@ -814,7 +814,7 @@ DoubleML = R6Class("DoubleML",
if (tune_on_folds) {
for (i_rep in 1:self$n_rep) {
private$i_rep = i_rep
param_tuning = private$ml_nuisance_tuning(
param_tuning = private$nuisance_tuning(
private$get__smpls(),
param_set, tune_settings, tune_on_folds)
private$tuning_res_[[i_treat]][[i_rep]] = param_tuning
Expand All @@ -833,7 +833,7 @@ DoubleML = R6Class("DoubleML",
}
} else {
private$i_rep = 1
param_tuning = private$ml_nuisance_tuning(
param_tuning = private$nuisance_tuning(
private$get__smpls(),
param_set, tune_settings, tune_on_folds)
private$tuning_res_[[i_treat]] = param_tuning
Expand Down
4 changes: 2 additions & 2 deletions R/double_ml_iivm.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ DoubleMLIIVM = R6Class("DoubleMLIIVM",
"ml_r1" = nuisance)
invisible(self)
},
ml_nuisance_and_score_elements = function(smpls, ...) {
nuisance_est = function(smpls, ...) {

if (self$subgroups$always_takers == FALSE &
self$subgroups$never_takers == FALSE) {
Expand Down Expand Up @@ -396,7 +396,7 @@ DoubleMLIIVM = R6Class("DoubleMLIIVM",
}
return(psis)
},
ml_nuisance_tuning = function(smpls, param_set, tune_settings,
nuisance_tuning = function(smpls, param_set, tune_settings,
tune_on_folds, ...) {

if (!tune_on_folds) {
Expand Down
4 changes: 2 additions & 2 deletions R/double_ml_irm.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ DoubleMLIRM = R6Class("DoubleMLIRM",
"ml_m" = nuisance)
invisible(self)
},
ml_nuisance_and_score_elements = function(smpls, ...) {
nuisance_est = function(smpls, ...) {

cond_smpls = get_cond_samples(
smpls,
Expand Down Expand Up @@ -303,7 +303,7 @@ DoubleMLIRM = R6Class("DoubleMLIRM",
}
return(psis)
},
ml_nuisance_tuning = function(smpls, param_set, tune_settings,
nuisance_tuning = function(smpls, param_set, tune_settings,
tune_on_folds, ...) {

if (!tune_on_folds) {
Expand Down
28 changes: 14 additions & 14 deletions R/double_ml_pliv.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,22 +444,22 @@ DoubleMLPLIV = R6Class("DoubleMLPLIV",
names(private$params_) = param_names
invisible(self)
},
ml_nuisance_and_score_elements = function(smpls, ...) {
nuisance_est = function(smpls, ...) {
if (self$partialX & !self$partialZ) {
res = private$ml_nuisance_and_score_elements_partialX(smpls, ...)
res = private$nuisance_est_partialX(smpls, ...)

} else if (!self$partialX & self$partialZ) {
res = private$ml_nuisance_and_score_elements_partialZ(smpls, ...)
res = private$nuisance_est_partialZ(smpls, ...)

} else if (self$partialX & self$partialZ) {
res = private$ml_nuisance_and_score_elements_partialXZ(smpls, ...)
res = private$nuisance_est_partialXZ(smpls, ...)

}

return(res)
},

ml_nuisance_and_score_elements_partialX = function(smpls, ...) {
nuisance_est_partialX = function(smpls, ...) {

l_hat = dml_cv_predict(self$learner$ml_l,
c(self$data$x_cols, self$data$other_treat_cols),
Expand Down Expand Up @@ -602,7 +602,7 @@ DoubleMLPLIV = R6Class("DoubleMLPLIV",
}
return(psis)
},
ml_nuisance_and_score_elements_partialXZ = function(smpls, ...) {
nuisance_est_partialXZ = function(smpls, ...) {

l_hat = dml_cv_predict(self$learner$ml_l,
c(self$data$x_cols, self$data$other_treat_cols),
Expand Down Expand Up @@ -674,7 +674,7 @@ DoubleMLPLIV = R6Class("DoubleMLPLIV",
return(res)
},

ml_nuisance_and_score_elements_partialZ = function(smpls, ...) {
nuisance_est_partialZ = function(smpls, ...) {

# nuisance r

Expand Down Expand Up @@ -712,22 +712,22 @@ DoubleMLPLIV = R6Class("DoubleMLPLIV",
},


ml_nuisance_tuning = function(smpls, param_set, tune_settings,
nuisance_tuning = function(smpls, param_set, tune_settings,
tune_on_folds, ...) {
if (self$partialX & !self$partialZ) {
res = private$ml_nuisance_tuning_partialX(
res = private$nuisance_tuning_partialX(
smpls, param_set,
tune_settings,
tune_on_folds, ...)

} else if (!self$partialX & self$partialZ) {
res = private$ml_nuisance_tuning_partialZ(
res = private$nuisance_tuning_partialZ(
smpls, param_set,
tune_settings,
tune_on_folds, ...)

} else if (self$partialX & self$partialZ) {
res = private$ml_nuisance_tuning_partialXZ(
res = private$nuisance_tuning_partialXZ(
smpls, param_set,
tune_settings,
tune_on_folds, ...)
Expand All @@ -736,7 +736,7 @@ DoubleMLPLIV = R6Class("DoubleMLPLIV",
return(res)
},

ml_nuisance_tuning_partialX = function(smpls, param_set,
nuisance_tuning_partialX = function(smpls, param_set,
tune_settings, tune_on_folds, ...) {

if (!tune_on_folds) {
Expand Down Expand Up @@ -892,7 +892,7 @@ DoubleMLPLIV = R6Class("DoubleMLPLIV",

},

ml_nuisance_tuning_partialXZ = function(smpls, param_set,
nuisance_tuning_partialXZ = function(smpls, param_set,
tune_settings, tune_on_folds, ...) {

if (!tune_on_folds) {
Expand Down Expand Up @@ -968,7 +968,7 @@ DoubleMLPLIV = R6Class("DoubleMLPLIV",
return(tuning_result)
},

ml_nuisance_tuning_partialZ = function(smpls, param_set,
nuisance_tuning_partialZ = function(smpls, param_set,
tune_settings, tune_on_folds, ...) {
if (!tune_on_folds) {
data_tune_list = list(self$data$data_model)
Expand Down
4 changes: 2 additions & 2 deletions R/double_ml_plr.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ DoubleMLPLR = R6Class("DoubleMLPLR",
invisible(self)
},

ml_nuisance_and_score_elements = function(smpls, ...) {
nuisance_est = function(smpls, ...) {

l_hat = dml_cv_predict(self$learner$ml_l,
c(self$data$x_cols, self$data$other_treat_cols),
Expand Down Expand Up @@ -459,7 +459,7 @@ DoubleMLPLR = R6Class("DoubleMLPLR",
}
return(psis)
},
ml_nuisance_tuning = function(smpls, param_set, tune_settings,
nuisance_tuning = function(smpls, param_set, tune_settings,
tune_on_folds, ...) {

if (!tune_on_folds) {
Expand Down
Loading