Merge pull request OmkarPathak#73 from OmkarPathak/dev

Cleanup tests, add line2.contains_point

Author: OmkarPathak

imgs/test_geometry/test_extrapolated_intersection/as_test_one_moving_one_stationary_along_path_no_intr.py

@@ -13,22 +13,22 @@ def setup_fig01():
 def setup_fig02():
     fig, ax, renderer = create_newfig('{}02'.format(func_code), xlim=(-2, 12), ylim=(-1, 10))
 
-    create_moving_polygon(fig, ax, renderer, ((11, 5), (8, 8), (7, 7), (6, 3), (9, 3), (11, 5)), (-1, -3))
-    create_still_polygon(fig, ax, renderer,  ((3.5, 8.5), (1.5, 8.5), (1.5, 8.5), (-0.5, 7.5), (0.5, 3.5), (1.5, 2.5), (4.5, 2.5), (5.5, 6.5)))
+    create_moving_polygon(fig, ax, renderer, ((11, 5), (8, 8), (7, 7), (6, 3), (9, 3)), (-1, -3))
+    create_still_polygon(fig, ax, renderer,  ((3.5, 8.5), (1.5, 8.5), (-0.5, 7.5), (0.5, 3.5), (1.5, 2.5), (4.5, 2.5), (5.5, 6.5)))
     return fig, ax, '{}02_{}'.format(func_code, func_name)
 
 def setup_fig03():
     fig, ax, renderer = create_newfig('{}03'.format(func_code), xlim=(-3, 9), ylim=(-1, 15))
 
     create_moving_polygon(fig, ax, renderer, ((0.5, 9.0), (-1.5, 8.0), (-1.5, 6.0), (1.5, 5.0), (2.5, 5.0), (2.5, 9.0)), (0, 5))
-    create_still_polygon(fig, ax, renderer, ((7.0, 6.0), (4.0, 5.0), (4.0, 3.0), (6.0, 2.0), (8.0, 3.0), (7.0, 6.0)))
+    create_still_polygon(fig, ax, renderer, ((7.0, 6.0), (4.0, 5.0), (4.0, 3.0), (6.0, 2.0), (8.0, 3.0)))
     return fig, ax, '{}03_{}'.format(func_code, func_name)
 
 def setup_fig04():
     fig, ax, renderer = create_newfig('{}04'.format(func_code), xlim=(-2, 12), ylim=(-3, 10))
 
     create_moving_polygon(fig, ax, renderer, ((5.5, 4.5), (3.5, -1.5), (9.5, -1.5), (10.5, 0.5)), (-4, 0))
-    create_still_polygon(fig, ax, renderer, ((7.5, 8.5), (7.5, 8.5), (6.5, 5.5), (7.5, 4.5), (9.5, 4.5), (10.5, 7.5)))
+    create_still_polygon(fig, ax, renderer, ((7.5, 8.5), (6.5, 5.5), (7.5, 4.5), (9.5, 4.5), (10.5, 7.5)))
     return fig, ax, '{}04_{}'.format(func_code, func_name)
 
 run_or_export(setup_fig01, setup_fig02, setup_fig03, setup_fig04)

imgs/test_geometry/test_extrapolated_intersection/at_test_one_moving_one_stationary_along_path_touching.py

@@ -5,14 +5,14 @@
 
 def setup_fig01():
     fig, ax, renderer = create_newfig('{}01'.format(func_code), xlim=(-1, 16), ylim=(-1, 11))
-    create_moving_polygon(fig, ax, renderer, ((3, 10), (2, 10), (1, 8), (2, 6), (2, 6), (5, 6), (7, 8)), (8, 0))
+    create_moving_polygon(fig, ax, renderer, ((3, 10), (2, 10), (1, 8), (2, 6), (5, 6), (7, 8)), (8, 0))
     create_still_polygon(fig, ax, renderer, ((10, 5), (8, 6), (6, 5), (6, 4), (7, 2), (10, 4)))
 
     return fig, ax, '{}01_{}'.format(func_code, func_name)
 
 def setup_fig02():
     fig, ax, renderer = create_newfig('{}02'.format(func_code), xlim=(-8, 7), ylim=(-2, 12))
