Fix checks (#201)

statgenlmu · Jul 9, 2019 · b3f74d4 · b3f74d4 · lintr-bot · Jul 9, 2019
1 parent 5592d4e
commit b3f74d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/R/feature.R b/R/feature.R
@@ -19,15 +19,15 @@ feature_class <- R6Class("feature", inherit = model_part,
     },
     add_parameter = function(parameter, required = TRUE, add_par = TRUE) {
       expr <- NA
-      if (is.numeric(parameter) && length(parameter) == 1) {
+      if (length(parameter) == 1 && is.numeric(parameter)) {
         expr <- parameter
-      } else if (is.character(parameter) && length(parameter) == 1) {
+      } else if (length(parameter) == 1 && is.character(parameter)) {
         expr <- parameter
       } else if (is.par(parameter)) {
         idx <- as.character(length(private$parameter) + 1)
         private$parameter[[idx]] <- parameter
         expr <- parameter$get_expression()
-      } else if (is.null(parameter) || is.na(parameter)) {
+      } else if (is.null(parameter) || any(is.na(parameter))) {
         if (required) stop("Missing value for required parameter")
         return(NA)
       } else stop("Unexpected type of parameter")

diff --git a/R/model_build.R b/R/model_build.R
@@ -62,7 +62,7 @@ add_to_model.feature <- function(feat, model, feat_name) {
   # Check that the population in the feature exists
   pop <- feat$get_population()
   if (!is.null(pop)) {
-    if (pop != "all" && !all(pop %in% get_populations(model))) {
+    if (any(!pop %in% get_populations(model)) && pop[1] != 'all' ) {
       stop("Invalid population in ", feat_name, call. = FALSE)
     }
   }