Merge pull request #32 from ropensci/tree-classif

Tree classif

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: aorsf
 Title: Accelerated Oblique Random Survival Forests
-Version: 0.1.1.9002
+Version: 0.1.1.9003
 Authors@R: c(
     person(given = "Byron",
            family = "Jaeger",
@@ -38,8 +38,8 @@ Imports:
     Rcpp,
     data.table,
     utils,
-    stats,
-    collapse
+    collapse, 
+    R6
 URL: https://github.com/ropensci/aorsf,
     https://docs.ropensci.org/aorsf/
 BugReports: https://github.com/ropensci/aorsf/issues/

NAMESPACE

@@ -1,7 +1,7 @@
 # Generated by roxygen2: do not edit by hand
 
 S3method(as.data.table,orsf_summary_uni)
-S3method(predict,orsf_fit)
+S3method(predict,ObliqueForest)
 S3method(print,orsf_fit)
 S3method(print,orsf_summary_uni)
 export(orsf)
@@ -25,6 +25,7 @@ export(orsf_vi_anova)
 export(orsf_vi_negate)
 export(orsf_vi_permute)
 export(orsf_vs)
+import(R6)
 import(data.table)
 importFrom(Rcpp,sourceCpp)
 importFrom(collapse,"%==%")

R/RcppExports.R

@@ -13,18 +13,34 @@ logreg_fit_exported <- function(x_node, y_node, w_node, do_scale, epsilon, iter_
     .Call(`_aorsf_logreg_fit_exported`, x_node, y_node, w_node, do_scale, epsilon, iter_max)
 }
 
-compute_cstat_exported_vec <- function(y, w, p, pred_is_risklike) {
-    .Call(`_aorsf_compute_cstat_exported_vec`, y, w, p, pred_is_risklike)
+compute_cstat_surv_exported_vec <- function(y, w, p, pred_is_risklike) {
+    .Call(`_aorsf_compute_cstat_surv_exported_vec`, y, w, p, pred_is_risklike)
 }
 
-compute_cstat_exported_uvec <- function(y, w, g, pred_is_risklike) {
-    .Call(`_aorsf_compute_cstat_exported_uvec`, y, w, g, pred_is_risklike)
+compute_cstat_surv_exported_uvec <- function(y, w, g, pred_is_risklike) {
+    .Call(`_aorsf_compute_cstat_surv_exported_uvec`, y, w, g, pred_is_risklike)
+}
+
+compute_cstat_clsf_exported <- function(y, w, p) {
+    .Call(`_aorsf_compute_cstat_clsf_exported`, y, w, p)
 }
 
 compute_logrank_exported <- function(y, w, g) {
     .Call(`_aorsf_compute_logrank_exported`, y, w, g)
 }
 
+compute_gini_exported <- function(y, w, g) {
+    .Call(`_aorsf_compute_gini_exported`, y, w, g)
+}
+
+compute_pred_prob_exported <- function(y, w) {
+    .Call(`_aorsf_compute_pred_prob_exported`, y, w)
+}
+
+expand_y_clsf <- function(y, n_class) {
+    .Call(`_aorsf_expand_y_clsf`, y, n_class)
+}
+
 is_col_splittable_exported <- function(x, y, r, j) {
     .Call(`_aorsf_is_col_splittable_exported`, x, y, r, j)
 }
@@ -61,3 +77,7 @@ orsf_cpp <- function(x, y, w, tree_type_R, tree_seeds, loaded_forest, lincomb_R_
     .Call(`_aorsf_orsf_cpp`, x, y, w, tree_type_R, tree_seeds, loaded_forest, lincomb_R_function, oobag_R_function, n_tree, mtry, sample_with_replacement, sample_fraction, 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_x_vals, pd_x_cols, pd_probs, n_thread, write_forest, run_forest, verbosity)
 }
 
+compute_var_reduction <- function(y_node, w_node, g_node) {
+    .Call(`_aorsf_compute_var_reduction`, y_node, w_node, g_node)
+}
+

R/aorsf-package.R

@@ -1,5 +1,6 @@
 #' @keywords internal
 #' @import data.table
+#' @import R6
 "_PACKAGE"
 
 # The following block is used by usethis to automatically manage