Update NEWS, add data.table imports

Author: jemus42

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: randomPlantedForest
 Title: Random Planted Forest: A Directly Interpretable Tree Ensemble
-Version: 0.2.1
+Version: 0.2.1.9000
 Authors@R: c(
     person(c("Joseph", "Theo"), "Meyer", role = "aut"),
     person("Munir", "Hiabu", role = "aut"),

NAMESPACE

@@ -18,9 +18,17 @@ export(rpf)
 import(checkmate)
 importFrom(Rcpp,loadModule)
 importFrom(Rcpp,sourceCpp)
+importFrom(data.table,":=")
 importFrom(data.table,':=')
+importFrom(data.table,.BY)
+importFrom(data.table,.EACHI)
+importFrom(data.table,.GRP)
+importFrom(data.table,.I)
+importFrom(data.table,.N)
+importFrom(data.table,.NGRP)
 importFrom(data.table,.SD)
 importFrom(data.table,as.data.table)
+importFrom(data.table,data.table)
 importFrom(hardhat,default_formula_blueprint)
 importFrom(hardhat,default_recipe_blueprint)
 importFrom(hardhat,default_xy_blueprint)

NEWS.md

@@ -1,3 +1,8 @@
+# randomPlantedForest 0.2.1.9000 (Development version)
+
+* Add `remainder` term to `predict_components` output for case where `max_interaction` supplied is smaller than `max_interaction` in `rpf` fit.
+  In that case, the `m` values don't sum up to the global predictions, so we add a remainder to allow reconstruction of that property.
+
 # randomPlantedForest 0.2.1
 
 * Add `glex` class to output of `predict_components()`, for extended functionality available with [`glex`](https://github.com/PlantedML/glex).

R/predict_components.R

@@ -131,7 +131,7 @@ predict_components <- function(object, new_data, max_interaction = NULL, predict
   # to make m's sum up to SHAPs etc, see https://github.com/PlantedML/glex/issues/11
 
   if (max_interaction < object$params$max_interaction) {
-    pred <- predict(object, new_data = new_data, type = "numeric")
+    pred <- predict.rpf(object, new_data = new_data, type = "numeric")
 
     # handling differs if multiclass
     if (length(outcome_levels) > 2) {

R/randomPlantedForest-package.R

@@ -3,6 +3,15 @@
 
 ## usethis namespace: start
 #' @import checkmate
+#' @importFrom data.table :=
+#' @importFrom data.table .BY
+#' @importFrom data.table .EACHI
+#' @importFrom data.table .GRP
+#' @importFrom data.table .I
+#' @importFrom data.table .N
+#' @importFrom data.table .NGRP
+#' @importFrom data.table .SD
+#' @importFrom data.table data.table
 #' @importFrom Rcpp loadModule
 #' @importFrom Rcpp sourceCpp
 #' @useDynLib randomPlantedForest, .registration = TRUE

R/utils.R

@@ -214,6 +214,10 @@ softmax <- function(x) {
 #' @param pred Regular model predictions as returned by `predict.rpf`.
 #' @param intercept Intercept as stored in output of `predict_components`.
 calc_remainders_multiclass <- function(m, levels, pred, intercept) {
+
+  # data.table NSE warnings
+  term <- remainder <- m_sum <- NULL
+
   m <- data.table::as.data.table(m)
   pred <- data.table::as.data.table(pred)
   intercept <- data.table::as.data.table(intercept)