Merge branch 'rc_datawizard_0.11.0' of https://github.com/easystats/d…

…atawizard into rc_datawizard_0.11.0
easystats · Jun 4, 2024 · 416fd42 · 416fd42
2 parents 7de5bf7 + 8e42e6e
commit 416fd42
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/R/format.R b/R/format.R
@@ -20,16 +20,16 @@ format.parameters_distribution <- function(x, digits = 2, format = NULL, ci_widt
     ci_lvl <- attributes(x)$ci
     centrality_ci <- attributes(x)$first_centrality
 
-    if (!is.null(centrality_ci)) {
-      ci_suffix <- paste0(" (", centrality_ci, ")")
-    } else {
+    if (is.null(centrality_ci)) {
       ci_suffix <- ""
+    } else {
+      ci_suffix <- paste0(" (", centrality_ci, ")")
     }
 
-    if (!is.null(ci_lvl)) {
-      colnames(x)[which(colnames(x) == "CI_low")] <- sprintf("%i%% CI%s", round(100 * ci_lvl), ci_suffix)
-    } else {
+    if (is.null(ci_lvl)) {
       colnames(x)[which(colnames(x) == "CI_low")] <- sprintf("CI%s", ci_suffix)
+    } else {
+      colnames(x)[which(colnames(x) == "CI_low")] <- sprintf("%i%% CI%s", round(100 * ci_lvl), ci_suffix)
     }
   }
 

diff --git a/R/remove_empty.R b/R/remove_empty.R
@@ -77,7 +77,7 @@ empty_rows <- function(x) {
   if ((!is.matrix(x) && !is.data.frame(x)) || nrow(x) < 2) {
     vector("numeric")
   } else {
-    which(rowSums((is.na(x) | x == "")) == ncol(x))
+    which(rowSums((is.na(x) | x == "")) == ncol(x)) # nolint
   }
 }
 

diff --git a/R/reshape_ci.R b/R/reshape_ci.R
@@ -42,11 +42,11 @@ reshape_ci <- function(x, ci_type = "CI") {
 
     # Reshape
     if (length(unique(x$CI)) > 1) {
-      if (!"Parameter" %in% names(x)) {
+      if ("Parameter" %in% names(x)) {
+        remove_parameter <- FALSE
+      } else {
         x$Parameter <- NA
         remove_parameter <- TRUE
-      } else {
-        remove_parameter <- FALSE
       }
 
       x <- stats::reshape(
@@ -70,11 +70,11 @@ reshape_ci <- function(x, ci_type = "CI") {
 
     # Wide to long --------------
   } else {
-    if (!"Parameter" %in% names(x)) {
+    if ("Parameter" %in% names(x)) {
+      remove_parameter <- FALSE
+    } else {
       x$Parameter <- seq_len(nrow(x))
       remove_parameter <- TRUE
-    } else {
-      remove_parameter <- FALSE
     }
 
     lows <- grepl(paste0(ci_low, "_*"), names(x))