Skip to content

Commit 608e8e9

Browse files
authored
Merge pull request #156 from NSAPH-Software/release_v0.2.6
Release v0.2.6
2 parents 91bdaf3 + c8205a2 commit 608e8e9

18 files changed

Lines changed: 752 additions & 521 deletions

.covrignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ R/plot.R
33
R/print.R
44
R/check_hyper_params.R
55
R/logger_utils.R
6+
R/inTrees.R

.github/workflows/R-CMD-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
matrix:
2424
config:
2525
- {os: windows-latest, r: '4.2'}
26-
# - {os: macOS-latest, r: '4.2'}
26+
#- {os: macOS-latest, r: '4.2'}
2727
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
2828
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.1.0 (ubuntu-20.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
2929

.github/workflows/draft-pdf.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Type: Package
22
Package: CRE
33
Title: Interpretable Discovery and Inference of Heterogeneous Treatment Effects
4-
Version: 0.2.5.9000
4+
Version: 0.2.6
55
Authors@R: c(
66
person("Naeem", "Khoshnevis", , "nkhoshnevis@g.harvard.edu", role = c("aut", "cre"),
77
comment = c(ORCID = "0000-0003-4315-1426", AFFILIATION = "FASRC")),
@@ -23,7 +23,7 @@ Description: Provides a new method for interpretable heterogeneous
2323
it is supported by theoretical convergence guarantees. Bargagli-Stoffi,
2424
F. J., Cadei, R., Lee, K., & Dominici, F. (2023) Causal rule ensemble:
2525
Interpretable Discovery and Inference of Heterogeneous Treatment Effects.
26-
arXiv preprint <arXiv:2009.09036>.
26+
arXiv preprint <doi:10.48550/arXiv.2009.09036>.
2727
License: GPL-3
2828
URL: https://github.com/NSAPH-Software/CRE
2929
BugReports: https://github.com/NSAPH-Software/CRE/issues
@@ -47,7 +47,7 @@ Imports:
4747
SuperLearner,
4848
magrittr,
4949
ggplot2,
50-
inTrees
50+
arules
5151
Suggests:
5252
grf,
5353
BART,

NEWS.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# CRE 0.2.5 (2024-4-21)
2+
3+
## Added
4+
* A copy of inTrees package source code.
5+
6+
## Removed
7+
* The inTrees package dependency
8+
19
# CRE 0.2.5 (2023-12-6)
210

311
## Added

R/extract_rules.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extract_rules <- function(treelist, X, max_depth, digits = 2) {
3131
if (nrow(tree) <= 1) next # skip if there is no split
3232
ruleSet <- vector("list", length(which(tree[, "status"] == -1)))
3333
for (max_length in 1:max_depth) {
34-
res <- inTrees::treeVisit(tree,
34+
res <- inTrees_treeVisit(tree,
3535
rowIx = rowIx,
3636
count,
3737
ruleSet,
@@ -45,6 +45,6 @@ extract_rules <- function(treelist, X, max_depth, digits = 2) {
4545
}
4646

4747
allRulesList <- allRulesList[!unlist(lapply(allRulesList, is.null))]
48-
rules <- inTrees::ruleList2Exec(X, allRulesList)
48+
rules <- inTrees_ruleList2Exec(X, allRulesList)
4949
return(rules)
5050
}

R/filter_irrelevant_rules.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ filter_irrelevant_rules <- function(rules, X, ite, t_decay) {
2424

2525
rules_matrix <- matrix(rules)
2626
colnames(rules_matrix) <- "condition"
27-
metric <- inTrees::getRuleMetric(rules_matrix,
27+
metric <- inTrees_getRuleMetric(rules_matrix,
2828
X,
2929
ite_)
3030

31-
pruned <- inTrees::pruneRule(rules = metric,
31+
pruned <- inTrees_pruneRule(rules = metric,
3232
X = X,
3333
target = ite_,
3434
maxDecay = t_decay)

R/generate_rules.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ generate_rules <- function(X, ite, ntrees, node_size, max_rules, max_depth) {
3434
nodesize = node_size,
3535
mtry = ncol(X)*2/3)
3636

37-
treelist <- inTrees::RF2List(forest)
37+
treelist <- inTrees_RF2List(forest)
3838
rules <- extract_rules(treelist, X, max_depth)
3939
} else {
4040
rules <- NULL

0 commit comments

Comments
 (0)