Skip to content

add drop=TRUE to clamping to allow tibble pass-through #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
btupper wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add drop=TRUE to clamping to allow tibble pass-through #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afa40f4
add drop=TRUE to clamping to allow tibble pass-through
btupper May 30, 2023
787504c
add drop=TRUE to predict.maxnet when casting stars/terra to data.frame
btupper Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ Description: Procedures to fit species distributions models from occurrence reco
License: MIT + file LICENSE
URL: https://github.com/mrmaxent/maxnet
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.1
RoxygenNote: 7.2.3
LazyData: true
Encoding: UTF-8
9 changes: 4 additions & 5 deletions R/predict.maxnet.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,18 @@ predict.maxnet <-
if (!requireNamespace("stars", quietly = TRUE)) {
stop("package stars required, please install it first")
}
newdataframe <- as.data.frame(newdata)[, -c(1,2)]
newdataframe <- as.data.frame(newdata)[, -c(1,2), drop = FALSE]
}
if (is_spatraster <- inherits(newdata, "SpatRaster")) {
if (!requireNamespace("terra", quietly = TRUE)) {
stop("package terra required, please install it first")
}
newdataframe <- as.data.frame(newdata, na.rm = FALSE)
newdataframe <- as.data.frame(newdata, na.rm = FALSE, drop = FALSE)
}



if (clamp) {
for (v in intersect(names(object$varmax), names(newdataframe))) {
newdataframe[,v] <- pmin(pmax(newdataframe[,v], object$varmin[v]), object$varmax[v])
newdataframe[,v] <- pmin(pmax(newdataframe[,v, drop = TRUE], object$varmin[v]), object$varmax[v])
}
}
terms <- sub("hinge\\((.*)\\):(.*):(.*)$", "hingeval(\\1,\\2,\\3)", names(object$betas))
Expand Down