-    create_moving_polygon(fig, ax, renderer, ((5, 5), (4, 5), (2, 0), (4, -1), (6, 0), (5, 5)), (-5, 0))
+    create_moving_polygon(fig, ax, renderer, ((5, 5), (4, 5), (2, 0), (4, -1), (6, 0)), (-5, 0))
     create_still_polygon(fig, ax, renderer, ((2, 11), (-2, 8), (2, 5), (3, 6), (3, 11)))
 
     return fig, ax, '{}02_{}'.format(func_code, func_name)
@@ -26,8 +26,8 @@ def setup_fig03():
 
 def setup_fig04():
     fig, ax, renderer = create_newfig('{}04'.format(func_code), xlim=(-1, 14), ylim=(-3, 11))
-    create_moving_polygon(fig, ax, renderer, ((4.5, 4), (0.5, 2), (0.5, 1), (0.5, 0), (2.5, -2), (3.5, -2), (5.5, -1), (4.5, 4)), (6.7492919018596025, 4.29500393754702))
-    create_still_polygon(fig, ax, renderer, ((8, 8.5), (5, 9.5), (4, 8.5), (6, 5.5), (6, 5.5)))
+    create_moving_polygon(fig, ax, renderer, ((4.5, 4), (0.5, 2), (0.5, 1), (0.5, 0), (2.5, -2), (3.5, -2), (5.5, -1)), (6.7492919018596025, 4.29500393754702))
+    create_still_polygon(fig, ax, renderer, ((8, 8.5), (5, 9.5), (4, 8.5), (6, 5.5)))
 
     return fig, ax, '{}04_{}'.format(func_code, func_name)
 

pygorithm/geometry/line2.py

@@ -397,6 +397,51 @@ def are_parallel(line1, line2):
 
         return math.isclose(line1.slope, line2.slope)
 
