Fix bugs and typo errors in closest_pair_of_points.py

DIRECTORY.md

@@ -469,6 +469,11 @@
 
 ## Geometry
   * [Geometry](geometry/geometry.py)
+  * [Graham Scan](geometry/graham_scan.py)
+  * [Jarvis March](geometry/jarvis_march.py)
+  * Tests
+    * [Test Graham Scan](geometry/tests/test_graham_scan.py)
+    * [Test Jarvis March](geometry/tests/test_jarvis_march.py)
 
 ## Graphics
   * [Bezier Curve](graphics/bezier_curve.py)

divide_and_conquer/closest_pair_of_points.py

@@ -69,11 +69,11 @@ def dis_between_closest_in_strip(points, points_counts, min_dis=float("inf")):
     min_dis (float):  distance btw closest pair of points in the strip (< min_dis)
 
     >>> dis_between_closest_in_strip([[1,2],[2,4],[5,7],[8,9],[11,0]],5)
-    85
+    5
     """
 
-    for i in range(min(6, points_counts - 1), points_counts):
-        for j in range(max(0, i - 6), i):
+    for i in range(points_counts - 1):
+        for j in range(i + 1, min(i + 6, points_counts)):
             current_dis = euclidean_distance_sqr(points[i], points[j])
             min_dis = min(min_dis, current_dis)
     return min_dis
@@ -88,7 +88,7 @@ def closest_pair_of_points_sqr(points_sorted_on_x, points_sorted_on_y, points_co
     Returns :
     (float):  distance btw closest pair of points
 
-    >>> closest_pair_of_points_sqr([(1, 2), (3, 4)], [(5, 6), (7, 8)], 2)
+    >>> closest_pair_of_points_sqr([(1, 2), (3, 4)], [(1, 2), (3, 4)], 2)
     8
     """
 
@@ -99,10 +99,10 @@ def closest_pair_of_points_sqr(points_sorted_on_x, points_sorted_on_y, points_co
     # recursion
     mid = points_counts // 2
     closest_in_left = closest_pair_of_points_sqr(
-        points_sorted_on_x, points_sorted_on_y[:mid], mid
+        points_sorted_on_x[:mid], points_sorted_on_y, mid
     )
     closest_in_right = closest_pair_of_points_sqr(
-        points_sorted_on_y, points_sorted_on_y[mid:], points_counts - mid
+        points_sorted_on_x[mid:], points_sorted_on_y, points_counts - mid
     )
     closest_pair_dis = min(closest_in_left, closest_in_right)
 
@@ -112,7 +112,7 @@ def closest_pair_of_points_sqr(points_sorted_on_x, points_sorted_on_y, points_co
     """
 
     cross_strip = []
-    for point in points_sorted_on_x:
+    for point in points_sorted_on_y:
         if abs(point[0] - points_sorted_on_x[mid][0]) < closest_pair_dis:
             cross_strip.append(point)
 
@@ -124,7 +124,7 @@ def closest_pair_of_points_sqr(points_sorted_on_x, points_sorted_on_y, points_co
 
 def closest_pair_of_points(points, points_counts):
     """
-    >>> closest_pair_of_points([(2, 3), (12, 30)], len([(2, 3), (12, 30)]))
+    >>> closest_pair_of_points([(2, 3), (12, 30)], 2)
     28.792360097775937
     """
     points_sorted_on_x = column_based_sort(points, column=0)