Skip to content

Commit 2bc71d8

Browse files
authored
Merge pull request #373 from tlverse/devel
2 parents 1563918 + 5f2764f commit 2bc71d8

File tree

416 files changed

+19978
-35535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

416 files changed

+19978
-35535
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
^README\.md
77

88
# Automated testing files.
9+
^\.github$
910
^\.travis\.yml$
1011
^appveyor\.yml$
1112
^codecov\.yml$

.github/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.html

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
on:
2+
push:
3+
branches:
4+
- master
5+
- devel
6+
pull_request:
7+
branches:
8+
- master
9+
- devel
10+
11+
name: R-CMD-check
12+
13+
jobs:
14+
R-CMD-check:
15+
runs-on: ${{ matrix.config.os }}
16+
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
17+
18+
strategy:
19+
fail-fast: false
20+
matrix:
21+
config:
22+
- {os: ubuntu-latest, r: 'release'}
23+
- {os: macOS-latest, r: 'release'}
24+
- {os: windows-latest, r: 'release'}
25+
26+
env:
27+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
28+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
29+
30+
steps:
31+
- name: Checkout repo
32+
uses: actions/checkout@v2
33+
34+
- name: Setup R
35+
uses: r-lib/actions/setup-r@master
36+
with:
37+
r-version: ${{ matrix.config.r }}
38+
39+
- name: Install pandoc
40+
uses: r-lib/actions/setup-pandoc@v1
41+
42+
- name: Install tinyTeX
43+
uses: r-lib/actions/setup-tinytex@v1
44+
45+
- name: Install system dependencies
46+
if: runner.os == 'Linux'
47+
run: |
48+
sudo apt install -y curl libcurl4-doc libcurl4-openssl-dev
49+
sudo $(which R) CMD javareconf
50+
51+
- name: Install package dependencies
52+
run: |
53+
install.packages(c("remotes", "rcmdcheck", "covr", "sessioninfo"))
54+
if(Sys.info()["sysname"] == "Windows") install.packages("igraph", type = "binary")
55+
remotes::install_deps(dependencies = TRUE)
56+
shell: Rscript {0}
57+
58+
- name: Check package
59+
run: |
60+
options(crayon.enabled = TRUE)
61+
rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "error")
62+
shell: Rscript {0}
63+
64+
- name: Upload code coverage
65+
if: runner.os == 'Linux'
66+
run: |
67+
covr::codecov()
68+
shell: Rscript {0}

.travis.yml

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

