Minor change to bd.sim.traits to make sure it doesn't bug when ran wi…

…th multiple traits.
brpetrucci · Jul 18, 2023 · e6ad375 · e6ad375
1 parent 63d1de9
commit e6ad375
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/R/bd.sim.traits.R b/R/bd.sim.traits.R
@@ -866,7 +866,7 @@ bd.sim.traits <- function(n0, lambda, mu,
  # if there are hidden states
  if (nHidden[tr] > 1) {
  # set them to normal states
- traitsSp$value <- traitsSp$value %% nStates
+ traitsSp$value <- traitsSp$value %% nStates[tr]
 
  if (nrow(traitsSp) > 1) {
  # duplicate rows

diff --git a/R/traits.summary.R b/R/traits.summary.R
@@ -140,7 +140,7 @@ traits.summary <- function(sim, traits, fossils = NULL, selection = "all") {
 
  # create final list return
  res <- vector(mode = "list", length = length(traits[[1]]))
- 
+
  # iterate through traits
  for (t in 1:length(traits[[1]])) {
  # create return
@@ -159,7 +159,7 @@ traits.summary <- function(sim, traits, fossils = NULL, selection = "all") {
  # add name and status
  traitNames <- c(traitNames, paste0("t", sp))
  traitStatus <- c(traitStatus, c("extinct", "extant")[sim$EXTANT[sp] + 1])
- 
+
  # check whether we need to go through fossils or not
  if (!is.null(fossils) && sum(fossils$Species == paste0("t", sp)) > 0) {
  # select fossil rows that are for this species
@@ -184,7 +184,7 @@ traits.summary <- function(sim, traits, fossils = NULL, selection = "all") {
  }
  }
  }
- 
+
  # name traitList
  names(traitList) <- traitNames