about to fix pd backend api

ropensci · Sep 30, 2023 · ba30364 · ba30364
1 parent 4a1b7cf
commit ba30364
Show file tree

Hide file tree

Showing 15 changed files with 50,353 additions and 147 deletions.
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -13,7 +13,7 @@ compute_cstat_exported_uvec <- function(y, w, g, pred_is_risklike) {
     .Call(`_aorsf_compute_cstat_exported_uvec`, y, w, g, pred_is_risklike)
 }
 
-orsf_cpp <- function(x, y, w, tree_type_R, tree_seeds, loaded_forest, lincomb_R_function, oobag_R_function, n_tree, mtry, vi_type_R, vi_max_pvalue, leaf_min_events, leaf_min_obs, split_rule_R, split_min_events, split_min_obs, split_min_stat, split_max_cuts, split_max_retry, lincomb_type_R, lincomb_eps, lincomb_iter_max, lincomb_scale, lincomb_alpha, lincomb_df_target, lincomb_ties_method, pred_mode, pred_type_R, pred_horizon, pred_aggregate, oobag, oobag_eval_type_R, oobag_eval_every, n_thread, write_forest, run_forest, verbosity) {
-    .Call(`_aorsf_orsf_cpp`, x, y, w, tree_type_R, tree_seeds, loaded_forest, lincomb_R_function, oobag_R_function, n_tree, mtry, vi_type_R, vi_max_pvalue, leaf_min_events, leaf_min_obs, split_rule_R, split_min_events, split_min_obs, split_min_stat, split_max_cuts, split_max_retry, lincomb_type_R, lincomb_eps, lincomb_iter_max, lincomb_scale, lincomb_alpha, lincomb_df_target, lincomb_ties_method, pred_mode, pred_type_R, pred_horizon, pred_aggregate, oobag, oobag_eval_type_R, oobag_eval_every, n_thread, write_forest, run_forest, verbosity)
+orsf_cpp <- function(x, y, w, tree_type_R, tree_seeds, loaded_forest, lincomb_R_function, oobag_R_function, n_tree, mtry, vi_type_R, vi_max_pvalue, leaf_min_events, leaf_min_obs, split_rule_R, split_min_events, split_min_obs, split_min_stat, split_max_cuts, split_max_retry, lincomb_type_R, lincomb_eps, lincomb_iter_max, lincomb_scale, lincomb_alpha, lincomb_df_target, lincomb_ties_method, pred_mode, pred_type_R, pred_horizon, pred_aggregate, oobag, oobag_eval_type_R, oobag_eval_every, pd_type_R, pd_vals, pd_cols, pd_probs, n_thread, write_forest, run_forest, verbosity) {
+    .Call(`_aorsf_orsf_cpp`, x, y, w, tree_type_R, tree_seeds, loaded_forest, lincomb_R_function, oobag_R_function, n_tree, mtry, vi_type_R, vi_max_pvalue, leaf_min_events, leaf_min_obs, split_rule_R, split_min_events, split_min_obs, split_min_stat, split_max_cuts, split_max_retry, lincomb_type_R, lincomb_eps, lincomb_iter_max, lincomb_scale, lincomb_alpha, lincomb_df_target, lincomb_ties_method, pred_mode, pred_type_R, pred_horizon, pred_aggregate, oobag, oobag_eval_type_R, oobag_eval_every, pd_type_R, pd_vals, pd_cols, pd_probs, n_thread, write_forest, run_forest, verbosity)
 }
 
diff --git a/R/orsf.R b/R/orsf.R
@@ -758,6 +758,10 @@ orsf <- function(data,
                                                  'cstat' = 1,
                                                  'user' = 2),
                       oobag_eval_every = oobag_eval_every,
+                      pd_type_R = 0,
+                      pd_vals = matrix(0, ncol=1, nrow=1),
+                      pd_cols = matrix(1L, ncol=1, nrow=1),
+                      pd_probs = c(0),
                       n_thread = n_thread,
                       write_forest = TRUE,
                       run_forest = !no_fit,
@@ -1129,6 +1133,10 @@ orsf_train_ <- function(object,
                                                  'cstat' = 1,
                                                  'user' = 2),
                       oobag_eval_every = oobag_eval_every,
+                      pd_type_R = 0,
+                      pd_vals = matrix(0, ncol=1, nrow=1),
+                      pd_cols = matrix(1L, ncol=1, nrow=1),
+                      pd_probs = c(0),
                       n_thread = get_n_thread(object),
                       write_forest = TRUE,
                       run_forest = TRUE,