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

Add remaining verification functions and supporting internal functions. #21

Merged
merged 1 commit into from
Jun 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: wallis
Title: Room squares in R
Version: 0.0.0.9004
Version: 0.0.0.9005
Authors@R:
person("Matthew", "Henderson", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0001-7949-8208"))
Expand Down
3 changes: 3 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

export(empty_cells)
export(empty_room)
export(is_maximal_proom)
export(is_partial_room)
export(is_room)
export(n_filled_cells)
export(plot_room_square)
export(unused_pairs)
Expand Down
11 changes: 11 additions & 0 deletions R/avail.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#' Is pair p available in R at cell e?
#'
#' @param R A partial Room square.
#' @param p A pair.
#' @param e An empty cell of R.
#'
#' @return True if and only if the pair p can be placed in cell e in R.
avail <- function(R, p, e) {
available <- R[R$row == e[1] & R$col == e[2], "avail"]$avail[[1]]
p[1] %in% available && p[2] %in% available
}
12 changes: 12 additions & 0 deletions R/distinct-pairs.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#' Pairs used in R
#'
#' @param R A Room square.
#'
#' @return A list of the distinct pairs that appear in R.
distinct_pairs <- function(R) {
R |>
tidyr::pivot_wider() |>
dplyr::filter(!is.na(first)) |>
dplyr::filter(!is.na(second)) |>
dplyr::distinct(first, second)
}
72 changes: 72 additions & 0 deletions R/room.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
#' Is R a partial Room square?
#'
#' @param R A partial Room square.
#'
#' @return True if and only if R is a partial Room square, False otherwise.
#' @export
is_partial_room <- function(R) {
expected_number_of_distinct_pairs <- choose(max(R$col) + 1, 2)
nfc <- n_filled_cells(R)
is_row_latin(R) &&
is_col_latin(R) &&
n_filled_cells(R) <= expected_number_of_distinct_pairs
}

#' Is R a Room square?
#'
#' @param R A Room square.
#'
#' @return True if and only if R is a Room square, False otherwise.
#' @export
is_room <- function(R) {
nfc <- n_filled_cells(R)
is_partial_room(R) && nrow(distinct_pairs(R)) == nfc
}

#' Is R a maximal partial Room square?
#'
#' @param R A partial Room square.
#'
#' @return True if and only if R is a maximal partial Room square, False otherwise.
#' @export
is_maximal_proom <- function(R) {

result <- is_partial_room(R)

n <- max(R$col)

R <- R |>
dplyr::mutate(
see = purrr::map2(row, col, see2, R = R)
) |>
dplyr::mutate(
avail = purrr::map(see, setdiff, x = 0:(n - 1))
)

# iterate through the set of unusued pairs trying to place them
# return true if and only if no pairs can be placed
for(p in unused_pairs(R)) {

E <- empty_cells(R)
# try to find a hole
x <- NULL

# iterate through empty cells in given order
for(cell in E) {

if(avail(R, p, cell)) {
x <- cell
}

}

# if we were successful then this is not a maximal proom
if(!is.null(x)) {
result <- FALSE
break()
}

}

return(result)
}
28 changes: 28 additions & 0 deletions R/see.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#' Symbols visible from cell e
#'
#' @param R A Room square.
#' @param e A cell in R.
#'
#' @return A list of symbols visible in R from cell e.
see <- function(R, e) {
first <- R[R$row == e[1] | R$col == e[2], "first"]$first
first_non_na <- first[!is.na(first)]
second <- R[R$row == e[1] | R$col == e[2], "second"]$second
second_non_na <- second[!is.na(second)]
sort(unique(c(first_non_na, second_non_na)))
}

#' Symbols visible from cell (row, col) in R
#'
#' @param R A Room square.
#' @param row A row index.
#' @param col A column index.
#'
#' @return A list of symbols visible in R from cell (col, rol).
see2 <- function(R, row, col) {
first <- R[R$row == row | R$col == col, "first"]$first
first_non_na <- first[!is.na(first)]
second <- R[R$row == row | R$col == col, "second"]$second
second_non_na <- second[!is.na(second)]
sort(unique(c(first_non_na, second_non_na)))
}
21 changes: 21 additions & 0 deletions man/avail.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions man/distinct_pairs.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions man/is_maximal_proom.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions man/is_partial_room.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions man/is_room.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions man/see.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions man/see2.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.