Function to relabel nodes and edges

tests/conftest.py

@@ -169,3 +169,11 @@ def hypergraph1():
     H.add_nodes_from(["a", "b", "c"])
     H.add_edges_from({"e1": ["a", "b"], "e2": ["a", "b", "c"], "e3": ["c"]})
     return H
+
+
+@pytest.fixture
+def hypergraph2():
+    H = xgi.Hypergraph()
+    H.add_nodes_from([0, "b", "c"])
+    H.add_edges_from({"e1": [0, "b"], "e2": [0, "c"], "e3": [0, "b", "c"]})
+    return H

tests/utils/test_utils.py

@@ -27,24 +27,44 @@ def test_get_dual(dict5):
     assert dual[8] == [3]
 
 
-def test_convert_labels_to_integers(hypergraph1):
-    H = convert_labels_to_integers(hypergraph1)
+def test_convert_labels_to_integers(hypergraph1, hypergraph2):
+    H1 = convert_labels_to_integers(hypergraph1)
+    H2 = convert_labels_to_integers(hypergraph2)
 
-    assert set(H.nodes) == {0, 1, 2}
-    assert set(H.edges) == {0, 1, 2}
+    assert set(H1.nodes) == {0, 1, 2}
+    assert set(H1.edges) == {0, 1, 2}
 
-    assert H.nodes[0]["label"] == "a"
-    assert H.nodes[1]["label"] == "b"
-    assert H.nodes[2]["label"] == "c"
+    assert H1.nodes[0]["label"] == "a"
+    assert H1.nodes[1]["label"] == "b"
+    assert H1.nodes[2]["label"] == "c"
 
-    assert H.edges[0]["label"] == "e1"
-    assert H.edges[1]["label"] == "e2"
-    assert H.edges[2]["label"] == "e3"
+    assert H1.edges[0]["label"] == "e1"
+    assert H1.edges[1]["label"] == "e2"
+    assert H1.edges[2]["label"] == "e3"
 
-    assert H.edges.members(0) == [0, 1]
-    assert H.edges.members(1) == [0, 1, 2]
-    assert H.edges.members(2) == [2]
+    assert H1.edges.members(0) == [0, 1]
+    assert H1.edges.members(1) == [0, 1, 2]
+    assert H1.edges.members(2) == [2]
 
-    assert H.nodes.memberships(0) == [0, 1]
-    assert H.nodes.memberships(1) == [0, 1]
-    assert H.nodes.memberships(2) == [1, 2]
+    assert H1.nodes.memberships(0) == [0, 1]
+    assert H1.nodes.memberships(1) == [0, 1]
+    assert H1.nodes.memberships(2) == [1, 2]
+
+    assert set(H2.nodes) == {0, 1, 2}
+    assert set(H2.edges) == {0, 1, 2}
+
+    assert H2.nodes[0]["label"] == 0
+    assert H2.nodes[1]["label"] == "b"
+    assert H2.nodes[2]["label"] == "c"
+
+    assert H2.edges[0]["label"] == "e1"
+    assert H2.edges[1]["label"] == "e2"
+    assert H2.edges[2]["label"] == "e3"
+
+    assert H2.edges.members(0) == [0, 1]
+    assert H2.edges.members(1) == [0, 2]
+    assert H2.edges.members(2) == [0, 1, 2]
+
+    assert H2.nodes.memberships(0) == [0, 1, 2]
+    assert H2.nodes.memberships(1) == [0, 2]
+    assert H2.nodes.memberships(2) == [1, 2]

xgi/utils/utilities.py

@@ -1,5 +1,6 @@
 """General utilities."""
 from collections import defaultdict
+from cProfile import label
 from itertools import count
 
 import requests
@@ -76,14 +77,17 @@ def load_xgi_data(dataset, nodetype=None, edgetype=None):
     return convert.dict_to_hypergraph(r.json(), nodetype=nodetype, edgetype=edgetype)
 
 
-def convert_labels_to_integers(H):
+def convert_labels_to_integers(H, label_attribute="label"):
     """Relabel node and edge IDs to be sequential integers.
 
     Parameters
     ----------
     H : Hypergraph
         The hypergraph of interest
 
+    label_attribute : string, default: "label"
+        The attribute name that stores the old node and edge labels
+
     Returns
     -------
     Hypergraph
@@ -96,29 +100,23 @@ def convert_labels_to_integers(H):
     Because the old IDs are stored in the "label" attribute for both nodes and edges,
     the old "label" values (if they exist) will be overwritten.
     """
-    node_id = count()
-    edge_id = count()
-    node_mapping = dict()
-    edge_mapping = dict()
+    node_dict = dict(zip(H.nodes, range(H.num_nodes)))
+    edge_dict = dict(zip(H.edges, range(H.num_edges)))
     temp_H = H.copy()
-    for node in list(temp_H.nodes):
-        id = next(node_id)
+    for node, id in node_dict.items():
         temp_H._node[id] = temp_H._node.pop(node)
         temp_H._node_attr[id] = temp_H._node_attr.pop(node)
-        temp_H._node_attr[id].update({"label": node})
-        node_mapping[node] = id
+        temp_H._node_attr[id][label_attribute] = node
 
-    for edge in list(temp_H.edges):
-        id = next(edge_id)
+    for edge, id in edge_dict.items():
         temp_H._edge[id] = temp_H._edge.pop(edge)
         temp_H._edge_attr[id] = temp_H._edge_attr.pop(edge)
-        temp_H._edge_attr[id].update({"label": edge})
-        edge_mapping[edge] = id
+        temp_H._edge_attr[id][label_attribute] = edge
 
     for node in temp_H.nodes:
-        temp_H._node[node] = [edge_mapping[id] for id in temp_H._node[node]]
+        temp_H._node[node] = [edge_dict[id] for id in temp_H._node[node]]
 
     for edge in temp_H.edges:
-        temp_H._edge[edge] = [node_mapping[id] for id in temp_H._edge[edge]]
+        temp_H._edge[edge] = [node_dict[id] for id in temp_H._edge[edge]]
 
     return temp_H