Commit 63973913 authored by Jay's avatar Jay Committed by jay
Browse files

Additional cleaning and omission of untested spectral items from test coverage... 

Additional cleaning and omission of untested spectral items from test coverage (outside the scope of this project).
parent 99764933

.coveragerc

+2 −0
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ omit = 
    autocnet/fileio/ControlNetFileV0002_pb2.py

    autocnet/vis/graph_view.py

    autocnet/fileio/sqlalchemy_json/*

    autocnet/spectral/*

    bin/*

    */tests/*

exclude_lines =

    pragma: no cover

    def __repr__

autocnet/graph/edge.py

+3 −6
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ class Edge(dict, MutableMapping): 
        transformation_matrix, fundam_mask = od.compute_fundamental_matrix(s_keypoints,

                                                                           d_keypoints,

                                                                           **kwargs)



        try:

            fundam_mask = fundam_mask.ravel()

        except:
@@ -173,9 +174,8 @@ class Edge(dict, MutableMapping): 
                                                                   d_keypoints.values,

                                                                   **kwargs)



        ransac_mask = ransac_mask.ravel()

        # Convert the truncated RANSAC mask back into a full length mask

        mask[mask] = ransac_mask

        mask[mask] = ransac_mask.ravel()

        self.masks = ('ransac', mask)

        self.homography = Homography(transformation_matrix,

                                     s_keypoints[ransac_mask],
@@ -312,10 +312,7 @@ class Edge(dict, MutableMapping): 
                    setattr(self.suppression, k, v)

            self.suppression.suppress()



        if clean_keys:

        mask[mask] = self.suppression.mask

        else:

            mask = self.suppression.mask

        self.masks = ('suppression', mask)



    def coverage_ratio(self, clean_keys=[]):

autocnet/matcher/health.py

+6 −1
Original line number Diff line number Diff line 
import warnings





class EdgeHealth(object):
@@ -26,4 +27,8 @@ class EdgeHealth(object): 
        """

        Recompute the health of the edge.

        """

        try:

            return self.FundamentalMatrix.error.mean()

        except:

            warnings.warn('Unable to compute new health, defaulting to 1.0')

            return 1.0