Update to python 3.6 from 3.4

Remove the _approx functions that I was using to delay updating

* pygorithm/geometry/axisall.py - remove _approx
* pygorithm/geometry/line2.py - remove _approx
* pygorithm/geometry/polygon2.py - remove _approx

Author: Tjstretchalot

pygorithm/geometry/axisall.py

@@ -64,23 +64,6 @@ def __init__(self, axis, point1, point2):
         self.min = min(point1, point2)
         self.max = max(point1, point2)
 
-    @staticmethod
-    def _approx(a, b):
-        """
-        Same as math.isclose but supports python < 3.5
-        
-        :param a: first numeric
-        :type a: :class:`numbers.Number`
-        :param b: second numeric
-        :type b: :class:`numbers.Number`
-        :returns: if the are close
-        :rtype: bool
-        """
-        
-        if hasattr(math, 'isclose'):
-            return math.isclose(a, b)
-        return abs(a - b) <= 1e-09 * max(abs(a), abs(b))
-    
     @staticmethod
     def intersects(line1, line2):
         """
@@ -108,9 +91,9 @@ def intersects(line1, line2):
         :rtype: (bool, bool)
         """
 
-        if AxisAlignedLine._approx(line1.max, line2.min):
+        if math.isclose(line1.max, line2.min):
             return True, False
-        elif AxisAlignedLine._approx(line1.min, line2.max):
+        elif math.isclose(line1.min, line2.max):
             return True, False
         elif line1.max < line2.min:
             return False, False
@@ -146,9 +129,9 @@ def find_intersection(line1, line2):
         :rtype: (bool, (:class:`numbers.Number` or None, :class:`numbers.Number`, :class:`numbers.Number`) or None)
         """
 
-        if AxisAlignedLine._approx(line1.max, line2.min):
+        if math.isclose(line1.max, line2.min):
             return True, (None, line2.min, line2.min)
-        elif AxisAlignedLine._approx(line1.min, line2.max):
+        elif math.isclose(line1.min, line2.max):
             return True, (None, line1.min, line1.min)
         elif line1.max < line2.min or line2.max < line1.min:
             return False, None
@@ -183,7 +166,7 @@ def contains_point(line, point):
         :rtype: (bool, bool)
         """
 
-        if AxisAlignedLine._approx(line.min, point) or AxisAlignedLine._approx(line.max, point):
+        if math.isclose(line.min, point) or math.isclose(line.max, point):
             return True, False
         elif point < line.min or point > line.max:
             return False, False

pygorithm/geometry/line2.py

@@ -377,23 +377,6 @@ def calculate_y_intercept(self, offset):
         # y = mx + b -> b = y - mx
         return self.start.y + offset.y - self.slope * (self.start.x + offset.x)
 
