-
Notifications
You must be signed in to change notification settings - Fork 2
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
Update {epiparameter} usage #100
Conversation
Please also update the epiparameter version number for renv:
You can find the value to use by running |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you also update epiparameter usage in the EpiNow2 child document?
inst/rmarkdown/templates/transmissibility/skeleton/skeleton.Rmd
Outdated
Show resolved
Hide resolved
inst/rmarkdown/templates/transmissibility/skeleton/skeleton.Rmd
Outdated
Show resolved
Hide resolved
|
si <- epiparameter::discretise(si_epiparameter) | ||
si_x <- seq(1L, to = si$prob_dist$qf(0.999), by = 1L) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
si <- epiparameter::discretise(si_epiparameter) | |
si_x <- seq(1L, to = si$prob_dist$qf(0.999), by = 1L) | |
si <- as.function(si_epiparameter) | |
si_x <- seq(1L, to = quantile(si_epiparameter, 0.999), by = 1L) |
Note however that in the case use_epiparameter_database = FALSE
, the object si_epiparameter
does not exist.
8799aee
to
ee73e96
Compare
@joshwlambert @Bisaloo hi both, do you think we could merge this PR? the only issue I've not been able to resolve is issue #127 , where I'm unsure how {epiparameter} could be used to update what's now being done by epitrix/distcrete |
@CarmenTamayo I will review this afternoon and get back to you by EOD. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for making these updates @CarmenTamayo! Mostly looks really good. I've left a few comments throughout the changes with some comments and questions.
inst/rmarkdown/templates/transmissibility/skeleton/skeleton.Rmd
Outdated
Show resolved
Hide resolved
inst/rmarkdown/templates/transmissibility/skeleton/skeleton.Rmd
Outdated
Show resolved
Hide resolved
inst/rmarkdown/templates/transmissibility/skeleton/skeleton.Rmd
Outdated
Show resolved
Hide resolved
inst/rmarkdown/templates/transmissibility/skeleton/skeleton.Rmd
Outdated
Show resolved
Hide resolved
inst/rmarkdown/templates/transmissibility/skeleton/rmdchunks/EpiNow2.Rmd
Show resolved
Hide resolved
Given the number of commits to number of files changed I think this PR would be a good candidate for a squash merge. |
Please also add yourself as a package author ( Lines 4 to 9 in 0b7406f
|
inst/rmarkdown/templates/transmissibility/skeleton/skeleton.Rmd
Outdated
Show resolved
Hide resolved
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #100 +/- ##
=======================================
Coverage 73.07% 73.07%
=======================================
Files 4 4
Lines 26 26
=======================================
Hits 19 19
Misses 7 7 ☔ View full report in Codecov by Sentry. |
Done here 013a44d |
Not sure why the |
@joshwlambert - are we confident that's the underlying problem, really? If the workflow worked before and has not changed, it feels like something else must be causing this. I just re-ran the workflow and it seems like there is a different problem that requires some debugging to make the action
To fix the workflow, I would see what changed since the last time the workflow succeeded and find the root cause. |
@chartgerink I think the misunderstanding is because I was looking at the first test report workflow to fail. It seems the error in recent workflow failures is different. The packages being installed by What's the best approach? |
…bjects when manually providing disease data
… manually supplied
…d through epidist_db
…er` functions can be used uniformly in subsequent steps
To avoid loading it (and its dependencies) before renv::use() even got the chance to run, thus creating version conflicts between already loaded packages and requested versions. It seems for some reason that explicitly namespaced packages are automatically loaded in Rmd documents
8d51fee
to
e58fd12
Compare
Changes in epiparameter usage to update template contents to the latest version of the package:
epidist
uses diseases rather than pathogensepidist()
toepidist_db()
to extract from database (lines 380-385)epidist$params
toas.list(get_parameters(si_epiparameter))
(line 387)<- as.list so it can be used with function on line 406family(epidist)
to extract distribution name (line 388)epiparameter
usage in code chunks to estimate Rt (EpiNow2, R0)