diff options
| author | Ken Kellner <ken@kenkellner.com> | 2023-10-20 16:40:02 -0400 |
|---|---|---|
| committer | Ken Kellner <ken@kenkellner.com> | 2023-10-20 16:40:02 -0400 |
| commit | 536e32ad7b2526f8fac1b315ed2e99accac0d50f (patch) | |
| tree | dd784d0d32cba06c6d1156c2486ee8a7cbc23599 | |
| parent | b7044c9b64fafdb22c9a7a22467b9551c70af8ae (diff) | |
Allow yearlySiteCovs with goccu
| -rw-r--r-- | DESCRIPTION | 4 | ||||
| -rw-r--r-- | R/goccu.R | 2 | ||||
| -rw-r--r-- | tests/testthat/test_goccu.R | 11 |
3 files changed, 4 insertions, 13 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index 3006543..5658925 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: unmarked -Version: 1.3.2.9003 -Date: 2023-10-13 +Version: 1.3.2.9004 +Date: 2023-10-20 Type: Package Title: Models for Data from Unmarked Animals Authors@R: c( @@ -18,7 +18,7 @@ unmarkedFrameGOccu <- function(y, siteCovs=NULL, obsCovs=NULL, numPrimary, y[y > 1] <- 1 if(numPrimary < 2) stop("numPrimary < 2, use occu instead") umf <- unmarkedFrameGPC(y, siteCovs=siteCovs, obsCovs=obsCovs, - numPrimary=numPrimary, yearlySiteCovs=NULL) + numPrimary=numPrimary, yearlySiteCovs=yearlySiteCovs) class(umf) <- "unmarkedFrameGOccu" umf } diff --git a/tests/testthat/test_goccu.R b/tests/testthat/test_goccu.R index 4572515..48f6031 100644 --- a/tests/testthat/test_goccu.R +++ b/tests/testthat/test_goccu.R @@ -21,16 +21,6 @@ y <- rbinom(M*T*J, 1, zzmat*p) y <- matrix(y, M, J*T) umf <- unmarkedMultFrame(y=y, numPrimary=T) -unmarkedFrameGOccu <- function(y, siteCovs=NULL, obsCovs=NULL, numPrimary, - yearlySiteCovs=NULL) { - y[y > 1] <- 1 - if(numPrimary < 2) stop("numPrimary < 2, use occu instead") - umf <- unmarkedFrameGPC(y, siteCovs=siteCovs, obsCovs=obsCovs, - numPrimary=numPrimary, yearlySiteCovs=NULL) - class(umf) <- "unmarkedFrameGOccu" - umf -} - test_that("unmarkedFrameGOccu can be constructed", { set.seed(123) sc <- data.frame(x=rnorm(M)) @@ -40,6 +30,7 @@ test_that("unmarkedFrameGOccu can be constructed", { umf2 <- unmarkedFrameGOccu(y, siteCovs=sc, obsCovs=list(x2=oc), yearlySiteCovs=list(x3=ysc), numPrimary=T) expect_is(umf2, "unmarkedFrameGOccu") + expect_equal(names(umf2@yearlySiteCovs), "x3") }) test_that("goccu can fit models", { |