Commit 44d107f5 authored by Jason R Laura's avatar Jason R Laura
Browse files

Merging master into dev before PR dev into master

parents d47c6944 0d85cd16

autocnet/graph/edge.py

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ class Edge(dict, MutableMapping): 
            raise AttributeError('This edge does not yet have any matches computed.')



        matches, mask = self._clean(clean_keys)

        domain = self.source.geodata.raster_size

        domain = self.source.handle.raster_size



        # Massage the dataframe into the correct structure

        coords = self.source.get_keypoint_coordinates()

autocnet/graph/node.py

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ class Node(dict, MutableMapping): 
        if not hasattr(self, '_keypoints'):

            raise AttributeError('No keypoints extracted for this node.')



        domain = self.geodata.raster_size

        domain = self.handle.raster_size

        self._keypoints['strength'] = self._keypoints.apply(func, axis=1)



        if not hasattr(self, 'suppression'):

image_match_config.yml

+3 −1
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ fundamental_matrices: 
subpixel_register:

    clean_keys:

        - ratio

        - symmetry

        - fundamental

    template_size: 5

    threshold: 0.8

    search_size: 15
@@ -50,7 +52,7 @@ subpixel_register: 


suppress:

    clean_keys:

        - ratio

        - fundamental



# Keyword arguments

    min_radius: 2