DESCRIPTION

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: sl3
22
Title: Pipelines for Machine Learning and Super Learning
3-
Version: 1.4.2
3+
Version: 1.4.4
44
Authors@R: c(
55
person("Jeremy", "Coyle", email = "[email protected]",
66
role = c("aut", "cre", "cph"),
@@ -43,9 +43,11 @@ Imports:
4343
methods,
4444
ggplot2,
4545
digest,
46+
Rdpack,
4647
imputeMissings,
4748
dplyr,
48-
caret
49+
caret,
50+
ROCR
4951
Suggests:
5052
testthat,
5153
rmarkdown,
@@ -57,6 +59,7 @@ Suggests:
5759
reticulate,
5860
rgl,
5961
rJava,
62+
arm,
6063
bartMachine,
6164
cvAUC,
6265
e1071,
@@ -66,7 +69,7 @@ Suggests:
6669
glmnet,
6770
grf,
6871
gbm,
69-
hal9001 (>= 0.2.5),
72+
hal9001 (>= 0.4.0),
7073
h2o,
7174
keras,
7275
kerasR,
@@ -81,12 +84,19 @@ Suggests:
8184
SuperLearner,
8285
tsDyn,
8386
xgboost,
87+
lightgbm,
8488
dbarts,
8589
gam (>= 1.15.0),
86-
haldensify,
90+
haldensify (>= 0.1.5),
8791
mgcv,
88-
hts
92+
hts,
93+
GA
94+
Remotes:
95+
github::tlverse/origami,
96+
github::tlverse/hal9001@devel,
97+
github::nhejazi/haldensify
8998
License: GPL-3
99+
Language: en-US
90100
URL: https://tlverse.org/sl3
91101
BugReports: https://github.com/tlverse/sl3/issues
92102
Encoding: UTF-8
@@ -95,5 +105,6 @@ LazyLoad: yes
95105
VignetteBuilder:
96106
knitr,
97107
R.rsp
98-
RoxygenNote: 7.1.1.9000
99108
Roxygen: list(markdown = TRUE, old_usage = TRUE, r6 = FALSE)
109+
RoxygenNote: 7.1.2
110+
RdMacros: Rdpack

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ md:
22
Rscript -e "rmarkdown::render('README.Rmd', output_file = 'README.md')"
33

44
site:
5+
Rscript -e "rmarkdown::render('README.Rmd', output_file = 'README.md')"
56
Rscript -e "pkgdown::build_site()"
67

78
check:
@@ -31,5 +32,5 @@ coverage:
3132
style:
3233
Rscript -e "styler::style_pkg()"
3334

34-
pr: style check md site
35+
pr: style check site
3536
echo "If all checks have passed, you are ready to submit PR"

NAMESPACE

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export(Lrnr_HarmonicReg)
77
export(Lrnr_arima)
88
export(Lrnr_bartMachine)
99
export(Lrnr_base)
10+
export(Lrnr_bayesglm)
1011
export(Lrnr_bilstm)
1112
export(Lrnr_bound)
1213
export(Lrnr_caret)
@@ -19,6 +20,7 @@ export(Lrnr_density_hse)
1920
export(Lrnr_density_semiparametric)
2021
export(Lrnr_earth)
2122
export(Lrnr_expSmooth)
23+
export(Lrnr_ga)
2224
export(Lrnr_gam)
2325
export(Lrnr_gbm)
2426
export(Lrnr_glm)
@@ -35,7 +37,7 @@ export(Lrnr_hal9001)
3537
export(Lrnr_haldensify)
3638
export(Lrnr_hts)
3739
export(Lrnr_independent_binomial)
38-
export(Lrnr_lstm)
40+
export(Lrnr_lightgbm)
3941
export(Lrnr_lstm_keras)
4042
export(Lrnr_mean)
4143
export(Lrnr_multiple_ts)
@@ -72,6 +74,7 @@ export(Shared_Data)
7274
export(Stack)
7375
export(Variable_Type)
7476
export(args_to_list)
77+
export(custom_ROCR_risk)
7578
export(customize_chain)
7679
export(debug_predict)
7780
export(debug_train)
@@ -80,6 +83,7 @@ export(debugonce_train)
8083
export(define_h2o_X)
8184
export(delayed_learner_fit_chain)
8285
export(delayed_learner_fit_predict)
86+
export(delayed_learner_process_formula)
8387
export(delayed_learner_subset_covariates)
8488
export(delayed_learner_train)
8589
export(delayed_make_learner)
@@ -90,6 +94,7 @@ export(importance_plot)
9094
export(inverse_sample)
9195
export(learner_fit_chain)
9296
export(learner_fit_predict)
97+
export(learner_process_formula)
9398
export(learner_subset_covariates)
9499
export(learner_train)
95100
export(loss_loglik_binomial)
@@ -129,6 +134,9 @@ import(delayed)
129134
import(ggplot2)
130135
importFrom(BBmisc,requirePackages)
131136
importFrom(R6,R6Class)
137+
importFrom(ROCR,performance)
138+
importFrom(ROCR,prediction)
139+
importFrom(Rdpack,reprompt)
132140
importFrom(assertthat,assert_that)
133141
importFrom(assertthat,is.count)
134142
importFrom(assertthat,is.flag)
@@ -144,14 +152,19 @@ importFrom(dplyr,"%>%")
144152
importFrom(dplyr,group_by)
145153
importFrom(dplyr,select)
146154
importFrom(dplyr,summarise_all)
155+
importFrom(ggplot2,coord_flip)
147156
importFrom(ggplot2,cut_interval)
148157
importFrom(ggplot2,cut_number)
149-
importFrom(graphics,dotchart)
158+
importFrom(ggplot2,geom_point)
159+
importFrom(ggplot2,ggplot)
160+
importFrom(ggplot2,labs)
161+
importFrom(ggplot2,scale_x_discrete)
150162
importFrom(imputeMissings,impute)
151163
importFrom(methods,is)
152164
importFrom(origami,combiner_c)
153165
importFrom(origami,cross_validate)
154166
importFrom(origami,fold_index)
167+
importFrom(origami,folds2foldvec)
155168
importFrom(origami,id_folds_to_folds)
156169
importFrom(origami,make_folds)
157170
importFrom(origami,training)
@@ -166,6 +179,7 @@ importFrom(stats,median)
166179
importFrom(stats,plogis)
167180
importFrom(stats,predict)
168181
importFrom(stats,qlogis)
182+
importFrom(stats,quasibinomial)
169183
importFrom(stats,runif)
170184
importFrom(stats,sd)
171185
importFrom(stats,weighted.mean)

0 commit comments

Comments
 (0)