Commit 99d6d7d0 authored by Evin Dunn's avatar Evin Dunn
Browse files

Corrected x-offset direction in naive_template

parent a2db15af

autocnet/matcher/naive_template.py

+1 −2
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ def pattern_match(template, image, upsampling=16, func=cv2.TM_CCOEFF_NORMED, err 
    y += (u_template.shape[0] / 2)

    x += (u_template.shape[1] / 2)



    x = (ideal_x - x) / upsampling

    x = (x - ideal_x) / upsampling

    y = (ideal_y - y) / upsampling

    return x, y, max_corr

autocnet/matcher/tests/test_naive_template.py

+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ class TestNaiveTemplate(unittest.TestCase): 
        result_x, result_y, result_strength = naive_template.pattern_match(self._t_shape,

                                                                           self._test_image, upsampling=1)

        # Test offsets

        self.assertEqual(result_x, 3)

        self.assertEqual(result_x, -3)

        self.assertEqual(result_y, 3)

        # Test Correlation Strength: At least 0.8

        self.assertGreaterEqual(result_strength, 0.8, "Returned Correlation Strength of %d" % result_strength)
@@ -57,7 +57,7 @@ class TestNaiveTemplate(unittest.TestCase): 
        result_x, result_y, result_strength = naive_template.pattern_match(self._rect_shape,

                                                                           self._test_image, upsampling=1)

        # Test offsets

        self.assertEqual(result_x, -3)

        self.assertEqual(result_x, 3)

        self.assertEqual(result_y, -4)

        # Test Correlation Strength: At least 0.8

        self.assertGreaterEqual(result_strength, 0.8, "Returned Correlation Strength of %d" % result_strength)
@@ -66,7 +66,7 @@ class TestNaiveTemplate(unittest.TestCase): 
        result_x, result_y, result_strength = naive_template.pattern_match(self._square_shape,

                                                                           self._test_image, upsampling=1)

        # Test offsets

        self.assertEqual(result_x, 2)

        self.assertEqual(result_x, -2)

        self.assertEqual(result_y, -4)

        # Test Correlation Strength: At least 0.8

        self.assertGreaterEqual(result_strength, 0.8, "Returned Correlation Strength of %d" % result_strength)
@@ -75,7 +75,7 @@ class TestNaiveTemplate(unittest.TestCase): 
        result_x, result_y, result_strength = naive_template.pattern_match(self._vertical_line,

                                                                           self._test_image, upsampling=1)

        # Test offsets

        self.assertEqual(result_x, -3)

        self.assertEqual(result_x, 3)

        self.assertEqual(result_y, 5)

        # Test Correlation Strength: At least 0.8

        self.assertGreaterEqual(result_strength, 0.8, "Returned Correlation Strength of %d" % result_strength)