diff options
| author | Ken Kellner <ken@kenkellner.com> | 2023-12-10 11:17:11 -0500 |
|---|---|---|
| committer | Ken Kellner <ken@kenkellner.com> | 2023-12-10 11:17:11 -0500 |
| commit | b4234c9934a114f8ae86a423b363e595081ae868 (patch) | |
| tree | 0c18fbb56d32518d90475c751daeeb32cc998310 | |
| parent | 8c5b5a4e57bfd32237a73388b40aa8594a9ea244 (diff) | |
Try to fix CI matrix issues and fix a couple broken tests
| -rw-r--r-- | .github/workflows/R-CMD-check.yaml | 1 | ||||
| -rw-r--r-- | R/unmarkedCrossVal.R | 4 | ||||
| -rw-r--r-- | tests/testthat/test_occu.R | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 39efba7..38b4b13 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -47,6 +47,7 @@ jobs: with: extra-packages: any::rcmdcheck needs: check + upgrade: 'TRUE' - uses: r-lib/actions/check-r-package@v2 with: diff --git a/R/unmarkedCrossVal.R b/R/unmarkedCrossVal.R index a49d067..4b186ee 100644 --- a/R/unmarkedCrossVal.R +++ b/R/unmarkedCrossVal.R @@ -60,10 +60,10 @@ setMethod("crossVal", "unmarkedFit", if(missing(ncores)) ncores <- parallel::detectCores()-1 cl <- parallel::makeCluster(ncores) on.exit(parallel::stopCluster(cl)) - stat_raw <- pblapply(1:n_reps, do_crossval, object, + stat_raw <- lapply2(1:n_reps, do_crossval, object, partitions, statistic, ..., cl = cl) } else { - stat_raw <- pblapply(1:n_reps, do_crossval, object, + stat_raw <- lapply2(1:n_reps, do_crossval, object, partitions, statistic, ...) } diff --git a/tests/testthat/test_occu.R b/tests/testthat/test_occu.R index fe52ea7..043bc59 100644 --- a/tests/testthat/test_occu.R +++ b/tests/testthat/test_occu.R @@ -274,9 +274,9 @@ test_that("occu predict works",{ E1.3 <- predict(fm1, type="state", newdata=nd1.1, appendData=TRUE) E1.4 <- predict(fm1, type="det", newdata=nd1.2) - r1 <- raster(matrix(rnorm(100), 10)) + r1 <- raster::raster(matrix(rnorm(100), 10)) expect_error(predict(fm1, type="state", newdata=r1)) - s1 <- stack(r1) + s1 <- raster::stack(r1) expect_error(predict(fm1, type="state", newdata=s1)) names(s1) <- c("x3") E1.5 <- predict(fm1, type="det", newdata=s1) |