Skip to content

Get rid of PB NA warning and improve NA handling overall. #11

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.

Sign up for GitHub

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
MilesMcBain wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Get rid of PB NA warning and improve NA handling overall. #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions pkg/R/triangle.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ pslg <- function(P, PB=NA, PA=NA, S=NA, SB=NA, H=NA) {
}

check.na.nan(P)
if (length(PB) > 1) check.na.nan(PB)
if (length(PA) > 1) check.na.nan(PA)
if (length(S) > 1) check.na.nan(S)
if (length(SB) > 1) check.na.nan(SB)
if (length(H) > 1) check.na.nan(H)

## Deal with P
if (ncol(P) != 2) {
Expand All @@ -81,7 +86,7 @@ pslg <- function(P, PB=NA, PA=NA, S=NA, SB=NA, H=NA) {
}

## If attributes not specified, set them to a matrix with zero columns
if (any(is.na(PA))) {
if ( (length(PA) == 1) && (is.na(PA))) {
PA <- matrix(0, nrow(P), 0)
}
## Make sure the size of the point attribute matrix is correct
Expand All @@ -90,13 +95,13 @@ pslg <- function(P, PB=NA, PA=NA, S=NA, SB=NA, H=NA) {
}

## If boundary vertices not specified, set them to 0
if (is.na(PB)) {
if ( (length(PB) == 1) && (is.na(PB))) {
PB <- 0
}
PB <- rep(PB, length.out=nrow(P))

## Deal with S
if (any(is.na(S))) {
if ( (length(S) == 1) && (is.na(S))) {
S <- matrix(0, 0, 2)
} else {
if (ncol(S) != 2) {
Expand All @@ -105,13 +110,13 @@ pslg <- function(P, PB=NA, PA=NA, S=NA, SB=NA, H=NA) {
}

## If boundary segments not specified, set them to 0
if (any(is.na(SB))) {
if ( (length(SB) == 1) && (is.na(SB))) {
SB <- 0
}
SB <- rep(SB, length.out=nrow(S))

## If hole not specified, set it to empty matrix
if (any(is.na(H))) {
if ( (length(H) == 1) && (is.na(H))) {
H <- matrix(0, 0, 2)
} else {
if (ncol(H) != 2) {
Expand Down