From 6b3b9572572be768cc01d780fa15a5a77a260793 Mon Sep 17 00:00:00 2001
From: HeshamTB <hishaminv@gmail.com>
Date: Mon, 14 Feb 2022 16:14:52 +0300
Subject: [PATCH] Point: add constructor ability to init from polar or cart

Signed-off-by: HeshamTB <hishaminv@gmail.com>
---
 basictypes.py | 23 +++++++++++++++++------
 mklines.py    |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/basictypes.py b/basictypes.py
index 1b40907..e97e3df 100644
--- a/basictypes.py
+++ b/basictypes.py
@@ -6,10 +6,20 @@ class Point:
     
     IDX_X = 0
     IDX_Y = 1
+    FROM_POLAR = 0
+    FROM_CARTESIAN = 1
 
-    def __init__(self, x, y):
-        self._x = x
-        self._y = y
+    def __init__(self, cord1, cord2, mkfrom:int):
+        if mkfrom == self.FROM_CARTESIAN:
+            self._x = cord1
+            self._y = cord2
+        elif mkfrom == self.FROM_POLAR:
+            self._x = cord1 * math.cos(deg_to_rad(cord2))
+            self._y = cord1 * math.sin(deg_to_rad(cord2))
+            self._r = cord1
+            self._theta = cord2
+        else:
+            raise IncorrectCordFormat(f"mkfrom option \"%d\" is unknown" % mkfrom)
 
     def get_cartesian(self) -> tuple:
         return self.get_x(), self.get_y()
@@ -44,8 +54,8 @@ class Point:
 class PointWithID(Point):
 
     IDX_WALLID = 3
-    def __init__(self, x, y, wall_id):
-        super().__init__(x, y)
+    def __init__(self, x, y, wall_id, mkfrom:int):
+        super().__init__(x, y, mkfrom)
         self._wall_id = wall_id
 
     def get_wallid(self):
@@ -95,7 +105,7 @@ class StraightLine:
         # As a formula x = (b2 - b1)/ (m1 + m2) to find X, then apply y = mx + b on any line
         x = (line.get_b() - self.get_b()) / (line.get_m() + self.get_m())
         y = self.get_m()*x + self.get_b() # Inline to reduce overhead
-        return Point(x, y)
+        return Point(x, y, Point.FROM_CARTESIAN)
 
     def intercept_list(self, lines) -> list:
         # May return a sorted list based on distance
@@ -104,6 +114,7 @@ class StraightLine:
 
 
 class WallIDMismatch (RuntimeError): ...
+class IncorrectCordFormat (RuntimeError): ...
 
 # Helper methods
 def polar_to_cart(r, theta_deg) -> tuple:
diff --git a/mklines.py b/mklines.py
index d474d08..15d0eaa 100644
--- a/mklines.py
+++ b/mklines.py
@@ -48,7 +48,7 @@ def read_csv(filename: str, remove_header=False) -> list[PointWithID]:
         for i, row in enumerate(reader):
             if remove_header and i == 0: continue # Skip header
             # Assumes wall_id,r,theta
-            point_tmp = point_from_polar(float(row[1]), float(row[2]), row[0])
+            point_tmp = PointWithID(float(row[1]), float(row[2]), row[0], PointWithID.FROM_POLAR)
             tmp_data.append(point_tmp)
 
     return tmp_data