+    @staticmethod
+    def contains_point(line, point, offset = None):
+      """
+      Determine if the line contains the specified point.
+      
+      Optionally, specify an offset for the line. Being
+      on the line is determined using `math.isclose`.
+      
+      :param line: the line
+      :type line: :class:`pygorithm.geometry.line2.Line2`
+      :param point: the point
+      :type point: :class:`pygorithm.geometry.vector2.Vector2`
+      :param offset: the offset of the line or None for the origin
+      :type offset: :class:`pygorithm.geometry.vector2.Vector2` or None
+      :returns: if the point is on the line
+      :rtype: bool
+      """
+      
+      if line.vertical:
+        x = line.start.x + offset.x if offset is not None else line.start.x
+        if not math.isclose(point.x, x, abs_tol=1e-07):
+          return False
+        ymin = line.min_y + offset.y if offset is not None else line.min_y
+        ymax = line.max_y + offset.y if offset is not None else line.max_y
+        if math.isclose(point.y, ymin, abs_tol=1e-07) or math.isclose(point.y, ymax, abs_tol=1e-07):
+          return True
+        return point.y > ymin and point.y < ymax
+      
+      xmin = line.min_x + offset.x if offset is not None else line.min_x
+      xmax = line.max_x + offset.x if offset is not None else line.max_x
+      
+      if not (math.isclose(point.x, xmin, abs_tol=1e-07) or point.x > xmin):
+        return False
+      
+      if not (math.isclose(point.x, xmax, abs_tol=1e-07) or point.x < xmax):
+        return False
+        
+      ystart = line.start.y + offset.y if offset is not None else line.start.y
+      if line.horizontal:
+        return math.isclose(ystart, point.y, abs_tol=1e-07)
+      
+      yint = line.calculate_y_intercept(offset)
+      yatx = line.slope * point.x + yint
+      return math.isclose(point.y, yatx, abs_tol=1e-07)
+      
     @staticmethod
     def find_intersection(line1, line2, offset1 = None, offset2 = None):
         """

tests/test_geometry.py

@@ -340,6 +340,13 @@ def test_are_parallel(self):
 
         _line = line2.Line2(vector2.Vector2(5, 4), vector2.Vector2(3, 1))
         self.assertTrue(line2.Line2.are_parallel(self.line_1_1_3_4, _line))
+    
+    def test_contains_point(self):
+        self.assertFalse(line2.Line2.contains_point(self.line_origin_1_1, self.vec_1_1, self.vec_1_2))
+        self.assertTrue(line2.Line2.contains_point(self.line_origin_1_1, self.vec_1_1))
+        self.assertTrue(line2.Line2.contains_point(self.line_1_1_3_4, vector2.Vector2(2, 2.5)))
+        self.assertFalse(line2.Line2.contains_point(self.line_1_1_3_4, vector2.Vector2(2, 2.5), vector2.Vector2(1, 0)))
+        self.assertTrue(line2.Line2.contains_point(line2.Line2(vector2.Vector2(-3, -3), vector2.Vector2(6, 3)), vector2.Vector2(3, 1)))
 
     def _find_intr_fuzzer(self, v1, v2, v3, v4, exp_touching, exp_overlap, exp_intr, number_fuzzes = 3):
         for i in range(number_fuzzes):
@@ -1806,7 +1813,7 @@ def _calc_one_moving_one_stat_distlimit_fuzzer(self, poly1tup, vel1tuporvec, pol
         return intr, msg
 
     def test_one_moving_one_stationary_distlimit_no_intr(self):
-        fn = _calc_one_moving_one_stat_distlimit_fuzzer
+        fn = self._calc_one_moving_one_stat_distlimit_fuzzer
 
         # am01
         intr, msg = fn(((0, 3), (1, 3), (1, 2), (0, 2)), (1, 0), ((2, 0), (3, 1), (4, 0)), 4)
@@ -1821,18 +1828,18 @@ def test_one_moving_one_stationary_distlimit_no_intr(self):
         self.assertFalse(intr, msg=msg)
 
         # am04
-        intr, msg = fn(((4, 1.75), (5, 2.5), (6, 2.5), (4, 1.25)), (-2, 1), ((4.175), (5, 2.5), (6, 2.5), (4, 1.25)), self.pt(-2, 1).magnitude())
+        intr, msg = fn(((4, 1.75), (5, 2.5), (6, 2.5), (4, 1.25)), (-2, 1), ((4, 1.75), (5, 2.5), (6, 2.5), (4, 1.25)), self.pt(-2, 1).magnitude())
         self.assertFalse(intr, msg=msg)
 
     def test_one_moving_one_stationary_distlimit_touching(self):
-        fn = _calc_one_moving_one_stat_distlimit_fuzzer
+        fn = self._calc_one_moving_one_stat_distlimit_fuzzer
 
         # an01
-        intr, msg = fn(((0, 3), (1, 3), (1, 2), (0, 2)), (5, -1.25), ((3, 1), (4, 1), (3, 0), (4, 0)), self.pt(5, -1.25).magnitude())
+        intr, msg = fn(((0, 3), (1, 3), (1, 2), (0, 2)), (5, -1.25), ((3, 1), (4, 1), (4, 0), (3, 0)), self.pt(5, -1.25).magnitude())
         self.assertFalse(intr, msg=msg)
 
         # an02
-        intr, msg = fn(((1, 3), (2, 3), (1, 2), (2, 2)), (4, 0), ((1, 0), (2, 1), (4, 2), (5, 0)), 4)
+        intr, msg = fn(((1, 3), (2, 3), (2, 2), (1, 2)), (4, 0), ((1, 0), (2, 1), (4, 2), (5, 0)), 4)
         self.assertFalse(intr, msg=msg)
 
         # an03
@@ -1844,7 +1851,7 @@ def test_one_moving_one_stationary_distlimit_touching(self):
         self.assertFalse(intr, msg=msg)
 
     def test_one_moving_one_stationary_distlimit_intr_at_start(self):
-        fn = _calc_one_moving_one_stat_distlimit_fuzzer
+        fn = self._calc_one_moving_one_stat_distlimit_fuzzer
 
         # ao01
         intr, msg = fn(((3, 3), (4, 3), (4, 1), (3, 1)), (2, 0), ((3, 1), (4, 1), (4, 0), (3, 0)), 2)
@@ -1863,7 +1870,7 @@ def test_one_moving_one_stationary_distlimit_intr_at_start(self):
         self.assertTrue(intr, msg=msg)
 
     def test_one_moving_one_stationary_distlimit_intr_later(self):
-        fn = _calc_one_moving_one_stat_distlimit_fuzzer
+        fn = self._calc_one_moving_one_stat_distlimit_fuzzer
 
         # ap01
         intr, msg = fn(((2, 3), (3, 3), (3, 2), (2, 2)), (5, 4), ((3, 5), (4, 5), (4, 4), (3, 4)), self.pt(5, 4).magnitude())
@@ -1882,7 +1889,7 @@ def test_one_moving_one_stationary_distlimit_intr_later(self):
         self.assertTrue(intr, msg=msg)
 
     def test_one_moving_one_stationary_distlimit_touch_at_limit(self):
-        fn = _calc_one_moving_one_stat_distlimit_fuzzer
+        fn = self._calc_one_moving_one_stat_distlimit_fuzzer
 
         # aq01
         intr, msg = fn(((0, 1), (1, 1), (1, 0), (0, 0)), (4, 3), ((3, 5), (4, 5), (4, 4), (3, 4)), self.pt(4, 3).magnitude())
@@ -1901,7 +1908,7 @@ def test_one_moving_one_stationary_distlimit_touch_at_limit(self):
         self.assertFalse(intr, msg=msg)
 
     def test_one_moving_one_stationary_distlimit_intr_after_limit(self):
-        fn = _calc_one_moving_one_stat_distlimit_fuzzer
+        fn = self._calc_one_moving_one_stat_distlimit_fuzzer
 
         # ar01
         intr, msg = fn(((0, 1), (1, 1), (1, 0), (0, 0)), (4, 3), ((5.5, 5.5), (6.5, 5.5), (6.5, 4.5), (5.5, 4.5)), self.pt(4, 3).magnitude())
@@ -1923,7 +1930,9 @@ def test_one_moving_one_stationary_distlimit_intr_after_limit(self):
     def _calc_one_moving_one_stat_along_path_fuzzer(self, poly1tup, pos1tuporvec, pos2tuporvec, poly2tup, reverse=False):
         # i generated a few polygons in the wrong order when making these tests
         if reverse:
+            poly1tup = list(p for p in poly1tup)
             poly1tup.reverse()
+            poly2tup = list(p for p in poly2tup)
             poly2tup.reverse()
 
         fn = self.extr_intr.calculate_one_moving_one_stationary_along_path
@@ -1956,34 +1965,34 @@ def test_one_moving_one_stationary_along_path_no_intr(self):
         self.assertFalse(intr, msg=msg)
 
         # as02
-        intr, msg = fn(((11, 5), (8, 8), (7, 7), (6, 3), (9, 3), (11, 5)), (0, 0), (-1, -3), ((3.5, 8.5), (1.5, 8.5), (1.5, 8.5), (-0.5, 7.5), (0.5, 3.5), (1.5, 2.5), (4.5, 2.5), (5.5, 6.5)), reverse=True)
+        intr, msg = fn(((11, 5), (8, 8), (7, 7), (6, 3), (9, 3)), (0, 0), (-1, -3), ((3.5, 8.5), (1.5, 8.5), (-0.5, 7.5), (0.5, 3.5), (1.5, 2.5), (4.5, 2.5), (5.5, 6.5)), reverse=True)
         self.assertFalse(intr, msg=msg)
 
         # as03
-        intr, msg = fn(((0.5, 9.0), (-1.5, 8.0), (-1.5, 6.0), (1.5, 5.0), (2.5, 5.0), (2.5, 9.0)), (0, 0), (0, 5), ((7.0, 6.0), (4.0, 5.0), (4.0, 3.0), (6.0, 2.0), (8.0, 3.0), (7.0, 6.0)), reverse=True)
+        intr, msg = fn(((0.5, 9.0), (-1.5, 8.0), (-1.5, 6.0), (1.5, 5.0), (2.5, 5.0), (2.5, 9.0)), (0, 0), (0, 5), ((7.0, 6.0), (4.0, 5.0), (4.0, 3.0), (6.0, 2.0), (8.0, 3.0)), reverse=True)
         self.assertFalse(intr, msg=msg)
 
         # as04
-        intr, msg = fn(((5.5, 4.5), (3.5, -1.5), (9.5, -1.5), (10.5, 0.5)), (0, 0), (-4, 0), ((7.5, 8.5), (7.5, 8.5), (6.5, 5.5), (7.5, 4.5), (9.5, 4.5), (10.5, 7.5)), reverse=True)
+        intr, msg = fn(((5.5, 4.5), (3.5, -1.5), (9.5, -1.5), (10.5, 0.5)), (0, 0), (-4, 0), ((7.5, 8.5), (6.5, 5.5), (7.5, 4.5), (9.5, 4.5), (10.5, 7.5)), reverse=True)
         self.assertFalse(intr, msg=msg)
 
     def test_one_moving_one_stationary_along_path_touching(self):
         fn = self._calc_one_moving_one_stat_along_path_fuzzer
 
         # at01
-        intr, msg = fn(((3, 10), (2, 10), (1, 8), (2, 6), (2, 6), (5, 6), (7, 8)), (0, 0), (8, 0), ((10, 5), (8, 6), (6, 5), (6, 4), (7, 2), (10, 4)), reverse=True)
+        intr, msg = fn(((3, 10), (2, 10), (1, 8), (2, 6), (5, 6), (7, 8)), (0, 0), (8, 0), ((10, 5), (8, 6), (6, 5), (6, 4), (7, 2), (10, 4)), reverse=True)
         self.assertFalse(intr, msg=msg)
 
         # at02
-        intr, msg = fn(((5, 5), (4, 5), (2, 0), (4, -1), (6, 0), (5, 5)), (0, 0), (-5, 0), ((2, 11), (-2, 8), (2, 5), (3, 6), (3, 11)), reverse=True)
+        intr, msg = fn(((5, 5), (4, 5), (2, 0), (4, -1), (6, 0)), (0, 0), (-5, 0), ((2, 11), (-2, 8), (2, 5), (3, 6), (3, 11)), reverse=True)
         self.assertFalse(intr, msg=msg)
 
         # at03
-        intr, msg = fn((9.5, 8.5), (8.5, 7.5), (9.5, 5), (10.5, 7)), (0, 0), (-9, -9), ((2, 5), (-1, 5), (-2, 3), (2, 1), (3, 2)), reverse=True)
+        intr, msg = fn(((9.5, 8.5), (8.5, 7.5), (9.5, 5), (10.5, 7)), (0, 0), (-9, -9), ((2, 5), (-1, 5), (-2, 3), (2, 1), (3, 2)), reverse=True)
         self.assertFalse(intr, msg=msg)
 
         # at04
-        intr, msg = fn(((4.5, 4), (0.5, 2), (0.5, 1), (0.5, 0), (2.5, -2), (3.5, -2), (5.5, -1), (4.5, 4)), (0, 0), (6.7492919018596025, 4.29500393754702), ((8, 8.5), (5, 9.5), (4, 8.5), (6, 5.5), (6, 5.5)), reverse=True)
+        intr, msg = fn(((4.5, 4), (0.5, 2), (0.5, 1), (0.5, 0), (2.5, -2), (3.5, -2), (5.5, -1)), (0, 0), (6.7492919018596025, 4.29500393754702), ((8, 8.5), (5, 9.5), (4, 8.5), (6, 5.5)), reverse=True)
         self.assertFalse(intr, msg=msg)
 
     def test_one_moving_one_stationary_along_path_intr_at_start(self):