fix: if statement length #520

JohnCoene · May 5, 2023 · b1c3d7a · b1c3d7a
1 parent 85324f3
commit b1c3d7a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/R/echarts4r.R b/R/echarts4r.R
@@ -178,15 +178,15 @@ e_charts.default <- function(
 
       x$mapping$include_x <- FALSE
       cl <- x$mapping$x_class
-      if (cl == "character" || cl == "factor") {
+      if (any(c("character", "factor") %in% cl)) {
         labs <- unique(data[[x$mapping$x]])
 
         if (length(labs) == 1) {
           labs <- list(labs)
         }
 
         x$opts$baseOption$xAxis <- list(list(data = labs, type = "category", boundaryGap = TRUE))
-      } else if (cl == "POSIXct" || cl == "POSIXlt" || cl == "Date") {
+      } else if (any(c("POSIXct", "POSIXlt", "Date") %in% cl)) {
         labs <- unique(data[[x$mapping$x]])
 
         if (length(labs) == 1) {

diff --git a/R/utils.R b/R/utils.R
@@ -4,7 +4,7 @@ globalVariables(c("x", "e", ".", "acc", "epoch", "loss", "size", "val_acc", "val
   vect <- data[[x]]
 
   if (reorder) {
-    if (inherits(vect, "numeric") || inherits(vect, "integer")) {
+    if (any(c(inherits(vect, "numeric"),inherits(vect, "integer")))) {
       data <- data[order(data[[x]]), ]
     }
   }
@@ -17,7 +17,7 @@ globalVariables(c("x", "e", ".", "acc", "epoch", "loss", "size", "val_acc", "val
 
   for (i in 1:length(data)) {
     if (reorder) {
-      if (inherits(vect, "numeric") || inherits(vect, "integer")) {
+      if (any(c(inherits(vect, "numeric"), inherits(vect, "integer")))) {
         data[[i]] <- data[[i]][order(data[[i]][[x]]), ]
       }
     }
@@ -500,9 +500,9 @@ globalVariables(c("x", "e", ".", "acc", "epoch", "loss", "size", "val_acc", "val
 .get_type <- function(e, serie) {
   cl <- .get_class(e, serie)
 
-  if (cl == "character" || cl == "factor") {
+  if (any(c("character", "factor") %in% cl)) {
     "category"
-  } else if (cl == "POSIXct" || cl == "POSIXlt" || cl == "Date") {
+  } else if (any(c("POSIXct", "POSIXlt", "Date") %in% cl)) {
     "time"
   } else {
     "value"