Skip to content
This repository has been archived by the owner on Jul 1, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphael Sonabend committed Nov 3, 2020
2 parents c78aa23 + 75fcf5c commit c26ed44
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/tic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ jobs:
Rscript -e "if (!requireNamespace('remotes')) install.packages('remotes', type = 'source')"
Rscript -e "if (getRversion() < '3.2' && !requireNamespace('curl')) install.packages('curl', type = 'source')"
- name: "[Custom block] [Stage] [Linux] Install pkgdown system lib req and valgrind"
if: runner.os == 'Linux'
run: |
sudo apt install libharfbuzz-dev libfribidi-dev
sudo apt install -y valgrind
- name: "[Stage] [Linux] Install curl"
if: runner.os == 'Linux'
run: sudo apt install libcurl4-openssl-dev
Expand Down
6 changes: 3 additions & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ set.seed(42)

## What is survivalmodels?

survivalmodels implements models for survival analysis that are either not already implemented in R, or novel implementations for speed improvements. Currently implemented are five neural networks from the Python packages [pycox](https://github.com/havakv/pycox), DNNSurv,
and the Akritas non-parametric conditional estimator. Further updates will include implementations of noel survival models.
`survivalmodels` implements models for survival analysis that are either not already implemented in R, or novel implementations for speed improvements. Currently implemented are five neural networks from the Python packages [pycox](https://github.com/havakv/pycox), DNNSurv,
and the Akritas non-parametric conditional estimator. Further updates will include implementations of novel survival models.

## Installation

Install the last release from CRAN:
Install the latest release from CRAN:

```{r eval=FALSE}
install.packages("survivalmodels")
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.or

## What is survivalmodels?

survivalmodels implements models for survival analysis that are either
`survivalmodels` implements models for survival analysis that are either
not already implemented in R, or novel implementations for speed
improvements. Currently implemented are five neural networks from the
Python packages [pycox](https://github.com/havakv/pycox), DNNSurv, and
the Akritas non-parametric conditional estimator. Further updates will
include implementations of noel survival models.
include implementations of novel survival models.

## Installation

Install the last release from CRAN:
Install the latest release from CRAN:

``` r
install.packages("survivalmodels")
Expand Down
8 changes: 8 additions & 0 deletions tic.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@
do_package_checks()

if (ci_on_ghactions() && ci_has_env("BUILD_PKGDOWN")) {

get_stage("before_deploy") %>%
add_step(step_setup_push_deploy(branch = "master", orphan = FALSE))

# creates pkgdown site and pushes to gh-pages branch
# only for the runner with the "BUILD_PKGDOWN" env var set
do_pkgdown()

get_stage("deploy") %>%
add_code_step(rmarkdown::render("README.Rmd")) %>%
add_step(step_do_push_deploy(commit_paths = c("README.md")))
}

2 comments on commit c26ed44

@lintr-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

R/simsurvdata.R:17:13: style: Use <-, not =, for assignment.

simsurvdata = function(n = 100, trt = 2, age = 2, sex = 1.5, cutoff = 20) {
            ^

R/simsurvdata.R:28:30: style: Put spaces around all infix operators.

time <- ((time - min(time))/(max(time)-min(time)) * 29) + 1
                            ~^~

R/simsurvdata.R:28:31: style: Place a space before left parenthesis, except in a function call.

time <- ((time - min(time))/(max(time)-min(time)) * 29) + 1
                              ^

R/simsurvdata.R:28:41: style: Put spaces around all infix operators.

time <- ((time - min(time))/(max(time)-min(time)) * 29) + 1
                                       ~^~

@lintr-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

R/simsurvdata.R:17:13: style: Use <-, not =, for assignment.

simsurvdata = function(n = 100, trt = 2, age = 2, sex = 1.5, cutoff = 20) {
            ^

R/simsurvdata.R:28:30: style: Put spaces around all infix operators.

time <- ((time - min(time))/(max(time)-min(time)) * 29) + 1
                            ~^~

R/simsurvdata.R:28:31: style: Place a space before left parenthesis, except in a function call.

time <- ((time - min(time))/(max(time)-min(time)) * 29) + 1
                              ^

R/simsurvdata.R:28:41: style: Put spaces around all infix operators.

time <- ((time - min(time))/(max(time)-min(time)) * 29) + 1
                                       ~^~

Please sign in to comment.