Skip to content

Commit

Permalink
Merge pull request #131 from hubverse-org/ls/release/0.1.8
Browse files Browse the repository at this point in the history
ls/release/0.1.8
  • Loading branch information
lshandross authored Sep 26, 2024
2 parents 3fdb97e + 24191b3 commit 598728b
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 11 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
^data-raw$
^revdep$
^vignettes/articles$
^CRAN-SUBMISSION$
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 0.1.8
Date: 2024-09-25 17:49:01 UTC
SHA: 9bfa495a73a67116b9b70b69c3ebbd95b561e387
5 changes: 3 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: hubEnsembles
Title: Ensemble Methods for Combining Hub Model Outputs
Version: 0.1.7
Version: 0.1.8
Authors@R: c(
person(given = "Evan L", family = "Ray", email = "[email protected]", role = "aut"),
person(given = "Li", family = "Shandross", email = "[email protected]", role = c("aut", "cre"),
Expand All @@ -12,7 +12,8 @@ Authors@R: c(
person(given = "Zhian N.", family = "Kamvar", email = "[email protected]", role = "ctb",
comment = c(ORCID = "0000-0003-1458-7108")),
person(given = "Nicholas G.", family = "Reich", email = "[email protected]", role = "ctb",
comment = c(ORCID = "0000-0003-3503-9899"))
comment = c(ORCID = "0000-0003-3503-9899")),
person("Consortium of Infectious Disease Modeling Hubs", role = "cph")
)
Description: Functions for combining model outputs (e.g. predictions or
estimates) from multiple models into an aggregated ensemble model
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# hubEnsembles 0.1.8

* Update README to point to hubverse R-universe
* Submission to CRAN

# hubEnsembles 0.1.7

* Make `hubEnsembles.Rmd` an article
Expand Down
6 changes: 3 additions & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ knitr::opts_chunk$set(

[![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental)
[![R-CMD-check](https://github.com/hubverse-org/hubEnsembles/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/hubverse-org/hubEnsembles/actions/workflows/R-CMD-check.yaml)

[![CRAN status](https://www.r-pkg.org/badges/version/hubEnsembles)](https://CRAN.R-project.org/package=hubEnsembles)
<!-- badges: end -->

The goal of hubEnsembles is to provide standard implementations of commonly used methods for ensembling model outputs. The hubEnsembles package is part of [the hubverse project](https://hubverse.io/en/latest/) and expects all input data to the key functions to be formatted as an object of a [`model_out_tbl` class](https://hubverse-org.github.io/hubUtils/reference/as_model_out_tbl.html).
Expand All @@ -28,10 +28,10 @@ The goal of hubEnsembles is to provide standard implementations of commonly used

### Latest

You can install the [latest version of hubEnsembles from the R-universe](https://hubverse-org.r-universe.dev/hubEnsembles):
You can install the released version of `hubEnsembles` from [CRAN](https://CRAN.R-project.org) with:

```r
install.packages("hubEnsembles", repos = c("https://hubverse-org.r-universe.dev", "https://cloud.r-project.org"))
install.packages("hubEnsembles")
```

### Development
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
[![Lifecycle:
experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental)
[![R-CMD-check](https://github.com/hubverse-org/hubEnsembles/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/hubverse-org/hubEnsembles/actions/workflows/R-CMD-check.yaml)

[![CRAN
status](https://www.r-pkg.org/badges/version/hubEnsembles)](https://CRAN.R-project.org/package=hubEnsembles)
<!-- badges: end -->

The goal of hubEnsembles is to provide standard implementations of
Expand All @@ -22,11 +23,11 @@ class](https://hubverse-org.github.io/hubUtils/reference/as_model_out_tbl.html).

### Latest

You can install the [latest version of hubEnsembles from the
R-universe](https://hubverse-org.r-universe.dev/hubEnsembles):
You can install the released version of `hubEnsembles` from
[CRAN](https://CRAN.R-project.org) with:

``` r
install.packages("hubEnsembles", repos = c("https://hubverse-org.r-universe.dev", "https://cloud.r-project.org"))
install.packages("hubEnsembles")
```

### Development
Expand Down
10 changes: 10 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,13 @@
0 errors | 0 warnings | 1 note

* This is a new release.

Additional previous actions in response to automated and manual reviews

* Removed S3 method `all.is.numeric()` that was not registered (replaced by a new internal function)

* Made 'hubEnsembles.Rmd' vignette which failed to build into an article

* Package dependencies 'distfromq', 'hubUtils' have been added to CRAN

* Installation instructions updated in README.md
5 changes: 3 additions & 2 deletions tests/testthat/test-linear_pool.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
test_that("(#128) linear pool will group by output_type", {
skip_if_not_installed("hubExamples")
forecast <- hubExamples::forecast_outputs
forecast <- forecast[!forecast$output_type %in% c("median", "sample"), ]
expect_no_error({
res <- hubEnsembles::linear_pool(forecast, model_id = "linear-pool-normal")
res <- linear_pool(forecast, model_id = "linear-pool-normal")
})
expect_lt(nrow(res), nrow(forecast))
expect_equal(unique(res$model_id), "linear-pool-normal")

# Reversing the input gives the same results
expect_no_error({
tsacerof <- rev(seq_len(nrow(forecast)))
ser <- hubEnsembles::linear_pool(forecast[tsacerof, ], model_id = "linear-pool-normal")
ser <- linear_pool(forecast[tsacerof, ], model_id = "linear-pool-normal")
})
expect_equal(res[res$output_type == "cdf", -1], ser[ser$output_type == "cdf", -1], tolerance = 1e-10)
})
Expand Down

0 comments on commit 598728b

Please sign in to comment.