Revert "Fix inverse_line_graph. (#3507)"revert-3507-master

This reverts commit a505a5fe000983ff8c0861a1806b31c9ac638946.

2 files changed, 8 insertions, 46 deletions

diff --git a/networkx/generators/line.py b/networkx/generators/line.py
index d17f29fc..1d3fafc2 100644
--- a/networkx/generators/line.py
+++ b/networkx/generators/line.py
@@ -276,18 +276,6 @@ def inverse_line_graph(G):
     -----
     This is an implementation of the Roussopoulos algorithm.
 
-    If G consists of multiple components, then the algorithm doesn't work.
-    You should invert every component seperately:
-
-    >>> K5 = nx.complete_graph(5)
-    >>> P4 = nx.Graph([('a', 'b'), ('b', 'c'), ('c', 'd')])
-    >>> G = nx.union(K5, P4)
-    >>> root_graphs = []
-    >>> for comp in nx.connected_components(G):
-    ...     root_graphs.append(nx.inverse_line_graph(G.subgraph(comp)))
-    >>> len(root_graphs)
-    2
-
     References
     ----------
     * Roussopolous, N, "A max {m, n} algorithm for determining the graph H from
@@ -325,11 +313,11 @@ def _triangles(G, e):
     u, v = e
     if u not in G:
         raise nx.NetworkXError("Vertex %s not in graph" % u)
-    if v not in G[u]:
+    if v not in G.neighbors(u):
         raise nx.NetworkXError("Edge (%s, %s) not in graph" % (u, v))
     triangle_list = []
-    for x in G[u]:
-        if x in G[v]:
+    for x in G.neighbors(u):
+        if x in G.neighbors(v):
             triangle_list.append((u, v, x))
     return triangle_list
 
@@ -363,12 +351,12 @@ def _odd_triangle(G, T):
         if u not in G.nodes():
             raise nx.NetworkXError("Vertex %s not in graph" % u)
     for e in list(combinations(T, 2)):
-        if e[0] not in G[e[1]]:
+        if e[0] not in G.neighbors(e[1]):
             raise nx.NetworkXError("Edge (%s, %s) not in graph" % (e[0], e[1]))
 
     T_neighbors = defaultdict(int)
     for t in T:
-        for v in G[t]:
+        for v in G.neighbors(t):
             if v not in T:
                 T_neighbors[v] += 1
     for v in T_neighbors:
@@ -411,10 +399,10 @@ def _find_partition(G, starting_cell):
             # if u still has edges then we need to find its other cell
             # this other cell must be a complete subgraph or else G is
             # not a line graph
-            new_cell = [u] + list(G_partition[u])
+            new_cell = [u] + list(G_partition.neighbors(u))
             for u in new_cell:
                 for v in new_cell:
-                    if (u != v) and (v not in G_partition[u]):
+                    if (u != v) and (v not in G.neighbors(u)):
                         msg = "G is not a line graph" \
                               "(partition cell not a complete subgraph)"
                         raise nx.NetworkXError(msg)
@@ -497,7 +485,7 @@ def _select_starting_cell(G, starting_edge=None):
             if len(triangle_nodes) == s + 2:
                 for u in triangle_nodes:
                     for v in triangle_nodes:
-                        if u != v and (v not in G[u]):
+                        if u != v and (v not in G.neighbors(u)):
                             msg = "G is not a line graph (odd triangles " \
                                   "do not form complete subgraph)"
                             raise nx.NetworkXError(msg)
diff --git a/networkx/tests/test_line.py b/networkx/tests/test_line.py
deleted file mode 100644
index 11e2eb99..00000000
--- a/networkx/tests/test_line.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-from nose.tools import assert_raises, assert_true
-
-import networkx as nx
-from networkx.generators.line import line_graph, inverse_line_graph
-
-class TestLineGraph():
-    def test_invalid_line_graphs(self):
-        # a claw is not a line graph
-        K13 = nx.complete_bipartite_graph(1, 3)
-        assert_raises(nx.NetworkXError, inverse_line_graph, K13)
-        # neither is "K5 minus an edge":
-        K5me = nx.complete_graph(5)
-        K5me.remove_edge(0,1)
-        assert_raises(nx.NetworkXError, inverse_line_graph, K5me)
-
-    def test_valid_line_graphs(self):
-        # the line graph of a star is a complete graph
-        S4 = nx.star_graph(4)
-        L = line_graph(S4)
-        K4 = nx.complete_graph(4)
-
-        assert_true(nx.is_isomorphic(L, K4))
-
-        L_ = inverse_line_graph(K4)
-        assert_true(nx.is_isomorphic(L_, S4))