fixed some bugs

Author: fjzzq2002

cyaron/polygon.py

@@ -35,6 +35,8 @@ def area(self):
         ans = ans / 2
         return ans
 
+    #generate a convex hull with n points
+    #it's possible to have even edges
     @staticmethod
     def convex_hull(n, **kwargs):
         # fx, fy are functions which map [0,1] to int or float
@@ -45,7 +47,7 @@ def convex_hull(n, **kwargs):
         while len(result) < n:
             points = []
             # about 10 points will be randomized
-            randomize_prob = sz / 10 + 1
+            randomize_prob = int(sz / 10) + 1
             if randomize_prob < 10:
                 randomize_prob = 10
             for i in range(0, sz):
@@ -86,6 +88,7 @@ def convex_hull(n, **kwargs):
                         break
                     st.pop()
                 st.append(points[i])
+            st.pop()
             result = st
             sz = int(sz * 1.7) + 3  # if failed, increase size and try again
         ids = [i for i in range(0, len(result))]
@@ -101,6 +104,9 @@ def convex_hull(n, **kwargs):
     def __conquer(points):
         if len(points) <= 2:
             return points
+        if len(points) == 3:
+            (points[1],points[2])=(points[2],points[1])
+            return points
         divide_id = random.randint(2, len(points) - 1)
         divide_point1 = points[divide_id]
         divide_k = random.uniform(0.01, 0.99)

cyaron/tests/polygon_test.py

@@ -2,7 +2,7 @@
 from cyaron import Polygon,Vector
 class TestPolygon(unittest.TestCase):
     def test_convex_hull(self):
-        hull = Polygon.convex_hull(300, fx=lambda x:int(x*1000), fy=lambda x:int(x*1000))
+        hull = Polygon.convex_hull(300, fx=lambda x:int(x*100000), fy=lambda x:int(x*100000))
         points = hull.points
         points = sorted(points)
         # unique
@@ -33,6 +33,7 @@ def test_convex_hull(self):
                     break
                 st.pop()
             st.append(points[i])
+        st.pop()
         self.assertEqual(len(st), len(hull.points))
     def test_perimeter_area(self):
         poly = Polygon([[0,0],[0,1],[1,1],[1,0]])

examples/test_geometry.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from cyaron import *
 print "random convex hull of size 300:"
-hull=Polygon.convex_hull(300, fx=lambda x:int(x*1000), fy=lambda x:int(x*1000))
+hull=Polygon.convex_hull(300, fx=lambda x:int(x*100000), fy=lambda x:int(x*100000))
 print hull
 print "perimeter:"
 print hull.perimeter()