refactor: less if else in vertex_attr() (#1324)

igraph · Mar 26, 2024 · 9f91693 · 9f91693
2 parents 7bebe49 + 3ebf64b
commit 9f91693
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/R/attributes.R b/R/attributes.R
@@ -380,20 +380,18 @@ vertex_attr <- function(graph, name, index = V(graph)) {
   ensure_igraph(graph)
   if (missing(name)) {
     if (missing(index)) {
-      vertex.attributes(graph)
-    } else {
-      vertex.attributes(graph, index = index)
-    }
-  } else {
-    myattr <-
-      .Call(R_igraph_mybracket2, graph, igraph_t_idx_attr, igraph_attr_idx_vertex)[[as.character(name)]]
-    if (is_complete_iterator(index)) {
-      myattr
-    } else {
-      index <- as_igraph_vs(graph, index)
-      myattr[index]
+      return(vertex.attributes(graph))
     }
+    return(vertex.attributes(graph, index = index))
   }
+  myattr <-
+    .Call(R_igraph_mybracket2, graph, igraph_t_idx_attr, igraph_attr_idx_vertex)[[as.character(name)]]
+  if (is_complete_iterator(index)) {
+    return(myattr)
+  }
+  index <- as_igraph_vs(graph, index)
+  myattr[index]
+
 }
 
 #' Set one or more vertex attributes