Skip to content

Commit

Permalink
fix #45 thanks Roger Bivand
Browse files Browse the repository at this point in the history
  • Loading branch information
mdsumner committed Aug 19, 2020
1 parent 20fff0c commit 09cc739
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 35 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Authors@R: c(person("Michael D.","Sumner", role = c("aut", "cre"),
person("Sebastian", "Luque", role = "ctb"),
person("Anthony", "Fischbach", role = "ctb"),
person("Tomislav", "Hengl", role = "ctb"))
Version: 1.7.1
Version: 1.7.1.9001
Depends:
R (>= 3.3.0)
Imports:
Expand Down Expand Up @@ -46,7 +46,7 @@ ByteCompile: yes
License: GPL-3
LazyData: yes
VignetteBuilder: knitr
RoxygenNote: 7.1.0
RoxygenNote: 7.1.1
Roxygen: list(markdown = TRUE)
Encoding: UTF-8
Language: en-US
65 changes: 32 additions & 33 deletions tests/testthat/test-algos.R
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

context("test-algos")

test_that("separate IDs works", {
test_that("separate IDs works", {

tms <- (Sys.time() + 1:100)[-(40:60)]
expect_equal(sepIdGaps(rep_len(1, length(tms)), tms, minGap = 2),
expect_equal(sepIdGaps(rep_len(1, length(tms)), tms, minGap = 2),
rep(c("1", "1_2"), c(39, 40)))
expect_equal(sepIdGaps(rep_len(2, length(tms)), tms, minGap = 2),


expect_equal(sepIdGaps(rep_len(2, length(tms)), tms, minGap = 2),
rep(c("2", "2_2"), c(39, 40)))


})
tr <- walrus818[1:600, ]
test_that("speedfilter and sdafilter works", {
Expand All @@ -20,24 +20,23 @@ test_that("speedfilter and sdafilter works", {
expect_silent(filt1 <- speedfilter(tr, max.speed = 2000))
filt2 <- speedfilter(tr, max.speed = 100)
expect_true(sum(filt1) > sum(filt2))

expect_silent(sda(tr, smax = 1000, pre = filt1))
expect_error(speedfilter(data.frame(1)), "only trip objects supported")
tr@proj4string@projargs <- NA_character_
expect_warning(speedfilter(tr, 20))

expect_warning(expect_equal(expect_output(speedfilter(tr)), tr))
## no longer needed #45
#tr@proj4string@projargs <- NA_character_
#expect_warning(speedfilter(tr, 20))
# expect_warning(expect_equal(expect_output(speedfilter(tr)), tr))
})



test_that("angle calculation works", {
tra <- walrus818[1:12, ]
expect_equal(sum(is.na(trackAngle(tra))), 2)

tra@proj4string@projargs <- NA_character_
expect_warning(trackAngle(tra))




tra1 <- tra[1:5, ]
tra1@coords <- cbind(1:5, 0)
## we trigger the "all 180"
Expand All @@ -51,20 +50,20 @@ sp::proj4string(d) <- sp::CRS("+proj=laea +ellps=sphere")

test_that("equal-time interpolation works", {
expect_output(tr2 <- interpequal(tr, dur = 0.1), "lost seconds")

expect_true(nrow(tr2) > nrow(tr) * 8)
})


test_that("home distance works", {
expect_length(homedist(walrus818), length(unique(walrus818$Deployment)))

expect_length(homedist(reproj(walrus818, "+proj=longlat +datum=WGS84")),length(unique(walrus818$Deployment)))
expect_length(homedist(walrus818, home = cbind(0, 0)),

expect_length(homedist(walrus818, home = cbind(0, 0)),
length(unique(walrus818$Deployment)))


})


Expand All @@ -75,38 +74,38 @@ test_that("time spent calc works", {
#expect_error(rasterize(w10, method = "pixellate", dur = 1000))
expect_s4_class(rasterize(w10), "BasicRaster")

expect_s4_class(tripGrid(w10), "SpatialGridDataFrame")

expect_s4_class(tripGrid(w10), "SpatialGridDataFrame")
expect_s4_class(tripGrid(w10, grid = as(raster(w10), "GridTopology")), "SpatialGridDataFrame")
expect_error(tripGrid(w10, grid = raster(w10), field = w10$Wet), "GridTopology")
expect_s4_class(rasterize(w10, grid = raster(w10), field = "Wet"), "BasicRaster")
expect_s4_class(rasterize(w10, grid = raster(w10), method = "density"), "BasicRaster")


expect_output(expect_s4_class(tripGrid.interp(w10, grid = as(raster(w10), "GridTopology"), method = "count", dur = 1300), "SpatialGridDataFrame"))

expect_s4_class(makeGridTopology(w10), "GridTopology")
expect_s4_class(makeGridTopology(xlim = c(0, 10), ylim = c(10, 100)), "GridTopology")
expect_s4_class(makeGridTopology(xlim = c(0, 10), ylim = c(10, 100), buffer = 50), "GridTopology")
expect_s4_class(makeGridTopology(xlim = c(0, 10), ylim = c(10, 100), cellsize = c(20, 30), adjust2longlat = TRUE), "GridTopology")
expect_s4_class(makeGridTopology(xlim = c(0, 10), ylim = c(10, 100), buffer = 19, cellsize = c(20, 30), adjust2longlat = TRUE), "GridTopology")

context("check when locations don't change")
ww <- walrus818[1:100, ]
ww@coords[10, ] <- ww@coords[9, ]
expect_s4_class(rasterize(ww), "BasicRaster")

})



test_that("exact cut works", {
tr1 <- walrus818[1:20, ]

cutter <- c(tr1$DataDT[1] - 1, tr1$DataDT[5] - 360, max(tr1$DataDT) + 1)

expect_equal(length(cut(tr1, cutter)), 2L)

expect_error( cut(tr1, c("arble", "2 min")), "if breaks is character, length\\(breaks\\) should be 1L")
}
)

0 comments on commit 09cc739

Please sign in to comment.