Commit e5ba13f4 authored by kberry's avatar kberry
Browse files

Updates associated with fixing homography2d

parent 30fa50b4

autocnet/graph/network.py

+7 −9
Original line number Diff line number Diff line
@@ -108,19 +108,17 @@ class CandidateGraph(nx.Graph): 
            if 'matches' in edge.keys():

                source_keypoints = []

                destination_keypoints = []



                for i, row in edge['matches'].iterrows():

                    # Get the source and destination x,y coordinates for matches to feed into findHomography

                    #source_idx = row['queryIdx_x']

                    source_matched_to = row['matched_to_x']

                    source_idx = row['trainIdx_x']

                    source_key = row['matched_to_x']

                    src_keypoint = [self.node[source_key]['keypoints'][source_idx].pt[0],

                    self.node[source_key]['keypoints'][source_idx].pt[1]]

                    src_keypoint = [self.node[source_matched_to]['keypoints'][source_idx].pt[0],

                                    self.node[source_matched_to]['keypoints'][source_idx].pt[1]]



                    #destination_idx = row['queryIdx_y']

                    destination_matched_to = row['matched_to_y']

                    destination_idx = row['trainIdx_y']

                    destination_key = row['matched_to_y']

                    dest_keypoint = [self.node[destination_key]['keypoints'][destination_idx].pt[0],

                                      self.node[destination_key]['keypoints'][destination_idx].pt[1]]

                    dest_keypoint = [self.node[destination_matched_to]['keypoints'][destination_idx].pt[0],

                                     self.node[destination_matched_to]['keypoints'][destination_idx].pt[1]]



                    source_keypoints.append(src_keypoint)

                    destination_keypoints.append(dest_keypoint)

autocnet/matcher/matcher.py

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ FLANN_INDEX_KDTREE = 1 # Algorithm to set centers, 
DEFAULT_FLANN_PARAMETERS = dict(algorithm=FLANN_INDEX_KDTREE,

                                trees=3)





class FlannMatcher(object):

    """

    A wrapper to the OpenCV Flann based matcher class that adds

functional_tests/test_two_image.py

+0 −1
Original line number Diff line number Diff line 
import os

import unittest



import pandas as pd

from scipy.misc import bytescale



from autocnet.examples import get_path

autocnet/matcher/tests/test_matcher.py

+1 −1

File changed.

Contains only whitespace changes.