-    @staticmethod
-    def _approx(a, b):
-        """
-        Same as math.isclose but supports python < 3.5
-        
-        :param a: first numeric
-        :type a: :class:`numbers.Number`
-        :param b: second numeric
-        :type b: :class:`numbers.Number`
-        :returns: if the are close
-        :rtype: bool
-        """
-        
-        if hasattr(math, 'isclose'):
-            return math.isclose(a, b)
-        return abs(a - b) <= 1e-09 * max(abs(a), abs(b))
-    
     @staticmethod
     def are_parallel(line1, line2):
         """
@@ -412,7 +395,7 @@ def are_parallel(line1, line2):
         if line1.vertical and line2.vertical:
             return True
 
-        return Line2._approx(line1.slope, line2.slope)
+        return math.isclose(line1.slope, line2.slope)
 
     @staticmethod
     def find_intersection(line1, line2, offset1 = None, offset2 = None):
@@ -467,7 +450,7 @@ def find_intersection(line1, line2, offset1 = None, offset2 = None):
 
         if line1.vertical and line2.vertical:
             # Two vertical lines
-            if not Line2._approx(l1_st_x, l2_st_x):
+            if not math.isclose(l1_st_x, l2_st_x):
                 return False, False, None
 
             aal1 = axisall.AxisAlignedLine(None, l1_st_y, l1_en_y)
@@ -484,7 +467,7 @@ def find_intersection(line1, line2, offset1 = None, offset2 = None):
 
         if line1.horizontal and line2.horizontal:
             # Two horizontal lines
-            if not Line2._approx(l1_st_y, l2_st_y):
+            if not math.isclose(l1_st_y, l2_st_y):
                 return False, False, None
 
             aal1 = axisall.AxisAlignedLine(None, l1_st_x, l1_en_x)
@@ -503,7 +486,7 @@ def find_intersection(line1, line2, offset1 = None, offset2 = None):
             # Two non-vertical, non-horizontal, parallel lines
             yintr1 = line1.calculate_y_intercept(offset1)
             yintr2 = line2.calculate_y_intercept(offset2)
-            if not Line2._approx(yintr1, yintr2):
+            if not math.isclose(yintr1, yintr2):
                 return False, False, None
 
             axis = line1.axis
@@ -544,7 +527,7 @@ def unshift_vec(vec):
 
             pt = vector2.Vector2(l1_st_x, l2_st_y)
 
-            if Line2._approx(l2_st_y, l1_min) or Line2._approx(l2_st_y, l2_max) or Line2._approx(l1_st_x, l2_min) or Line2._approx(l2_st_y, l2_max):
+            if math.isclose(l2_st_y, l1_min) or math.isclose(l2_st_y, l2_max) or math.isclose(l1_st_x, l2_min) or math.isclose(l2_st_y, l2_max):
                 return True, False, pt
             else:
                 return False, True, pt
@@ -556,7 +539,7 @@ def unshift_vec(vec):
             l1_min = min(l1_st_y, l1_en_y) if offset1 is not None else line1.min_y
             l1_max = max(l1_st_y, l1_en_y) if offset1 is not None else line1.max_y
 
-            if Line2._approx(line2_y_at_line1_x, l1_min) or Line2._approx(line2_y_at_line1_x, l1_max):
+            if math.isclose(line2_y_at_line1_x, l1_min) or math.isclose(line2_y_at_line1_x, l1_max):
                 return True, False, vector2.Vector2(l1_st_x, line2_y_at_line1_x)
             elif line2_y_at_line1_x < l1_min or line2_y_at_line1_x > l2_max:
                 return False, False, None
@@ -571,7 +554,7 @@ def unshift_vec(vec):
             l1_min = min(l1_st_x, l1_en_x) if offset1 is not None else line1.min_x
             l1_max = max(l1_st_x, l1_en_x) if offset1 is not None else line1.max_x
 
-            if Line2._approx(line2_x_at_line1_y, l1_min) or Line2._approx(line2_x_at_line1_y, l1_max):
+            if math.isclose(line2_x_at_line1_y, l1_min) or math.isclose(line2_x_at_line1_y, l1_max):
                 return True, False, vector2.Vector2(line2_x_at_line1_y, l1_st_y)
             elif line2_x_at_line1_y < l1_min or line2_x_at_line1_y > l1_max:
                 return False, False, None
@@ -593,8 +576,8 @@ def unshift_vec(vec):
         # Some caution needs to be taken here to ensure we do approximately before range
         # checks. It's possible for _approx(a, b) to be True and a < b to be True
 
-        on_edge1 = Line2._approx(intr_x, l1_st_x) or Line2._approx(intr_x, l1_en_x)
-        on_edge2 = Line2._approx(intr_x, l2_st_x) or Line2._approx(intr_x, l2_en_x)
+        on_edge1 = math.isclose(intr_x, l1_st_x) or math.isclose(intr_x, l1_en_x)
+        on_edge2 = math.isclose(intr_x, l2_st_x) or math.isclose(intr_x, l2_en_x)
 
         if on_edge1 and on_edge2:
             intr_y = line1.slope * intr_x + yintr1

pygorithm/geometry/polygon2.py

@@ -115,7 +115,7 @@ def __init__(self, points, suppress_errors = False):
 
             if not suppress_errors:
                 for prev_pt in self.points:
-                    if Polygon2._approx(prev_pt.x, act_pt.x) and Polygon2._approx(prev_pt.y, act_pt.y):
+                    if math.isclose(prev_pt.x, act_pt.x) and math.isclose(prev_pt.y, act_pt.y):
                         raise ValueError('Repeated points! points={} (repeated={})'.format(points, act_pt))
 
 
@@ -133,7 +133,7 @@ def __init__(self, points, suppress_errors = False):
                 norm.x *= -1
                 norm.y *= -1
 
-            already_contains = next((v for v in self.normals if Polygon2._approx(v.x, norm.x) and Polygon2._approx(v.y, norm.y)), None)
+            already_contains = next((v for v in self.normals if math.isclose(v.x, norm.x) and math.isclose(v.y, norm.y)), None)
             if already_contains is None:
                 self.normals.append(norm)
 
@@ -164,24 +164,6 @@ def __init__(self, points, suppress_errors = False):
                 if cross_product < -1e-09:
                     raise ValueError('Detected concavity at index {} - {} cross {} = {}\nself={}'.format(middlepointin, vec1, vec2, cross_product, str(self)))
 
-        
-    @staticmethod
-    def _approx(a, b):
-        """
-        Same as math.isclose but supports python < 3.5
-        
-        :param a: first numeric
-        :type a: :class:`numbers.Number`
-        :param b: second numeric
-        :type b: :class:`numbers.Number`
-        :returns: if the are close
-        :rtype: bool
-        """
-        
-        if hasattr(math, 'isclose'):
-            return math.isclose(a, b)
-        return abs(a - b) <= 1e-09 * max(abs(a), abs(b))
-    
     @classmethod
     def from_regular(cls, sides, length, start_rads = None, start_degs = None, center = None):
         """
@@ -438,7 +420,7 @@ def contains_point(polygon, offset, point):
             cross = vec1.cross(vec2)
             _previous = curr
 
-            if Polygon2._approx(cross, 0):
+            if math.isclose(cross, 0):
                 return True, False
 
             if cross > 0:
@@ -494,7 +476,7 @@ def find_intersection(poly1, poly2, offset1, offset2, find_mtv = True):
         for n in poly2.normals:
             found = False
             for old_n in poly1.normals:
-                if Polygon2._approx(n.x, old_n.x) and Polygon2._approx(n.y, old_n.y):
+                if math.isclose(n.x, old_n.x) and math.isclose(n.y, old_n.y):
                     found = True
                     break
             if not found: