Merge branch 'master' of https://github.com/gabferreira/phylogrid

gabferreira · Nov 4, 2023 · 12008dd · 12008dd
2 parents cf51120 + ef716b0
commit 12008dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/R/arg.check.R b/R/arg.check.R
@@ -25,7 +25,9 @@
 #' @export
 arg.check <- function(call,
                       arguments = c("LR", "inv.R", "branch.length", "n.descen", "tree")  ){
-  fun <- match.fun(as.list(call)[[1]])
+  # get function
+  fun <- get(sub("phyloraster::|phyloraster::", "", as.character(as.list(call)[[1]]))[1],
+             mode = "function", envir = loadNamespace("phyloraster"))
   defined <- methods::formalArgs(args(fun))
   passed <- names(as.list(call)[-1])
 

diff --git a/R/shp2rast.R b/R/shp2rast.R
@@ -42,7 +42,7 @@ shp2rast <- function(x, y = NULL, sps.col, ymask = FALSE, background = NA,
     x <- terra::vect(x)
   }
 
-  nm <- unique(data.frame(x)[,sps.col])
+  nm <- unique(data.frame(x)[,sps.col]) # get the species names from shapefile x
 
   ynull <- is.null(y) # y is null?
 

diff --git a/man/shp2rast.Rd b/man/shp2rast.Rd