Commit 855310d2 authored by Jay's avatar Jay
Browse files

Backwards compat for iter methods

parent bbd601f9

autocnet/graph/network.py

+14 −0
Original line number Diff line number Diff line
@@ -1175,6 +1175,20 @@ class CandidateGraph(nx.Graph): 
        files = self.files()

        self.controlnetwork.to_isis(outname, serials, files, *args, **kwargs)



    def nodes_iter(self, data=False):

        for i, n in self.nodes.data('data'):

            if data:

                yield i, n

            else:

                yield i



    def edges_iter(self, data=False):

        for s, d, e in self.edges.data('data'):

            if data:

                yield s, d, e

            else:

                yield s, d



class SubCandidateGraph(nx.graphviews.SubGraph, CandidateGraph):

    def __init__(self, *args, **kwargs):

        super(SubCandidateGraph, self).__init__(*args, **kwargs)

tests/test_three_image.py

+3 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class TestThreeImageMatching(unittest.TestCase): 


        # Step: Extract image data and attribute nodes

        cg.extract_features(extractor_parameters={'nfeatures':500})

        for i, node, in cg.nodes.data('data'):

        for i, node, in cg.nodes_iter(data=True):

            self.assertIn(node.nkeypoints, range(490, 511))



        cg.match(k=2)
@@ -51,6 +51,8 @@ class TestThreeImageMatching(unittest.TestCase): 
        cg.ratio_checks()



        cg.apply_func_to_edges("compute_homography", clean_keys=['symmetry', 'ratio'])

        for s, d, e in cg.edges_iter(data=True):

            self.assertTrue('homography' in e.keys())

        cg.compute_fundamental_matrices(clean_keys=['symmetry', 'ratio'], reproj_threshold=3.0, method='ransac')



    def tearDown(self):