Commit 114e9c39 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

removed iter overwrite

parent 61db311c

autocnet/graph/network.py

+12 −12
Original line number Diff line number Diff line
@@ -769,18 +769,18 @@ class CandidateGraph(nx.Graph): 
        sg = s.subgraph(nbunch)

        self.nodemask = sg.nodes()



    def nodes_iter(self, data=False):

        s = super(CandidateGraph, self)

        nodes = s.nodes_iter(data)

        ret = []

        for n in nodes:

            if data:

                if n[0] in self.nodemask:

                    ret.append(n)

            else:

                if n in self.nodemask:

                    ret.append(n)

        return iter(ret)

    # def nodes_iter(self, data=False):

    #     s = super(CandidateGraph, self)

    #     nodes = s.nodes_iter(data)

    #     ret = []

    #     for n in nodes:

    #         if data:

    #             if n[0] in self.nodemask:

    #                 ret.append(n)

    #         else:

    #             if n in self.nodemask:

    #                 ret.append(n)

    #     return iter(ret)



    # def edges_iter(self, nbunch=[], data=False, key=False):

    #     s = super(CandidateGraph, self)