Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No genlasso #595

Open
wants to merge 33 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
cc07ab0
rm genlasso
dajmcdon Dec 11, 2024
975e783
fix trendfilter + growth_rate
dajmcdon Jan 20, 2025
a236706
add tests for parameter constructor and splines
dajmcdon Jan 20, 2025
967f16a
pass minimal tests
dajmcdon Jan 21, 2025
2f8b06f
docs: document (GHA)
dajmcdon Jan 21, 2025
b41b5fb
style: styler (GHA)
dajmcdon Jan 21, 2025
bbf5a07
slight modifications to the vignette
dajmcdon Jan 21, 2025
92f3eb0
add install instructions to vignette
dajmcdon Jan 21, 2025
a6e8785
Merge branch 'no-genlasso' of https://github.com/cmu-delphi/epiproces…
dajmcdon Jan 21, 2025
f2c9383
redocument
dajmcdon Jan 21, 2025
5a242a1
merge dev, bump version.
dajmcdon Jan 21, 2025
0e10f94
redocument
dajmcdon Jan 21, 2025
5101627
add tests, pass checks
dajmcdon Jan 23, 2025
6d7091c
style: styler (GHA)
dajmcdon Jan 23, 2025
61628fd
handle annoying lintr crud
dajmcdon Jan 23, 2025
3b77ef6
add missing fn for pkgdown
dajmcdon Jan 23, 2025
bcdb216
Merge branch 'dev' into no-genlasso
dajmcdon Jan 24, 2025
8758128
docs: document (GHA)
dajmcdon Jan 24, 2025
5280faf
docs(growth_rate): reword + typo
brookslogan Jan 28, 2025
0426ec4
Use glmgen/trendfilter installation command as suggestion
brookslogan Jan 28, 2025
393370f
Make `growth_rate(method = "trendfilter")` without {trendfilter} a ha…
brookslogan Jan 28, 2025
341be94
refactor(growth_rate): preoptimize/normalize some ops
brookslogan Jan 28, 2025
d10c440
docs: document (GHA)
brookslogan Jan 28, 2025
8c92285
fix(growth_rate): single_lambda check
brookslogan Jan 28, 2025
b0d3236
Rename growth_rate_global_params() -> growth_rate_params()
brookslogan Jan 28, 2025
2baa9e0
docs: document (GHA)
brookslogan Jan 28, 2025
730bc55
Further NEWS rewording
brookslogan Jan 28, 2025
264fbcf
remove scaling by sd (now done internally by the method)
dajmcdon Jan 29, 2025
5a037bc
remove sorting of x0, not really needed
dajmcdon Jan 29, 2025
2ce5daa
rm straggling sdy
dajmcdon Jan 29, 2025
5612df0
satisfy the linter
dajmcdon Jan 29, 2025
85e6530
fix rcmd check errors
dajmcdon Jan 29, 2025
d5c3498
Revert "satisfy the linter"
dajmcdon Jan 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: epiprocess
Type: Package
Package: epiprocess
Title: Tools for basic signal processing in epidemiology
Version: 0.10.3
Version: 0.10.4
Authors@R: c(
person("Jacob", "Bien", role = "ctb"),
person("Logan", "Brooks", , "lcbrooks+github@andrew.cmu.edu", role = c("aut", "cre")),
Expand All @@ -23,17 +23,17 @@ Authors@R: c(
person("Posit", role = "cph",
comment = "Copyright holder of included rlang fragments"),
person("Johns Hopkins University Center for Systems Science and Engineering", role = "dtc",
comment = "Owner of COVID-19 cases and deaths data from the COVID-19 Data Repository"),
comment = "Owner of COVID-19 cases and deaths data from the COVID-19 Data Repository"),
person("Johns Hopkins University", role = "cph",
comment = "Copyright holder of COVID-19 cases and deaths data from the COVID-19 Data Repository"),
comment = "Copyright holder of COVID-19 cases and deaths data from the COVID-19 Data Repository"),
person("Carnegie Mellon University Delphi Group", role = "dtc",
comment = "Owner of claims-based CLI data from the Delphi Epidata API")
comment = "Owner of claims-based CLI data from the Delphi Epidata API")
)
Description: This package introduces common data structures for working with
epidemiological data reported by location and time and offers associated
utilities to perform basic signal processing tasks. The package is designed
to be used in conjunction with `epipredict` for building and evaluating
epidemiological models.
Description: This package introduces common data structures for working
with epidemiological data reported by location and time and offers
associated utilities to perform basic signal processing tasks. The
package is designed to be used in conjunction with `epipredict` for
building and evaluating epidemiological models.
License: MIT + file LICENSE
URL: https://cmu-delphi.github.io/epiprocess/
Depends:
Expand All @@ -44,7 +44,6 @@ Imports:
cli,
data.table,
dplyr (>= 1.1.0),
genlasso,
ggplot2,
glue,
lifecycle (>= 1.0.1),
Expand All @@ -63,6 +62,7 @@ Imports:
waldo
Suggests:
devtools,
distributional,
epidatr,
epipredict,
here,
Expand All @@ -71,6 +71,7 @@ Suggests:
readr,
rmarkdown,
testthat (>= 3.1.5),
trendfilter,
withr
VignetteBuilder:
knitr
Expand All @@ -79,7 +80,7 @@ Remotes:
cmu-delphi/epidatasets,
cmu-delphi/epidatr,
cmu-delphi/epipredict,
glmgen/genlasso,
glmgen/trendfilter,
reconverse/outbreaks
Config/Needs/website: cmu-delphi/delphidocs
Config/testthat/edition: 3
Expand Down
3 changes: 3 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ S3method(mean,epi_df)
S3method(print,epi_archive)
S3method(print,epi_df)
S3method(print,grouped_epi_archive)
S3method(print,growth_rate_params)
S3method(summary,epi_df)
S3method(ungroup,epi_df)
S3method(ungroup,grouped_epi_archive)
Expand Down Expand Up @@ -80,6 +81,7 @@ export(group_by)
export(group_epi_df)
export(group_modify)
export(growth_rate)
export(growth_rate_params)
export(guess_period)
export(is_epi_df)
export(is_grouped_epi_archive)
Expand Down Expand Up @@ -109,6 +111,7 @@ importFrom(checkmate,assert_function)
importFrom(checkmate,assert_int)
importFrom(checkmate,assert_list)
importFrom(checkmate,assert_logical)
importFrom(checkmate,assert_number)
importFrom(checkmate,assert_numeric)
importFrom(checkmate,assert_scalar)
importFrom(checkmate,assert_string)
Expand Down
10 changes: 10 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ Pre-1.0.0 numbering scheme: 0.x will indicate releases, while 0.x.y will indicat
# epiprocess 0.11

## Breaking changes

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