Skip to content

Commit

Permalink
merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
mnwright committed May 16, 2024
2 parents a8eb8c5 + e3047c6 commit 9554d01
Show file tree
Hide file tree
Showing 86 changed files with 2,657 additions and 691 deletions.
12 changes: 10 additions & 2 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
^NEWS\.md$
^README\.md$
^.*\.tar.gz$
^\.travis.yml$
^cpp\_version$
^appveyor\.yml$
^\.github$
^revdep$
^_pkgdown\.yml$
^docs$
^pkgdown$
^ranger\.Rcheck$
^ranger.*\.tar\.gz$
^ranger.*\.tgz$
revdep/*
^\.vscode$
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: mnwright
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2

updates:
# Keep dependencies for GitHub Actions up-to-date
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
49 changes: 49 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
29 changes: 29 additions & 0 deletions .github/workflows/cpp-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: CPP-build

jobs:
linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Build
run: |
sudo apt-get install cmake
mkdir build && pushd build
cmake ../cpp_version
make && ctest --output-on-failure
macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- name: Build
run: |
mkdir build && pushd build
cmake ../cpp_version
make && ctest --output-on-failure
48 changes: 48 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]
release:
types: [published]
workflow_dispatch:

name: pkgdown

jobs:
pkgdown:
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@
ranger.Rcheck/
*.Rproj
.project
.cproject
.cproject
docs
ranger*.tar.gz
ranger*.tgz
revdep/*
.vscode
20 changes: 0 additions & 20 deletions .travis.yml

This file was deleted.

13 changes: 8 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: ranger
Type: Package
Title: A Fast Implementation of Random Forests
Version: 0.12.4
Date: 2020-06-15
Version: 0.16.1
Date: 2024-05-16
Author: Marvin N. Wright [aut, cre], Stefan Wager [ctb], Philipp Probst [ctb]
Maintainer: Marvin N. Wright <[email protected]>
Description: A fast implementation of Random Forests, particularly suited for high
Expand All @@ -15,8 +15,11 @@ License: GPL-3
Imports: Rcpp (>= 0.11.2), Matrix
LinkingTo: Rcpp, RcppEigen
Depends: R (>= 3.1)
Suggests: survival, testthat
Suggests:
survival,
testthat
Encoding: UTF-8
RoxygenNote: 7.1.0
URL: https://github.com/imbs-hl/ranger
RoxygenNote: 7.3.1
URL: https://imbs-hl.github.io/ranger/,
https://github.com/imbs-hl/ranger
BugReports: https://github.com/imbs-hl/ranger/issues
5 changes: 5 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
# Generated by roxygen2: do not edit by hand

S3method(as.data.frame,ranger.prediction)
S3method(deforest,ranger)
S3method(importance,ranger)
S3method(predict,ranger)
S3method(predict,ranger.forest)
S3method(predictions,ranger)
S3method(predictions,ranger.prediction)
S3method(print,deforest.ranger)
S3method(print,ranger)
S3method(print,ranger.forest)
S3method(print,ranger.prediction)
S3method(timepoints,ranger)
S3method(timepoints,ranger.prediction)
export(csrf)
export(deforest)
export(getTerminalNodeIDs)
export(holdoutRF)
export(hshrink)
export(importance)
export(importance_pvalues)
export(predictions)
Expand Down
32 changes: 22 additions & 10 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@

##### Version 0.12.4
* Bug fixes

##### Version 0.12.3
##### Version 0.16.0
* Add node.stats option to save node statistics of all nodes
* Add time.interest option to restrict unique survival times (faster and saves memory)
* Fix min bucket option in C++ version
* Fix memory error for always.split.variables in certain settings
* Fix quantile regression for factor variables in "order" mode

##### Version 0.15.0
* Switch to C++14 standard
* Add min.bucket parameter to restrict terminal node size
* Fix a bug with always.split.variables selecting the wrong variables

##### Version 0.14.0
* Faster permutation variable importance for high dimensional data (thanks to Roman Hornung)
* Add deforest() function to remove trees from ensemble
* Allow split.select.weights and always.split.variables together
* Add as.data.frame() method for predictions
* Fix weight calculation in case-specific RF (csrf())
* Fix cross compiling for Windows

##### Version 0.13.0
* Faster quantile prediction
* Add ... argument to ranger()
* Bug fixes

##### Version 0.12.2
* Bug fixes

##### Version 0.12.1
* Bug fixes

##### Version 0.12.0
* Faster computation (in some cases)
* Add local variable importance
Expand Down
Loading

0 comments on commit 9554d01

Please sign in to comment.