finito

Author: geooo109

part1/src/ex1/main.py

@@ -30,6 +30,7 @@ def main():
         print ("Triangle contains (0,0)")
     else:
         print ("Triangle dosen't contain (0,0)")
+    ch = raw_input("Do you want to Plot the Triangle and the (0,0) point? type (yes) or (not): ")
     poss_trian.display_triangle_and_test_point(pt0)
 
 

part1/src/ex1/triangle.py

@@ -26,7 +26,10 @@ def area(self):
                         +(self.pt3.get_x()*(self.pt1.get_y()-self.pt2.get_y()))))
 
     # True if point inside the triangle else False
-    # https://www.youtube.com/watch?v=H9qu9Xptf-w
+    '''
+        Input : the point we want to test
+        Output : True if the point is in our triagnle else False
+    '''
     def check_pt_triangle(self, pt_test):
         tr1 = Triangle(pt_test, self.pt1, self.pt2)
         tr2 = Triangle(pt_test, self.pt2, self.pt3)

part1/src/ex3_ex4/main.py

@@ -2,8 +2,9 @@
 from plane import *
 import numpy as np
 import matplotlib.pyplot as plt
-import time
-RANGE_XY = 1000
+
+#CHANGE IF YOU WANT THE RANGE OF NUMBERS TO RANDOM GENERATE Points
+RANGE_XY = 100000
 def parse_input():
     points = []
     ch = raw_input("To autogenerate write ->AUTO<- else just type something: ")
@@ -34,13 +35,32 @@ def main():
     choice = raw_input("Type (1) for Incremental / Type (2) for Gift Wrap: ")
     while True:
         if choice == "1":
-            plane.incremental_convex_hull()
+            hull = plane.incremental_convex_hull()
+            if hull is None:
+                print "Couldn't compute Convex Hull"
+                return
+            print("**Hull Points**")
+            for pt in hull:
+                pt.print_point()
+            ch = raw_input("Do you want to Plot points with the Convex Hull? type (yes) or (no): ")
+            if ch == "yes":
+                plane.display_hull(hull)
             break
         elif choice == "2":
-            plane.gift_wrap_convex_hull()
+            hull = plane.gift_wrap_convex_hull()
+            if hull is None:
+                print "Couldn't compute Convex Hull"
+                return
+            print("**Hull Points**")
+            for pt in hull:
+                pt.print_point()
+            ch = raw_input("Do you want to Plot points with the Convex Hull? type (yes) or (no): ")
+            if ch == "yes":
+                plane.display_hull(hull)
             break
         else:
             print ("Wrong input Please choose again")
+            break
 
 if __name__ == "__main__":
     main()

part1/src/ex3_ex4/plane.py

@@ -89,12 +89,16 @@ def find_left_most_pt(self):
     def sort_function(self,point):
         return point.get_x()
 
+    '''
+        Input : The already Points from the input of the program
+        Retunrs a list of Points with the hull points
+    '''
     def incremental_convex_hull(self):
         lower_hull = []
         upper_hull = []
 
-        if len(self.points) <= 1:
-            return self.points
+        if len(self.points) <= 2:
+            return None
 
         #sorting list based on x coord {max -> min}
         self.points = sorted(self.points,key = self.sort_function, reverse = True)
@@ -136,15 +140,19 @@ def incremental_convex_hull(self):
             upper_hull.append(self.points[idx])
 
         hull = lower_hull + upper_hull
-        self.display_hull(hull)
-        return
-
+        return hull
 
+    '''
+        Input : The already Points from the input of the program
+        Retunrs a list of Points with the hull points
+    '''
     def gift_wrap_convex_hull(self):
         hull_points = []
         #find leftmost point
         left_pt = self.find_left_most_pt()
         total_points = len(self.points)
+        if total_points <= 2:
+            return None
         cr_pt = left_pt
         while True:
             hull_points.append(self.points[cr_pt])
@@ -157,5 +165,4 @@ def gift_wrap_convex_hull(self):
             cr_pt = curr_pt
             if cr_pt == left_pt:
                 break
-        self.display_hull(hull_points)
-        return
+        return hull_points