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

588 adding stratified newcombe@main #696

Merged
merged 60 commits into from
Sep 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
7879331
initial add of stratified Wilson with weights estimation
Melkiades Sep 6, 2022
0dd572a
styling
Melkiades Sep 6, 2022
3858358
details
Melkiades Sep 6, 2022
20176c4
adding on examples and some comments
Melkiades Sep 6, 2022
8d4c96c
adding some useful tests for CMH
Melkiades Sep 6, 2022
b93b95c
bug fix
Melkiades Sep 6, 2022
ae4d6df
fixing max_nit and taking out browser(). Adding more examples
Melkiades Sep 6, 2022
3717fcb
adding rtables-based tests and fixing olderies
Melkiades Sep 6, 2022
02649fa
temporary documentation. To go through again to check all is fine
Melkiades Sep 6, 2022
24d0527
adding test for the other variables
Melkiades Sep 6, 2022
71b8e2a
fixed error for variable x in s_proportion
Melkiades Sep 6, 2022
0acf9dd
syling
Melkiades Sep 6, 2022
a1b7f21
linting and final snake_case fix
Melkiades Sep 6, 2022
ed0215c
Update R/estimate_proportion.R
Melkiades Sep 7, 2022
ebb35b9
Update R/estimate_proportion.R
Melkiades Sep 7, 2022
c2e9858
Update R/estimate_proportion.R
Melkiades Sep 7, 2022
554ba11
adding helper function as docs and tests and examples
Melkiades Sep 7, 2022
5bb9b28
fixes following daniel's comments
Melkiades Sep 7, 2022
0e618c3
adding other helper function for iterative weights approximation
Melkiades Sep 7, 2022
2f59f7c
adding small test for convergence.
Melkiades Sep 7, 2022
1943804
trying avoiding lintr complaining spell check
Melkiades Sep 7, 2022
9a429b5
styling is corrected
Melkiades Sep 7, 2022
a2020eb
linting. Can I split the lines like this?
Melkiades Sep 7, 2022
2eea868
fixing numeric values after the change
Melkiades Sep 7, 2022
326c49e
fixing note
Melkiades Sep 7, 2022
9734fb9
[skip actions] Roxygen Man Pages Auto Update
dependabot-preview[bot] Sep 7, 2022
18eb113
adding Daniel's design for producing weights from CMH
Melkiades Sep 8, 2022
a69b80e
fixing spelling and NaN
Melkiades Sep 8, 2022
d67e29a
Merge branch '588_adding_stratified_newcombe@main' of github.com:insi…
Melkiades Sep 8, 2022
92cf478
adding prop_diff_strat_nc with tests, examples, documentation and an …
Melkiades Sep 8, 2022
cc15be4
final add of tests and some fixes
Melkiades Sep 8, 2022
6902ec8
fixing tests with the new outputs: weights, n1, n2
Melkiades Sep 8, 2022
f6f558a
Update R/estimate_proportion.R
Melkiades Sep 9, 2022
f882200
Update R/prop_diff.R
Melkiades Sep 9, 2022
3d2e7db
Update R/estimate_proportion.R
Melkiades Sep 9, 2022
caeb856
Update R/estimate_proportion.R
Melkiades Sep 9, 2022
7636745
Update R/prop_diff.R
Melkiades Sep 9, 2022
6d5a1fd
Update R/prop_diff.R
Melkiades Sep 9, 2022
62bd931
Update R/estimate_proportion.R
Melkiades Sep 9, 2022
44d9ca2
[skip actions] Roxygen Man Pages Auto Update
dependabot-preview[bot] Sep 9, 2022
e7d2486
fixing documentation and adding warning for not convergence
Melkiades Sep 9, 2022
888e012
references and so on
Melkiades Sep 9, 2022
daa231b
reducing comments and changing new weights
Melkiades Sep 9, 2022
7dcf8f4
fixing `as.numeric` instead of `array` (losing the annoying d1) and c…
Melkiades Sep 9, 2022
17fad84
fixing conf_int
Melkiades Sep 9, 2022
11ccaff
Merge 17fad84d3271ea62ebf83abb0ddb9db0fdcb01aa into 812f59a32bc965aa3…
Melkiades Sep 9, 2022
23f5656
[skip actions] Restyle files
github-actions[bot] Sep 9, 2022
3d3cc2c
[skip actions] Roxygen Man Pages Auto Update
dependabot-preview[bot] Sep 9, 2022
8be2d07
Merge branch '588_adding_stratified_newcombe@main' of https://github.…
dependabot-preview[bot] Sep 9, 2022
8b549a0
Merge branch 'main' into 588_adding_stratified_newcombe@main
danielinteractive Sep 12, 2022
f461987
some renaming
Melkiades Sep 12, 2022
d5cf6ae
Merge branch '588_adding_stratified_newcombe@main' of github.com:insi…
Melkiades Sep 12, 2022
e06fcd9
fixing missing .var
Melkiades Sep 12, 2022
a925b42
Merge e06fcd934b7b5033212802acaa839e3fcb1a364f into 06133ff3dc4b956e4…
Melkiades Sep 12, 2022
10139a7
[skip actions] Restyle files
github-actions[bot] Sep 12, 2022
3289bd8
phantom change for checks/tests
Melkiades Sep 12, 2022
d0c195d
Update R/prop_diff.R
Melkiades Sep 12, 2022
e609496
removing forgotten `tern:::`
Melkiades Sep 12, 2022
14ab57a
Merge branch '588_adding_stratified_newcombe@main' of github.com:insi…
Melkiades Sep 12, 2022
a4001fd
Merge branch 'main' into 588_adding_stratified_newcombe@main
Melkiades Sep 12, 2022
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
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,10 @@ export(prop_clopper_pearson)
export(prop_diff_cmh)
export(prop_diff_ha)
export(prop_diff_nc)
export(prop_diff_strat_nc)
export(prop_diff_wald)
export(prop_jeffreys)
export(prop_strat_wilson)
export(prop_wald)
export(prop_wilson)
export(s_compare)
Expand Down
2 changes: 1 addition & 1 deletion R/estimate_multinomial_rsp.R
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ s_length_proportion <- function(x,
n_true <- length(x)
n_false <- .N_col - n_true
x_logical <- rep(c(TRUE, FALSE), c(n_true, n_false))
s_proportion(x = x_logical, ...)
s_proportion(df = x_logical, ...)
}

#' @describeIn estimate_multinomial_rsp Formatted Analysis function which can be further customized by calling
Expand Down
Loading