Commit 0178615a authored by kberry's avatar kberry
Browse files

update matcher to return just a dataframe again

parent 3ded32b4

autocnet/matcher/matcher.py

+1 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ class FlannMatcher(object): 
                                i.queryIdx,

                                i.trainIdx,

                                i.distance))

        data_frame = pd.DataFrame(matched, columns=['matched_to', 'queryIdx',

        return pd.DataFrame(matched, columns=['matched_to', 'queryIdx',

                                              'trainIdx', 'distance'])

        return matches, data_frame

autocnet/matcher/tests/test_matcher.py

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class TestMatcher(unittest.TestCase): 


        fmatcher.train()



        ignoreme, matched = fmatcher.query(self.fd['AS15-M-0296_SML.png'][1], k=2)

        matched = fmatcher.query(self.fd['AS15-M-0296_SML.png'][1], k=2)

        self.assertEqual(10, len(matched))



        # Check that self neighbors are being omitted
@@ -56,7 +56,7 @@ class TestMatcher(unittest.TestCase): 


        fmatcher.train()



        ignoreme, matched = fmatcher.query(self.fd['AS15-M-0296_SML.png'][1], k=3)

        matched = fmatcher.query(self.fd['AS15-M-0296_SML.png'][1], k=3)

        self.assertEqual(20, len(matched))



        # Check that self neighbors are being omitted