Merge branch 'main' of github.com:GlobalEcologyLab/poems into main

# Conflicts: # R/Generator.R
GlobalEcologyLab · Mar 15, 2021 · 6b57f1f · 6b57f1f
2 parents f1b945b + 558775d
commit 6b57f1f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/R/Generator.R b/R/Generator.R
@@ -321,7 +321,7 @@ Generator <- R6Class("Generator",
  } else if (!is.list(distr_params) || !all(expected_distr_params %in% names(distr_params))) {
  stop(sprintf("The distribution parameters should be a list containing %s distribution parameters: %s", distr_type, paste(expected_distr_params, collapse = ", ")), call. = FALSE)
  }
- if (!is.null(sample) && !(all(unlist(lapply(sample, is.numeric)) | unlist(lapply(sample, is.character))))) {
+ if (!is.null(sample) && !(all(unlist(lapply(sample, is.numeric)) | unlist(lapply(sample, is.character))))) { #
  stop("The sample attribute(s) should be parameter name string(s) or numeric", call. = FALSE)
  }
  if (!is.null(random_seed) && !is.numeric(random_seed)) {