fix group_name and test bugs

Author: yifanfeng97

dhg/structure/hypergraphs/hypergraph.py

@@ -1488,7 +1488,7 @@ def e2v_aggregation_of_group(
                 P = self.H_of_group(group_name)
             if aggr == "mean":
                 X = torch.sparse.mm(P, X)
-                X = torch.sparse.mm(self.D_v_neg_1_of_group[group_name], X)
+                X = torch.sparse.mm(self.D_v_neg_1_of_group(group_name), X)
             elif aggr == "sum":
                 X = torch.sparse.mm(P, X)
             elif aggr == "softmax_then_sum":
@@ -1499,12 +1499,12 @@ def e2v_aggregation_of_group(
         else:
             # init message path
             assert (
-                e2v_weight.shape[0] == self.e2v_weight_of_group[group_name].shape[0]
+                e2v_weight.shape[0] == self.e2v_weight_of_group(group_name).shape[0]
             ), f"The size of e2v_weight must be equal to the size of self.e2v_weight_of_group('{group_name}')."
             P = torch.sparse_coo_tensor(
-                self.H_of_group[group_name]._indices(),
+                self.H_of_group(group_name)._indices(),
                 e2v_weight,
-                self.H_of_group[group_name].shape,
+                self.H_of_group(group_name).shape,
                 device=self.device,
             )
             if drop_rate > 0.0:

tests/structure/test_graph.py

@@ -292,6 +292,8 @@ def test_laplacian_symmetric():
         for _ in range(num_e):
             s = random.randrange(num_v)
             d = random.randrange(num_v)
+            if s == d:
+                continue
             g.add_edges((s, d))
             A[s, d] = 1
             A[d, s] = 1
@@ -318,6 +320,8 @@ def test_laplacian_random_walk():
         for _ in range(num_e):
             s = random.randrange(num_v)
             d = random.randrange(num_v)
+            if s == d:
+                continue
             g.add_edges((s, d))
             A[s, d] = 1
             A[d, s] = 1

tests/structure/test_hypergraph.py

@@ -217,24 +217,19 @@ def test_add_hyperedges_from_graph_kHop(g1):
 
 
 def test_add_hyperedges_from_bigraph():
-    g = BiGraph(3, 4, [[0, 0], [1, 0], [2, 0], [3, 0], [0, 1], [1, 1], [2, 2], [3, 2]])
-    h = Hypergraph(6)
-    h.add_hyperedges_from_bigraph(g, group_name="bigraph")
-    assert h.num_e == 4
-    assert (0, 1, 2, 3) in h.e_of_group("bigraph")[0]
-    assert (0, 1) in h.e_of_group("bigraph")[0]
-    assert (2, 3) in h.e_of_group("bigraph")[0]
-
-    h.add_hyperedges_from_bigraph(g, group_name="bigraph-u", U_as_vertex=True)
-    assert h.num_e == 4
-    assert (0, 1, 2, 3) in h.e_of_group("bigraph-u")[0]
-    assert (0, 1) in h.e_of_group("bigraph-u")[0]
-    assert (2, 3) in h.e_of_group("bigraph-u")[0]
-
-    h.add_hyperedges_from_bigraph(g, group_name="bigraph-v", U_as_vertex=False)
-    assert h.num_e == 3
-    assert (0, 1) in h.e_of_group("bigraph-v")[0]
-    assert (0, 2) in h.e_of_group("bigraph-v")[0]
+    g = BiGraph(4, 3, [[0, 0], [1, 0], [2, 0], [3, 0], [0, 1], [1, 1], [2, 2], [3, 2]])
+    hg = Hypergraph(3)
+    hg.add_hyperedges_from_bigraph(g, group_name="bigraph")
+    assert hg.num_e == 2
+    assert (0, 1) in hg.e_of_group("bigraph")[0]
+    assert (0, 2) in hg.e_of_group("bigraph")[0]
+
+    hg = Hypergraph(4)
+    hg.add_hyperedges_from_bigraph(g, group_name="bigraph-u", U_as_vertex=True)
+    assert hg.num_e == 3
+    assert (0, 1, 2, 3) in hg.e_of_group("bigraph-u")[0]
+    assert (0, 1) in hg.e_of_group("bigraph-u")[0]
+    assert (2, 3) in hg.e_of_group("bigraph-u")[0]
 
 
 def test_remove_hyperedges(g1):