diff options
Diffstat (limited to 'networkx/algorithms/bipartite/tests')
| -rw-r--r-- | networkx/algorithms/bipartite/tests/test_edgelist.py | 24 | ||||
| -rw-r--r-- | networkx/algorithms/bipartite/tests/test_matrix.py | 8 | ||||
| -rw-r--r-- | networkx/algorithms/bipartite/tests/test_project.py | 118 |
3 files changed, 75 insertions, 75 deletions
diff --git a/networkx/algorithms/bipartite/tests/test_edgelist.py b/networkx/algorithms/bipartite/tests/test_edgelist.py index 2a8dc73e..80b2c098 100644 --- a/networkx/algorithms/bipartite/tests/test_edgelist.py +++ b/networkx/algorithms/bipartite/tests/test_edgelist.py @@ -7,7 +7,7 @@ import tempfile import os import networkx as nx -from networkx.testing import assert_edges_equal, assert_nodes_equal, assert_graphs_equal +from networkx.utils import nodes_equal, edges_equal, graphs_equal from networkx.algorithms import bipartite @@ -35,7 +35,7 @@ class TestEdgelist: """ bytesIO = io.BytesIO(s) G = bipartite.read_edgelist(bytesIO, nodetype=int) - assert_edges_equal(G.edges(), [(1, 2), (2, 3)]) + assert edges_equal(G.edges(), [(1, 2), (2, 3)]) def test_read_edgelist_3(self): s = b"""\ @@ -46,11 +46,11 @@ class TestEdgelist: """ bytesIO = io.BytesIO(s) G = bipartite.read_edgelist(bytesIO, nodetype=int, data=False) - assert_edges_equal(G.edges(), [(1, 2), (2, 3)]) + assert edges_equal(G.edges(), [(1, 2), (2, 3)]) bytesIO = io.BytesIO(s) G = bipartite.read_edgelist(bytesIO, nodetype=int, data=True) - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"weight": 2.0}), (2, 3, {"weight": 3.0})] ) @@ -110,7 +110,7 @@ class TestEdgelist: fd, fname = tempfile.mkstemp() bipartite.write_edgelist(G, fname) H = bipartite.read_edgelist(fname) - assert_graphs_equal(G, H) + assert graphs_equal(G, H) os.close(fd) os.unlink(fname) @@ -138,7 +138,7 @@ class TestEdgelist: fd, fname = tempfile.mkstemp() bipartite.write_edgelist(G, fname, encoding="latin-1") H = bipartite.read_edgelist(fname, encoding="latin-1") - assert_graphs_equal(G, H) + assert graphs_equal(G, H) os.close(fd) os.unlink(fname) @@ -150,8 +150,8 @@ class TestEdgelist: H2 = bipartite.read_edgelist(fname) assert H is not H2 # they should be different graphs G.remove_node("g") # isolated nodes are not written in edgelist - assert_nodes_equal(list(H), list(G)) - assert_edges_equal(list(H.edges()), list(G.edges())) + assert nodes_equal(list(H), list(G)) + assert edges_equal(list(H.edges()), list(G.edges())) os.close(fd) os.unlink(fname) @@ -162,8 +162,8 @@ class TestEdgelist: H = bipartite.read_edgelist(fname, nodetype=int) # isolated nodes are not written in edgelist G.remove_nodes_from(list(nx.isolates(G))) - assert_nodes_equal(list(H), list(G)) - assert_edges_equal(list(H.edges()), list(G.edges())) + assert nodes_equal(list(H), list(G)) + assert edges_equal(list(H.edges()), list(G.edges())) os.close(fd) os.unlink(fname) @@ -174,8 +174,8 @@ class TestEdgelist: H = bipartite.read_edgelist(fname, nodetype=int, create_using=nx.MultiGraph()) H2 = bipartite.read_edgelist(fname, nodetype=int, create_using=nx.MultiGraph()) assert H is not H2 # they should be different graphs - assert_nodes_equal(list(H), list(G)) - assert_edges_equal(list(H.edges()), list(G.edges())) + assert nodes_equal(list(H), list(G)) + assert edges_equal(list(H.edges()), list(G.edges())) os.close(fd) os.unlink(fname) diff --git a/networkx/algorithms/bipartite/tests/test_matrix.py b/networkx/algorithms/bipartite/tests/test_matrix.py index 176741ae..393b71e7 100644 --- a/networkx/algorithms/bipartite/tests/test_matrix.py +++ b/networkx/algorithms/bipartite/tests/test_matrix.py @@ -7,7 +7,7 @@ sparse = pytest.importorskip("scipy.sparse") import networkx as nx from networkx.algorithms import bipartite -from networkx.testing.utils import assert_edges_equal +from networkx.utils import edges_equal class TestBiadjacencyMatrix: @@ -68,12 +68,12 @@ class TestBiadjacencyMatrix: def test_from_biadjacency_weight(self): M = sparse.csc_matrix([[1, 2], [0, 3]]) B = bipartite.from_biadjacency_matrix(M) - assert_edges_equal(B.edges(), [(0, 2), (0, 3), (1, 3)]) + assert edges_equal(B.edges(), [(0, 2), (0, 3), (1, 3)]) B = bipartite.from_biadjacency_matrix(M, edge_attribute="weight") e = [(0, 2, {"weight": 1}), (0, 3, {"weight": 2}), (1, 3, {"weight": 3})] - assert_edges_equal(B.edges(data=True), e) + assert edges_equal(B.edges(data=True), e) def test_from_biadjacency_multigraph(self): M = sparse.csc_matrix([[1, 2], [0, 3]]) B = bipartite.from_biadjacency_matrix(M, create_using=nx.MultiGraph()) - assert_edges_equal(B.edges(), [(0, 2), (0, 3), (0, 3), (1, 3), (1, 3), (1, 3)]) + assert edges_equal(B.edges(), [(0, 2), (0, 3), (0, 3), (1, 3), (1, 3), (1, 3)]) diff --git a/networkx/algorithms/bipartite/tests/test_project.py b/networkx/algorithms/bipartite/tests/test_project.py index dbe75894..d41ec580 100644 --- a/networkx/algorithms/bipartite/tests/test_project.py +++ b/networkx/algorithms/bipartite/tests/test_project.py @@ -1,89 +1,89 @@ import networkx as nx from networkx.algorithms import bipartite -from networkx.testing import assert_edges_equal, assert_nodes_equal +from networkx.utils import nodes_equal, edges_equal class TestBipartiteProject: def test_path_projected_graph(self): G = nx.path_graph(4) P = bipartite.projected_graph(G, [1, 3]) - assert_nodes_equal(list(P), [1, 3]) - assert_edges_equal(list(P.edges()), [(1, 3)]) + assert nodes_equal(list(P), [1, 3]) + assert edges_equal(list(P.edges()), [(1, 3)]) P = bipartite.projected_graph(G, [0, 2]) - assert_nodes_equal(list(P), [0, 2]) - assert_edges_equal(list(P.edges()), [(0, 2)]) + assert nodes_equal(list(P), [0, 2]) + assert edges_equal(list(P.edges()), [(0, 2)]) def test_path_projected_properties_graph(self): G = nx.path_graph(4) G.add_node(1, name="one") G.add_node(2, name="two") P = bipartite.projected_graph(G, [1, 3]) - assert_nodes_equal(list(P), [1, 3]) - assert_edges_equal(list(P.edges()), [(1, 3)]) + assert nodes_equal(list(P), [1, 3]) + assert edges_equal(list(P.edges()), [(1, 3)]) assert P.nodes[1]["name"] == G.nodes[1]["name"] P = bipartite.projected_graph(G, [0, 2]) - assert_nodes_equal(list(P), [0, 2]) - assert_edges_equal(list(P.edges()), [(0, 2)]) + assert nodes_equal(list(P), [0, 2]) + assert edges_equal(list(P.edges()), [(0, 2)]) assert P.nodes[2]["name"] == G.nodes[2]["name"] def test_path_collaboration_projected_graph(self): G = nx.path_graph(4) P = bipartite.collaboration_weighted_projected_graph(G, [1, 3]) - assert_nodes_equal(list(P), [1, 3]) - assert_edges_equal(list(P.edges()), [(1, 3)]) + assert nodes_equal(list(P), [1, 3]) + assert edges_equal(list(P.edges()), [(1, 3)]) P[1][3]["weight"] = 1 P = bipartite.collaboration_weighted_projected_graph(G, [0, 2]) - assert_nodes_equal(list(P), [0, 2]) - assert_edges_equal(list(P.edges()), [(0, 2)]) + assert nodes_equal(list(P), [0, 2]) + assert edges_equal(list(P.edges()), [(0, 2)]) P[0][2]["weight"] = 1 def test_directed_path_collaboration_projected_graph(self): G = nx.DiGraph() nx.add_path(G, range(4)) P = bipartite.collaboration_weighted_projected_graph(G, [1, 3]) - assert_nodes_equal(list(P), [1, 3]) - assert_edges_equal(list(P.edges()), [(1, 3)]) + assert nodes_equal(list(P), [1, 3]) + assert edges_equal(list(P.edges()), [(1, 3)]) P[1][3]["weight"] = 1 P = bipartite.collaboration_weighted_projected_graph(G, [0, 2]) - assert_nodes_equal(list(P), [0, 2]) - assert_edges_equal(list(P.edges()), [(0, 2)]) + assert nodes_equal(list(P), [0, 2]) + assert edges_equal(list(P.edges()), [(0, 2)]) P[0][2]["weight"] = 1 def test_path_weighted_projected_graph(self): G = nx.path_graph(4) P = bipartite.weighted_projected_graph(G, [1, 3]) - assert_nodes_equal(list(P), [1, 3]) - assert_edges_equal(list(P.edges()), [(1, 3)]) + assert nodes_equal(list(P), [1, 3]) + assert edges_equal(list(P.edges()), [(1, 3)]) P[1][3]["weight"] = 1 P = bipartite.weighted_projected_graph(G, [0, 2]) - assert_nodes_equal(list(P), [0, 2]) - assert_edges_equal(list(P.edges()), [(0, 2)]) + assert nodes_equal(list(P), [0, 2]) + assert edges_equal(list(P.edges()), [(0, 2)]) P[0][2]["weight"] = 1 def test_path_weighted_projected_directed_graph(self): G = nx.DiGraph() nx.add_path(G, range(4)) P = bipartite.weighted_projected_graph(G, [1, 3]) - assert_nodes_equal(list(P), [1, 3]) - assert_edges_equal(list(P.edges()), [(1, 3)]) + assert nodes_equal(list(P), [1, 3]) + assert edges_equal(list(P.edges()), [(1, 3)]) P[1][3]["weight"] = 1 P = bipartite.weighted_projected_graph(G, [0, 2]) - assert_nodes_equal(list(P), [0, 2]) - assert_edges_equal(list(P.edges()), [(0, 2)]) + assert nodes_equal(list(P), [0, 2]) + assert edges_equal(list(P.edges()), [(0, 2)]) P[0][2]["weight"] = 1 def test_star_projected_graph(self): G = nx.star_graph(3) P = bipartite.projected_graph(G, [1, 2, 3]) - assert_nodes_equal(list(P), [1, 2, 3]) - assert_edges_equal(list(P.edges()), [(1, 2), (1, 3), (2, 3)]) + assert nodes_equal(list(P), [1, 2, 3]) + assert edges_equal(list(P.edges()), [(1, 2), (1, 3), (2, 3)]) P = bipartite.weighted_projected_graph(G, [1, 2, 3]) - assert_nodes_equal(list(P), [1, 2, 3]) - assert_edges_equal(list(P.edges()), [(1, 2), (1, 3), (2, 3)]) + assert nodes_equal(list(P), [1, 2, 3]) + assert edges_equal(list(P.edges()), [(1, 2), (1, 3), (2, 3)]) P = bipartite.projected_graph(G, [0]) - assert_nodes_equal(list(P), [0]) - assert_edges_equal(list(P.edges()), []) + assert nodes_equal(list(P), [0]) + assert edges_equal(list(P.edges()), []) def test_project_multigraph(self): G = nx.Graph() @@ -92,11 +92,11 @@ class TestBipartiteProject: G.add_edge("a", 2) G.add_edge("b", 2) P = bipartite.projected_graph(G, "ab") - assert_edges_equal(list(P.edges()), [("a", "b")]) + assert edges_equal(list(P.edges()), [("a", "b")]) P = bipartite.weighted_projected_graph(G, "ab") - assert_edges_equal(list(P.edges()), [("a", "b")]) + assert edges_equal(list(P.edges()), [("a", "b")]) P = bipartite.projected_graph(G, "ab", multigraph=True) - assert_edges_equal(list(P.edges()), [("a", "b"), ("a", "b")]) + assert edges_equal(list(P.edges()), [("a", "b"), ("a", "b")]) def test_project_collaboration(self): G = nx.Graph() @@ -118,13 +118,13 @@ class TestBipartiteProject: G.add_edge("A", 2) G.add_edge("B", 2) P = bipartite.projected_graph(G, "AB") - assert_edges_equal(list(P.edges()), [("A", "B")]) + assert edges_equal(list(P.edges()), [("A", "B")]) P = bipartite.weighted_projected_graph(G, "AB") - assert_edges_equal(list(P.edges()), [("A", "B")]) + assert edges_equal(list(P.edges()), [("A", "B")]) assert P["A"]["B"]["weight"] == 1 P = bipartite.projected_graph(G, "AB", multigraph=True) - assert_edges_equal(list(P.edges()), [("A", "B")]) + assert edges_equal(list(P.edges()), [("A", "B")]) G = nx.DiGraph() G.add_edge("A", 1) @@ -132,13 +132,13 @@ class TestBipartiteProject: G.add_edge("A", 2) G.add_edge(2, "B") P = bipartite.projected_graph(G, "AB") - assert_edges_equal(list(P.edges()), [("A", "B")]) + assert edges_equal(list(P.edges()), [("A", "B")]) P = bipartite.weighted_projected_graph(G, "AB") - assert_edges_equal(list(P.edges()), [("A", "B")]) + assert edges_equal(list(P.edges()), [("A", "B")]) assert P["A"]["B"]["weight"] == 2 P = bipartite.projected_graph(G, "AB", multigraph=True) - assert_edges_equal(list(P.edges()), [("A", "B"), ("A", "B")]) + assert edges_equal(list(P.edges()), [("A", "B"), ("A", "B")]) class TestBipartiteWeightedProjection: @@ -184,7 +184,7 @@ class TestBipartiteWeightedProjection: Panswer = nx.Graph() Panswer.add_weighted_edges_from(edges) P = bipartite.weighted_projected_graph(self.G, "ABCDEF") - assert_edges_equal(list(P.edges()), Panswer.edges()) + assert edges_equal(list(P.edges()), Panswer.edges()) for u, v in list(P.edges()): assert P[u][v]["weight"] == Panswer[u][v]["weight"] @@ -201,7 +201,7 @@ class TestBipartiteWeightedProjection: Panswer = nx.Graph() Panswer.add_weighted_edges_from(edges) P = bipartite.weighted_projected_graph(self.N, "ABCDE") - assert_edges_equal(list(P.edges()), Panswer.edges()) + assert edges_equal(list(P.edges()), Panswer.edges()) for u, v in list(P.edges()): assert P[u][v]["weight"] == Panswer[u][v]["weight"] @@ -217,7 +217,7 @@ class TestBipartiteWeightedProjection: Panswer = nx.Graph() Panswer.add_weighted_edges_from(edges) P = bipartite.collaboration_weighted_projected_graph(self.G, "ABCDEF") - assert_edges_equal(list(P.edges()), Panswer.edges()) + assert edges_equal(list(P.edges()), Panswer.edges()) for u, v in list(P.edges()): assert P[u][v]["weight"] == Panswer[u][v]["weight"] @@ -234,7 +234,7 @@ class TestBipartiteWeightedProjection: Panswer = nx.Graph() Panswer.add_weighted_edges_from(edges) P = bipartite.collaboration_weighted_projected_graph(self.N, "ABCDE") - assert_edges_equal(list(P.edges()), Panswer.edges()) + assert edges_equal(list(P.edges()), Panswer.edges()) for u, v in list(P.edges()): assert P[u][v]["weight"] == Panswer[u][v]["weight"] @@ -250,7 +250,7 @@ class TestBipartiteWeightedProjection: Panswer = nx.Graph() Panswer.add_weighted_edges_from(edges) P = bipartite.weighted_projected_graph(self.G, "ABCDEF", ratio=True) - assert_edges_equal(list(P.edges()), Panswer.edges()) + assert edges_equal(list(P.edges()), Panswer.edges()) for u, v in list(P.edges()): assert P[u][v]["weight"] == Panswer[u][v]["weight"] @@ -267,7 +267,7 @@ class TestBipartiteWeightedProjection: Panswer = nx.Graph() Panswer.add_weighted_edges_from(edges) P = bipartite.weighted_projected_graph(self.N, "ABCDE", ratio=True) - assert_edges_equal(list(P.edges()), Panswer.edges()) + assert edges_equal(list(P.edges()), Panswer.edges()) for u, v in list(P.edges()): assert P[u][v]["weight"] == Panswer[u][v]["weight"] @@ -283,7 +283,7 @@ class TestBipartiteWeightedProjection: Panswer = nx.Graph() Panswer.add_weighted_edges_from(edges) P = bipartite.overlap_weighted_projected_graph(self.G, "ABCDEF", jaccard=False) - assert_edges_equal(list(P.edges()), Panswer.edges()) + assert edges_equal(list(P.edges()), Panswer.edges()) for u, v in list(P.edges()): assert P[u][v]["weight"] == Panswer[u][v]["weight"] @@ -300,7 +300,7 @@ class TestBipartiteWeightedProjection: Panswer = nx.Graph() Panswer.add_weighted_edges_from(edges) P = bipartite.overlap_weighted_projected_graph(self.N, "ABCDE", jaccard=False) - assert_edges_equal(list(P.edges()), Panswer.edges()) + assert edges_equal(list(P.edges()), Panswer.edges()) for u, v in list(P.edges()): assert P[u][v]["weight"] == Panswer[u][v]["weight"] @@ -316,7 +316,7 @@ class TestBipartiteWeightedProjection: Panswer = nx.Graph() Panswer.add_weighted_edges_from(edges) P = bipartite.overlap_weighted_projected_graph(self.G, "ABCDEF") - assert_edges_equal(list(P.edges()), Panswer.edges()) + assert edges_equal(list(P.edges()), Panswer.edges()) for u, v in list(P.edges()): assert P[u][v]["weight"] == Panswer[u][v]["weight"] @@ -333,7 +333,7 @@ class TestBipartiteWeightedProjection: Panswer = nx.Graph() Panswer.add_weighted_edges_from(edges) P = bipartite.overlap_weighted_projected_graph(self.N, "ABCDE") - assert_edges_equal(list(P.edges()), Panswer.edges()) + assert edges_equal(list(P.edges()), Panswer.edges()) for u, v in P.edges(): assert P[u][v]["weight"] == Panswer[u][v]["weight"] @@ -345,23 +345,23 @@ class TestBipartiteWeightedProjection: G = bipartite.generic_weighted_projected_graph( B, [0, 2, 4], weight_function=shared ) - assert_nodes_equal(list(G), [0, 2, 4]) - assert_edges_equal( + assert nodes_equal(list(G), [0, 2, 4]) + assert edges_equal( list(list(G.edges(data=True))), [(0, 2, {"weight": 1}), (2, 4, {"weight": 1})], ) G = bipartite.generic_weighted_projected_graph(B, [0, 2, 4]) - assert_nodes_equal(list(G), [0, 2, 4]) - assert_edges_equal( + assert nodes_equal(list(G), [0, 2, 4]) + assert edges_equal( list(list(G.edges(data=True))), [(0, 2, {"weight": 1}), (2, 4, {"weight": 1})], ) B = nx.DiGraph() nx.add_path(B, range(5)) G = bipartite.generic_weighted_projected_graph(B, [0, 2, 4]) - assert_nodes_equal(list(G), [0, 2, 4]) - assert_edges_equal( + assert nodes_equal(list(G), [0, 2, 4]) + assert edges_equal( list(G.edges(data=True)), [(0, 2, {"weight": 1}), (2, 4, {"weight": 1})] ) @@ -383,10 +383,10 @@ class TestBipartiteWeightedProjection: G = bipartite.generic_weighted_projected_graph( B, [0, 1], weight_function=jaccard ) - assert_edges_equal(list(G.edges(data=True)), [(0, 1, {"weight": 1.0})]) + assert edges_equal(list(G.edges(data=True)), [(0, 1, {"weight": 1.0})]) G = bipartite.generic_weighted_projected_graph( B, [0, 1], weight_function=my_weight ) - assert_edges_equal(list(G.edges(data=True)), [(0, 1, {"weight": 10})]) + assert edges_equal(list(G.edges(data=True)), [(0, 1, {"weight": 10})]) G = bipartite.generic_weighted_projected_graph(B, [0, 1]) - assert_edges_equal(list(G.edges(data=True)), [(0, 1, {"weight": 2})]) + assert edges_equal(list(G.edges(data=True)), [(0, 1, {"weight": 2})]) |