Skip to content

Commit aa18382

Browse files
authored
Merge pull request #595 from cmu-delphi/no-genlasso
No genlasso
2 parents 16f9e15 + 059b968 commit aa18382

13 files changed

+754
-189
lines changed

DESCRIPTION

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Package: epiprocess
21
Type: Package
2+
Package: epiprocess
33
Title: Tools for basic signal processing in epidemiology
4-
Version: 0.10.3
4+
Version: 0.10.4
55
Authors@R: c(
66
person("Jacob", "Bien", role = "ctb"),
77
person("Logan", "Brooks", , "[email protected]", role = c("aut", "cre")),
@@ -23,17 +23,17 @@ Authors@R: c(
2323
person("Posit", role = "cph",
2424
comment = "Copyright holder of included rlang fragments"),
2525
person("Johns Hopkins University Center for Systems Science and Engineering", role = "dtc",
26-
comment = "Owner of COVID-19 cases and deaths data from the COVID-19 Data Repository"),
26+
comment = "Owner of COVID-19 cases and deaths data from the COVID-19 Data Repository"),
2727
person("Johns Hopkins University", role = "cph",
28-
comment = "Copyright holder of COVID-19 cases and deaths data from the COVID-19 Data Repository"),
28+
comment = "Copyright holder of COVID-19 cases and deaths data from the COVID-19 Data Repository"),
2929
person("Carnegie Mellon University Delphi Group", role = "dtc",
30-
comment = "Owner of claims-based CLI data from the Delphi Epidata API")
30+
comment = "Owner of claims-based CLI data from the Delphi Epidata API")
3131
)
32-
Description: This package introduces common data structures for working with
33-
epidemiological data reported by location and time and offers associated
34-
utilities to perform basic signal processing tasks. The package is designed
35-
to be used in conjunction with `epipredict` for building and evaluating
36-
epidemiological models.
32+
Description: This package introduces common data structures for working
33+
with epidemiological data reported by location and time and offers
34+
associated utilities to perform basic signal processing tasks. The
35+
package is designed to be used in conjunction with `epipredict` for
36+
building and evaluating epidemiological models.
3737
License: MIT + file LICENSE
3838
URL: https://cmu-delphi.github.io/epiprocess/
3939
Depends:
@@ -44,7 +44,6 @@ Imports:
4444
cli,
4545
data.table,
4646
dplyr (>= 1.1.0),
47-
genlasso,
4847
ggplot2,
4948
glue,
5049
lifecycle (>= 1.0.1),
@@ -63,6 +62,7 @@ Imports:
6362
waldo
6463
Suggests:
6564
devtools,
65+
distributional,
6666
epidatr,
6767
epipredict,
6868
here,
@@ -71,6 +71,7 @@ Suggests:
7171
readr,
7272
rmarkdown,
7373
testthat (>= 3.1.5),
74+
trendfilter,
7475
withr
7576
VignetteBuilder:
7677
knitr
@@ -79,7 +80,7 @@ Remotes:
7980
cmu-delphi/epidatasets,
8081
cmu-delphi/epidatr,
8182
cmu-delphi/epipredict,
82-
glmgen/genlasso,
83+
glmgen/trendfilter,
8384
reconverse/outbreaks
8485
Config/Needs/website: cmu-delphi/delphidocs
8586
Config/testthat/edition: 3

NAMESPACE

+3
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ S3method(mean,epi_df)
4646
S3method(print,epi_archive)
4747
S3method(print,epi_df)
4848
S3method(print,grouped_epi_archive)
49+
S3method(print,growth_rate_params)
4950
S3method(summary,epi_df)
5051
S3method(ungroup,epi_df)
5152
S3method(ungroup,grouped_epi_archive)
@@ -80,6 +81,7 @@ export(group_by)
8081
export(group_epi_df)
8182
export(group_modify)
8283
export(growth_rate)
84+
export(growth_rate_params)
8385
export(guess_period)
8486
export(is_epi_df)
8587
export(is_grouped_epi_archive)
@@ -109,6 +111,7 @@ importFrom(checkmate,assert_function)
109111
importFrom(checkmate,assert_int)
110112
importFrom(checkmate,assert_list)
111113
importFrom(checkmate,assert_logical)
114+
importFrom(checkmate,assert_number)
112115
importFrom(checkmate,assert_numeric)
113116
importFrom(checkmate,assert_scalar)
114117
importFrom(checkmate,assert_string)

NEWS.md

+10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ Pre-1.0.0 numbering scheme: 0.x will indicate releases, while 0.x.y will indicat
55
# epiprocess 0.11
66

77
## Breaking changes
8+
9+
- `growth_rate()` argument order and names have changed. You will need to
10+
rewrite `growth_rate(x, y)` as `growth_rate(y, x)`. The interface for passing
11+
arguments to the `"smooth_spline"` and `"trend_filter"` methods has also
12+
changed. Finally, `growth_rate()` with `method = "trendfilter"` now uses the
13+
`{trendfilter}` package rather than `{genlasso}`; results for this method will
14+
be different than before. In order to make `{epiprocess}` installation easier
15+
for users without a compiler, we have placed `{trendfilter}` in Suggests:; if
16+
you want to use `method = "trendfilter"` you will need to manually install
17+
this dependency (e.g., with `remotes::install_github("glmgen/trendfilter")`).
818
- In `revision_summary()`:
919
- Output now uses the name `lag_near_latest` instead of `time_near_latest`. To
1020
migrate, update references to `time_near_latest` to `lag_near_latest`.

0 commit comments

Comments
 (0)