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

redist 4.2.0 #176

Merged
merged 58 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
e5e2f67
revert part of ba7c109
christopherkenny Jun 19, 2023
b7d3cdc
use helper fn
christopherkenny Jun 19, 2023
4d7dbe4
revert wrong if statements from ba7c109
christopherkenny Jun 19, 2023
a8e1e0c
fix loud total splits error
christopherkenny Jun 19, 2023
187f049
remove empty spaces
christopherkenny Jun 21, 2023
6f04c1e
target size too strict
christopherkenny Aug 11, 2023
7940955
Update redist_constr.R
christopherkenny Aug 14, 2023
7a41df2
fix cli >3.4 issue
christopherkenny Sep 8, 2023
43f8fdd
fix #166
CoryMcCartan Oct 3, 2023
379d804
fix #167
CoryMcCartan Oct 3, 2023
3adc06b
cleanup
CoryMcCartan Oct 3, 2023
953bf6c
cleanup, reorg, and deprecate
CoryMcCartan Oct 3, 2023
9714bf2
update vignettes, readme, and examples
CoryMcCartan Oct 3, 2023
e400cf8
Merge pull request #168 from alarm-redist/deprecations
CoryMcCartan Oct 3, 2023
9eb282d
clean up sink, reindex, as.factor(as.integer()), etc
CoryMcCartan Oct 3, 2023
6b42cc0
checkpoint m-s work
CoryMcCartan Oct 4, 2023
43fa883
confit code; m-s and default tweaks
CoryMcCartan Oct 4, 2023
e614dcc
fix #160
CoryMcCartan Oct 4, 2023
a2e7b32
adjust printing
CoryMcCartan Oct 4, 2023
fbefcab
fix #159
CoryMcCartan Oct 4, 2023
ca5fc79
shortburst improvements
CoryMcCartan Oct 4, 2023
ceb5d96
fix #169
CoryMcCartan Oct 4, 2023
4556d00
Update redist_flip_tidy.R
christopherkenny Oct 4, 2023
158845c
Update redist_flip_tidy.R
christopherkenny Oct 4, 2023
a1f0ed5
remove deprecated flip interface
CoryMcCartan Oct 4, 2023
638542e
redoc
CoryMcCartan Oct 4, 2023
a6801f3
work on flip vignette and add test for crash
CoryMcCartan Oct 4, 2023
a9b55df
rename files
CoryMcCartan Oct 4, 2023
62b714c
debugging macro for chris [ci skip]
CoryMcCartan Oct 4, 2023
991fe3e
return statements
christopherkenny Oct 4, 2023
09d62f1
Merge branch 'dev' of https://github.com/alarm-redist/redist into dev
christopherkenny Oct 4, 2023
b1f4928
more return fixes
christopherkenny Oct 4, 2023
97818d1
debugging flip [ci skip]
CoryMcCartan Oct 4, 2023
9c4ee22
Merge branch 'dev' of github.com:alarm-redist/redist into dev
CoryMcCartan Oct 4, 2023
ddcea11
fix #170
CoryMcCartan Oct 4, 2023
8a1f46d
doc and version bump
CoryMcCartan Oct 4, 2023
777203d
fix cli format
CoryMcCartan Oct 5, 2023
694134b
cleanup explore/
CoryMcCartan Oct 5, 2023
12ce5c7
create and use child environment for parallel
christopherkenny Nov 3, 2023
f84edb1
ignore
CoryMcCartan Nov 7, 2023
8f4d841
fix #173
CoryMcCartan Nov 7, 2023
d9a9855
fix overprinting in short bursts
CoryMcCartan Nov 7, 2023
6fece90
update docs with smc citation
CoryMcCartan Nov 8, 2023
1ccd6ed
fix flip thinning with multiple constraint issue
christopherkenny Nov 12, 2023
6de4965
no rhat if any chain is constant
christopherkenny Nov 22, 2023
1681d3b
port fix for mergesplit
christopherkenny Nov 22, 2023
df29bc3
handle CRAN note "Lost braces in \itemize"
christopherkenny Dec 17, 2023
ae8a5aa
work; expose functions for testing
CoryMcCartan Dec 20, 2023
24e196c
update SMC doc
CoryMcCartan Dec 20, 2023
385d743
fix check, i think
christopherkenny Jan 4, 2024
a0e17db
make edge center speedy
christopherkenny Jan 5, 2024
66a973c
use dplyr to import tibble
christopherkenny Jan 5, 2024
70a8b8c
#174
christopherkenny Jan 8, 2024
28c69ee
trim suggests
christopherkenny Jan 8, 2024
79e703e
Merge branch 'dev' of github.com:alarm-redist/redist into dev
CoryMcCartan Jan 8, 2024
9e441e3
fix nthin in tests
CoryMcCartan Jan 8, 2024
7a7ad66
redoc
CoryMcCartan Jan 8, 2024
ce17ec4
update deprecation messages
CoryMcCartan Jan 8, 2024
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
Prev Previous commit
Next Next commit
cleanup
  • Loading branch information
CoryMcCartan committed Oct 3, 2023
commit 3adc06b0a3d6eea7e5da38e839ff84a276326f5a
3 changes: 0 additions & 3 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ export(min_move_parity)
export(muni_splits)
export(number_by)
export(partisan_metrics)
export(persily)
export(pick_a_plan)
export(plan_distances)
export(plan_parity)
export(plans_diversity)
Expand Down Expand Up @@ -146,7 +144,6 @@ export(redist.plot.adj)
export(redist.plot.cores)
export(redist.plot.distr_qtys)
export(redist.plot.hist)
export(redist.plot.interactive)
export(redist.plot.majmin)
export(redist.plot.map)
export(redist.plot.penalty)
Expand Down
118 changes: 0 additions & 118 deletions R/pick_a_plan.R

This file was deleted.

100 changes: 0 additions & 100 deletions R/plot_interactive.R

This file was deleted.

1 change: 0 additions & 1 deletion R/redist_constr.R
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,6 @@ add_constr_custom <- function(constr, strength, fn) {
args <- rlang::fn_fmls(fn)
if (length(args) != 2) cli_abort("Function must take exactly two arguments.")


constr_env = rlang::fn_env(fn)
# every symbol used in the function (except the 2 arguments)
var_names = setdiff(
Expand Down
9 changes: 6 additions & 3 deletions R/redist_smc.R
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,12 @@ redist_smc <- function(map, nsims, counties = NULL, compactness = 1, constraints

if (ncores_runs > 1) {
`%oper%` <- `%dorng%`
of <- ifelse(Sys.info()[['sysname']] == 'Windows',
tempfile(pattern = paste0('smc_', substr(Sys.time(), 1, 10)), fileext = '.txt'),
'')
of <- if (Sys.info()[["sysname"]] == "Windows") {
tempfile(pattern = paste0("smc_", substr(Sys.time(), 1, 10)), fileext = ".txt")
} else {
""
}

if (!silent)
cl <- makeCluster(ncores_runs, outfile = of, methods = FALSE,
useXDR = .Platform$endian != "little")
Expand Down
30 changes: 0 additions & 30 deletions man/persily.Rd

This file was deleted.

43 changes: 0 additions & 43 deletions man/pick_a_plan.Rd

This file was deleted.

39 changes: 0 additions & 39 deletions man/redist.plot.interactive.Rd

This file was deleted.