Commit 9121d667 authored by Jason R Laura's avatar Jason R Laura
Browse files

95% of the total max size is more appropriate

parent fdfd8c5b

autocnet/matcher/outlier_detector.py

+4 −5
Changes for autocnet/matcher/outlier_detector.py: 4 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -185,8 +185,7 @@ class SpatialSuppression(Observable): 
            self.k = len(self.df)

            result = self.df.index

            process = False

        nsteps = max(self.domain)

        print(nsteps)

        nsteps = max(self.domain) * 0.95

        search_space = np.linspace(self.min_radius, self.max_radius, nsteps)

        cell_sizes = search_space / math.sqrt(2)

        min_idx = 0
@@ -196,6 +195,9 @@ class SpatialSuppression(Observable): 
        prev_max = None



        while process:

            # Setup to store results

            result = []



            mid_idx = int((min_idx + max_idx) / 2)



            if min_idx == mid_idx or mid_idx == max_idx:
@@ -207,9 +209,6 @@ class SpatialSuppression(Observable): 
            n_y_cells = int(self.domain[1] / cell_size)

            grid = np.zeros((n_x_cells, n_y_cells), dtype=np.bool)



            # Setup to store results

            result = []



            # Assign all points to bins

            x_edges = np.linspace(0, self.domain[0], n_x_cells)

            y_edges = np.linspace(0, self.domain[1], n_y_cells)

autocnet/matcher/tests/test_outlier_detector.py

+1 −6
Changes for autocnet/matcher/tests/test_outlier_detector.py: 1 added line, 6 removed lines.
Original line number Diff line number Diff line
@@ -95,11 +95,6 @@ class testSuppressionRanges(unittest.TestCase): 
    def setUpClass(cls):

        cls.r = np.random.RandomState(12345)



    def test_one_by_one(self):

        df = pd.DataFrame(self.r.uniform(0,1,(500, 3)), columns=['x', 'y', 'strength'])

        sup = SpatialSuppression(df, (1,1), k = 1)

        self.assertRaises(ValueError, sup.suppress())



    def test_min_max(self):

        df = pd.DataFrame(self.r.uniform(0,2,(500, 3)), columns=['x', 'y', 'strength'])

        sup = SpatialSuppression(df, (1.5,1.5), k = 1)
@@ -110,7 +105,7 @@ class testSuppressionRanges(unittest.TestCase): 
        df = pd.DataFrame(self.r.uniform(0,15,(500, 3)), columns=['x', 'y', 'strength'])

        sup = SpatialSuppression(df, (15,15), k = 200)

        sup.suppress()

        self.assertEqual(len(df[sup.mask]), 70)

        self.assertEqual(len(df[sup.mask]), 69)



    def test_small_distribution(self):

        df = pd.DataFrame(self.r.uniform(0,25,(500, 3)), columns=['x', 'y', 'strength'])