Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Fix #226] Propagate NAs in int_standardize
  • Loading branch information
vspinu committed Apr 28, 2015
1 parent 7ae4af4 commit c1d2c5b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
5 changes: 3 additions & 2 deletions R/intervals.r
Expand Up @@ -408,7 +408,8 @@ int_overlaps <- function(int1, int2){
#' int_standardize(int)
#' # 2001-01-01 UTC--2002-01-01 UTC
int_standardize <- function(int){
int[int@.Data < 0] <- int_flip(int[int@.Data < 0])
negs <- !is.na(int@.Data) & int@.Data < 0
int[negs] <- int_flip(int[negs])
int
}

Expand Down Expand Up @@ -465,7 +466,7 @@ setMethod("intersect", signature(x = "Interval", y = "Interval"), function(x,y){
int1 <- int_standardize(x)
int2 <- int_standardize(y)

starts <- pmax(int1@start, int2@start)
starts <- pmax(int1@start, int2@start)
ends <- pmin(int1@start + int1@.Data, int2@start + int2@.Data)
spans <- as.numeric(ends) - as.numeric(starts)

Expand Down
12 changes: 12 additions & 0 deletions tests/testthat/test-intervals.R
Expand Up @@ -543,3 +543,15 @@ test_that("summary.Interval creates useful summary", {
expect_equal(summary(c(int, NA)), text)
})

test_that("intersect on intervals propagates NAs (#226)", {
expect_equal(intersect(c(interval("2014-01-15", "2014-01-16"),
interval("2014-01-15", "2014-01-16")),
c(interval(NA,NA),interval(NA,NA))),
c(interval(NA,NA),interval(NA,NA)))
expect_equal(intersect(c(interval("2014-01-15", "2014-01-16"),
interval("2014-01-15", "2014-01-16"),
interval("2014-01-01", "2014-01-30")),
c(interval(NA,NA), interval(NA,NA),
interval("2014-01-15", "2014-02-16"))),
c(interval(NA,NA),interval(NA,NA), interval("2014-01-15", "2014-01-30")))
})

0 comments on commit c1d2c5b

Please sign in to comment.