Skip to content

Commit 512b8de

Browse files
committed
changes from v205_cran
1 parent 1da34f8 commit 512b8de

File tree

6 files changed

+932
-5
lines changed

6 files changed

+932
-5
lines changed

DESCRIPTION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,5 @@ Suggests:
4949
ecospat,
5050
geodata,
5151
usdm
52+
VignetteBuilder: knitr
5253
URL: https://jamiemkass.github.io/ENMeval/

R/utilities.R

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -423,11 +423,12 @@ maxentJARversion <- function() {
423423
#'
424424
maxnet.predictRaster <- function(mod, envs, pred.type = "cloglog",
425425
doClamp = TRUE, ...) {
426-
requireNamespace("maxnet", quietly = TRUE)
427-
envs.pts <- terra::as.data.frame(envs, xy = TRUE, na.rm = TRUE)
428-
mxnet.p <- predict(mod, envs.pts[,-1:-2], type = pred.type, clamp = doClamp, ...)
429-
envs.pts$pred <- mxnet.p
430-
pred <- terra::rast(cbind(envs.pts[,1:2], envs.pts$pred), type = "xyz")
426+
requireNamespace("maxnet", quitely = TRUE)
427+
envs.pts <- terra::values(envs) |> as.data.frame()
428+
mxnet.p <- predict(mod, envs.pts, type = pred.type, clamp = doClamp, ...)
429+
envs.pts[as.numeric(row.names(mxnet.p)), "pred"] <- mxnet.p
430+
pred <- terra::rast(cbind(terra::crds(envs, na.rm = FALSE),
431+
envs.pts$pred), type = "xyz")
431432
names(pred) <- "pred"
432433
return(pred)
433434
}

0 commit comments

Comments
 (0)