Commit 7b39d5e3 authored by jay's avatar jay
Browse files

upstream merge

parents 123cefad 66f3f1cb

autocnet/graph/network.py

+0 −4
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ class CandidateGraph(nx.Graph): 
        """

        return self.node[node_index]['image_name']



<<<<<<< HEAD

    def get_matches(self, clean_keys=[]):

        matches = []

        for s, d, e in self.edges_iter(data=True):
@@ -247,10 +246,7 @@ class CandidateGraph(nx.Graph): 
            matches.append(match)

        return matches

        

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

=======

    def add_image(self, image_name, adjacency=None, basepath=None, apply_func=None):

>>>>>>> upstream/dev

        """

        Adds an image node to the graph.