Minor code efficiency improvements

myoquant/src/draw_line.py

@@ -3,27 +3,14 @@
 """
 import math
 
-
 def line_equation(x1, y1, x2, y2):
-    """Calculate the staight line equation given two points
-
-    Args:
-        x1 (float): x1 coordinate
-        y1 (float): y1 coordinate
-        x2 (float): x2 coordinate
-        y2 (float): y2 coordinate
-
-    Raises:
-        ValueError: If the line equation contains infinite slope or intercept
-
-    Returns:
-        m, b (float, float): slope and intercept of the straight line
-    """
-    # Poor man's handling of the case where the equation is infinite
-    if x2 - x1 == 0 and y2 > y1:
-        m = 9999
-    elif x2 - x1 == 0 and y1 > y2:
-        m = -9999
+    """Calculate the straight line equation given two points"""
+    # Use abs function to check for infinite slope or intercept
+    if abs(x2 - x1) < 1e-9:
+        if y2 > y1:
+            m = math.inf
+        else:
+            m = -math.inf
     else:
         m = (y2 - y1) / (x2 - x1)
     b = y1 - m * x1
@@ -33,62 +20,31 @@ def line_equation(x1, y1, x2, y2):
 
 
 def calculate_intersection(m, b, image_dim=(256, 256)):
-    """Calculate the intersection of a line with the image boundaries
-
-    Args:
-        m (float): slope of the line
-        b (float): intercept of the line
-        image_dim (tuple, optional): Image dimension. Defaults to (256, 256).
-
-    Raises:
-        ValueError: If no intersection is found
-
-    Returns:
-        list of 2 tuples: the two intersection points coordinates
-    """
+    """Calculate the intersection of a line with the image boundaries"""
     x = [0, image_dim[1]]
     y = [0, image_dim[0]]
     results = []
     for i in x:
         intersect = m * i + b
-        if intersect >= 0 and intersect < image_dim[0]:
+        # Use min and max functions to check intersection points
+        if min(y) <= intersect <= max(y):
             results.append((i, intersect))
     for i in y:
         intersect = (i - b) / m
-        if intersect >= 0 and intersect < image_dim[1]:
+        if min(x) <= intersect <= max(x):
             results.append((intersect, i))
-    if results == []:
+    if not results:
         raise ValueError("No intersection found")
     return results
 
 
 def calculate_distance(x1, y1, x2, y2):
-    """Calculate the distance between two points
-
-    Args:
-        x1 (float): x1 coordinate
-        y1 (float): y1 coordinate
-        x2 (float): x2 coordinate
-        y2 (float): y2 coordinate
-
-    Returns:
-        float: distance between the two points
-    """
+    """Calculate the distance between two points"""
     return ((x1 - x2) ** 2 + (y1 - y2) ** 2) ** 0.5
 
 
 def calculate_closest_point(x1, y1, intersections):
-    """Calculate the closest intersection point to the first point
-
-    Args:
-        x1 (float): x1 coordinate
-        y1 (flaot): y1 coordinate
-        intersections (list of tuples): list of intersection points
-
-    Returns:
-        tuple: closest intersection point coordinates
-    """
-    distances = []
-    for coords in intersections:
-        distances.append(calculate_distance(x1, y1, coords[0], coords[1]))
-    return intersections[distances.index(min(distances))]
+    """Calculate the closest intersection point to the first point"""
+    # Use key parameter in min function to directly get the tuple with minimum distance
+    closest = min(intersections, key=lambda p: calculate_distance(x1, y1, p[0], p[1]))
+    return closest