-
Notifications
You must be signed in to change notification settings - Fork 1
Edits round 1 #12
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
Open
tgerke
wants to merge
6
commits into
stopsack:dev
Choose a base branch
from
tgerke:t-edits
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Edits round 1 #12
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
da7b11a
rm .DS_Store
tgerke a4986fd
light edits and linting
tgerke 8176a5f
wrangle duplicate cases in a single call
tgerke 92dea8a
lint, minor edits
tgerke 720df64
big refactor; move most switch and if/else to explicit if blocks
tgerke 02656d3
fixes #17
tgerke File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,14 +7,16 @@ | |
# (Miettinen/Schouten approach to directly estimating relative risks) | ||
estimate_duplicate <- function(formula, data, ...) { | ||
yvar <- as.character(all.vars(formula)[1]) | ||
data <- data %>% | ||
dplyr::mutate(.clusterid = dplyr::row_number()) | ||
data <- dplyr::bind_rows(data, | ||
data %>% | ||
dplyr::rename(outc = dplyr::one_of(!!yvar)) %>% | ||
dplyr::filter(.data$outc == 1) %>% | ||
dplyr::mutate(outc = 0) %>% | ||
dplyr::rename(!!yvar := "outc")) | ||
|
||
data <- data |> | ||
dplyr::mutate(.clusterid = dplyr::row_number()) |> | ||
dplyr::rename(outc = dplyr::one_of(!!yvar)) |> | ||
tidyr::uncount(outc + 1) |> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The see the elegance in this approach! However, in the spirit of my comment in #10, it would be nice not to rely on tidyverse functions down the road. Let us focus on testing and bug fixes for now. |
||
dplyr::group_by(.clusterid) |> | ||
dplyr::mutate(outc = floor(outc / dplyr::row_number())) |> | ||
dplyr::ungroup() |> | ||
dplyr::rename(!!yvar := "outc") | ||
|
||
fit <- eval(substitute(stats::glm(formula = formula, | ||
family = binomial(link = "logit"), | ||
data = data))) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
see earlier comment about base R pipe