Refactored broad phase

Author: aesee

pygorithm/geometry/__init__.py

@@ -1,7 +1,7 @@
 """
 Collection of special geometry functions
 """
-from . import collision_detection
+from . import rect_broad_phase
 
 __all__ = [
     'collision_detection.py'

pygorithm/geometry/collision_detection.py pygorithm/geometry/rect_broad_phase.pypygorithm/geometry/collision_detection.py renamed to pygorithm/geometry/rect_broad_phase.py

@@ -8,6 +8,7 @@
 
 import inspect
 
+
 class Coord:
     """Coord
     Class to initialize Coordinate of one point
@@ -18,8 +19,8 @@ def __init__(self, x, y):
         self.y = y
 
 
-class Body:
-    """Body
+class SimpleRectangle:
+    """SimpleRectangle
     Class to initialize Body of Object
     """
 
@@ -34,15 +35,15 @@ def __init__(self, coord1, coord2):
         self.max_y = coord2.y
 
 
-def broad_phase(body1, body2):
+def broad_phase(simpleRect1, simpleRect2):
     """
-    :type body1: object
-    :type body2: object
+    :type simpleRect1: object
+    :type simpleRect2: object
     """
-    d1x = body2.min_x - body1.max_x
-    d1y = body2.min_y - body1.max_y
-    d2x = body1.min_x - body2.max_x
-    d2y = body1.min_y - body2.max_y
+    d1x = simpleRect2.min_x - simpleRect1.max_x
+    d1y = simpleRect2.min_y - simpleRect1.max_y
+    d2x = simpleRect1.min_x - simpleRect2.max_x
+    d2y = simpleRect1.min_y - simpleRect2.max_y
 
     if d1x > 0 or d1y > 0:
         return False
@@ -57,13 +58,4 @@ def get_code():
     """
     returns the code for the broad phase function
     """
-    return inspect.getsource(broad_phase)
-
-if __name__ == '__main__':
-    coord1 = Coord(1, 1)
-    coord2 = Coord(6, 8)
-    body1 = Body(coord1, coord2)
-    coord3 = Coord(4, 0)
-    coord4 = Coord(7, 4)
-    body2 = Body(coord3, coord4)
-    print(broad_phase(body1, body2))
+    return inspect.getsource(broad_phase)

tests/test_geometry.py

@@ -1,32 +1,32 @@
 import unittest
 
 from pygorithm.geometry import (
-    collision_detection
+    rect_broad_phase
                 )
 
 
 class TestCollisionDetection(unittest.TestCase):
     def setUp(self):
         # first pair of objects
-        self.coord1 = collision_detection.Coord(1, 1)
-        self.coord2 = collision_detection.Coord(6, 8)
-        self.body1 = collision_detection.Body(self.coord1, self.coord2)
-        self.coord3 = collision_detection.Coord(4, 0)
-        self.coord4 = collision_detection.Coord(7, 4)
-        self.body2 = collision_detection.Body(self.coord3, self.coord4)
+        self.coord1 = rect_broad_phase.Coord(1, 1)
+        self.coord2 = rect_broad_phase.Coord(6, 8)
+        self.simpleRect1 = rect_broad_phase.SimpleRectangle(self.coord1, self.coord2)
+        self.coord3 = rect_broad_phase.Coord(4, 0)
+        self.coord4 = rect_broad_phase.Coord(7, 4)
+        self.simpleRect2 = rect_broad_phase.SimpleRectangle(self.coord3, self.coord4)
         # second pair
-        self.coord1 = collision_detection.Coord(1, 1)
-        self.coord2 = collision_detection.Coord(2, 3)
-        self.body3 = collision_detection.Body(self.coord1, self.coord2)
-        self.coord3 = collision_detection.Coord(4, 3)
-        self.coord4 = collision_detection.Coord(7, 8)
-        self.body4 = collision_detection.Body(self.coord3, self.coord4)
+        self.coord1 = rect_broad_phase.Coord(1, 1)
+        self.coord2 = rect_broad_phase.Coord(2, 3)
+        self.simpleRect3 = rect_broad_phase.SimpleRectangle(self.coord1, self.coord2)
+        self.coord3 = rect_broad_phase.Coord(4, 3)
+        self.coord4 = rect_broad_phase.Coord(7, 8)
+        self.simpleRect4 = rect_broad_phase.SimpleRectangle(self.coord3, self.coord4)
 
 
 class TestBroadPhase(TestCollisionDetection):
     def test_collision_detect(self):
-        self.assertTrue(collision_detection.broad_phase(self.body1, self.body2))
-        self.assertFalse(collision_detection.broad_phase(self.body3, self.body4))
+        self.assertTrue(rect_broad_phase.broad_phase(self.simpleRect1, self.simpleRect2))
+        self.assertFalse(rect_broad_phase.broad_phase(self.simpleRect3, self.simpleRect4))
 
 if __name__ == '__main__':
     unittest.main()