Merge pull request #16 from ajrominger/single_func_fix

fixes bug when `traits` argument only has 1 column
daijiang · Nov 17, 2020 · 3b6c3e5 · 3b6c3e5
2 parents b170f83 + b2ffa8e
commit 3b6c3e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/R/hill_func.R b/R/hill_func.R
@@ -68,7 +68,7 @@ hill_func <- function(comm, traits, traits_as_is = FALSE, q = 0, base = exp(1),
         if(!inherits(dij, "dist")) stop("`traits` is not a distance object yet `trait_as_is` is TRUE\n")
     } else {
         # traits is not a distance matrix
-        traits <- traits[trait_sp, ]
+        traits <- traits[trait_sp, , drop = FALSE]
 
         if (ncol(traits) == 1) {
             # only 1 trait

diff --git a/R/hill_func_parti.R b/R/hill_func_parti.R
@@ -59,7 +59,7 @@ hill_func_parti <- function(comm, traits, traits_as_is = FALSE, q = 0, base = ex
         dij <- as.matrix(traits)
     } else {
         # traits is not a distance matrix
-        traits <- traits[colnames(comm), ]
+        traits <- traits[colnames(comm), , drop = FALSE]
 
         if (ncol(traits) == 1) {
             # only 1 trait