From 5dfd0ea8cd1a59b0611441601febd32d8c9dac30 Mon Sep 17 00:00:00 2001
From: niklas <niklas.birk.nb@gmail.com>
Date: Wed, 29 Nov 2023 19:40:30 +0100
Subject: [PATCH] more uebung 05

---
 uebung_05/exercise_03/.exercise_03.py.swp | Bin 12288 -> 0 bytes
 uebung_05/exercise_03/exercise_03.py      |  19 +++++++------------
 2 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 uebung_05/exercise_03/.exercise_03.py.swp

diff --git a/uebung_05/exercise_03/.exercise_03.py.swp b/uebung_05/exercise_03/.exercise_03.py.swp
deleted file mode 100644
index 06bd1b19e5ea68a1ea5f40e74f072d300d36ce28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2zmMER6vyWf2|q&km49Gx1bB(h`|D1MPFxibKSUHHAUY~zuV;6y_1e~W%-K2u
z5&|Sj%Fu%l1r1W5g9a385Ct`ef`TRpXae7{XLp_br3+1nZmj#9XFT)Xy!V}Fdr!As
z>*90g=~=r&a6CxJ2X7D9dmEo^Jn9h=1*6bSy?~G8;Oe8Aw;9EPd2zgY@|!b<&8Ol~
zHfE7v%~WK5kd2!OcSj<?RcAj)Qx>JYq1zW>&>OPU;jA}|Sk%mzmqi1owcTVn<Gmnd
zPODpQ+exuHP(7j*IMNE7B;8KCB_%j*JVH-B{K}D5Lnp5l&<bb;v;tZIt$<cQE1(rP
zY6^&CgS>^L?@)<fQ0I-gv+C-TRzNGD70?Q31+)TM0j+>mKr5gX&<bb;v;w!G0<KTU
z&&LRP@-76A|Nl?^{=fDBAwPic!METF_!xWy4uB8NgBQRy_~(8?u7h8}m*5L<8N3e)
zkb{@Naq!JaLf!$dgEnY^hrl2A5poUu2oAs=cpe-BcY<F|5b_<k3O)tzg0tYydl4V_
z1oVIh&Vk3lW8eh%`W`|Acopn{bD#lCa0>i=Hz9w4-@s4cD)=0H2rh%yfC+wwPFKJs
z@CF!yJ@71e21p&hI({1#f(}_LpcT*x{NEKwLSd)Fc;9Rgk|a0uFcPu>i+ocAB4l)z
z8mDR8r!NmVbN$q45IH@J2l#=x>=dEv{bwKZhSC`eO`}jN<*J{nei@Z%ych?OkkOP8
zBw;MfWZNDv;pAq+qN-iUwvl8!37KKhvCBt{%amf}tuoxI8CLB>8g^@jRl71QSQy6p
zYgX*k46Al!IN*#$YwX%JyQ*E;#oUbsiz$+18`&mXHitfAR}AeWpiSDrzHMQkL!Y2Y
zhn}HHmu}KF!D*M4%2KmymD4(tD`wlGZP>M^7oa^=2WKMV5lvaxw;iW&oN~lxeJXdP
zFy%mFXVv_CZhpRMei@pXTeN6Qmo5+w-7IrUgUIxml(2!sR4{Ok1k3SWoGy+}f|Z%%
z(%0&#HCIcQnz)jAOTlFX7F7`~&mM8cV#xSZFUR5IEOZ=YTn^TilVNffU)iJ=-7sTM
za~^ZkxR5XufKSI+DyYY*J+vrp5gK#a4`Wx@sCa2C4;H3uhm=kAOKo5!a7{TCo>f;<
zU8}nb`ZRzfsc@qnGs~dM)f;m8#gQ@~WOWk}psXPOvN)=On?<uUmNGH5qTC+GS*vob
zo^fL=>`<C{w`zyv-k_e%&8jk{60XU5`5vG)4zW9xR%`REYjtK(E7$jLl~xPYtiqdC
z5pGy$Ij1BGmuh)9y(SgC>V8tI%~f+Pj+?6H>F&#iV9Rbz`|?3H=~r90b{lSpc5`<7
zTXfPvgw-8Zd5hRUZEF45q}=ok^I+y<$L{toS(6L!Q(kBoWvr^a1YhD!xsclI(qfw0
z%rh?MH7`LFh-sxM0q~}%l$eBBzMN{}lus4a@8Ns;Y4zyD!#WrzF&FY}AU`97frl@}
P%NBK0iq9;y@geyaL^Uo+

diff --git a/uebung_05/exercise_03/exercise_03.py b/uebung_05/exercise_03/exercise_03.py
index 53fcd5e..5f771c3 100644
--- a/uebung_05/exercise_03/exercise_03.py
+++ b/uebung_05/exercise_03/exercise_03.py
@@ -16,9 +16,6 @@ class Point:
         return Point(-self.__x__, -self.__y__)
 
     def __add__(self, other):
-        x = 0.0
-        y = 0.0
-
         if isinstance(other, Point):
             return Point(self.__x__ + other.__x__, self.__y__ + other.__y__)
         elif isinstance(other, int) or isinstance(other, float):
@@ -30,10 +27,7 @@ class Point:
         return self + other
 
     def __sub__(self, other):
-        if isinstance(other, Point) or isinstance(other, int) or isinstance(other, float):
-            return self + (-other)
-        else:
-            raise ValueError("Operand must be Point, int or float.")
+        return self + (-other)
 
     def __rsub__(self, other):
         return self - other
@@ -66,14 +60,15 @@ p3 = Point (3, 2)
 p4 = 2 * p2 + p3 - 1
 p5 = p4.rot(math.pi / 2)
 
-plt.plot(p1.get_x(), p1.get_y(), "orange", marker = "o")
-plt.plot(p2.get_x(), p2.get_y(), "green", marker = "o")
-plt.plot(p3.get_x(), p3.get_y(), "yellow", marker = "o")
-plt.plot(p4.get_x(), p4.get_y(), "purple", marker = "o")
-plt.plot(p5.get_x(), p5.get_y(), "purple", marker = "o")
+plt.plot(p1.get_x(), p1.get_y(), "orange", marker = "o", label = p1)
+plt.plot(p2.get_x(), p2.get_y(), "green", marker = "o", label = p2)
+plt.plot(p3.get_x(), p3.get_y(), "yellow", marker = "o", label = p3)
+plt.plot(p4.get_x(), p4.get_y(), "purple", marker = "o", label = 2 * p2 + p3 - 1)
+plt.plot(p5.get_x(), p5.get_y(), "purple", marker = "o", label = f"{p4} rotated 90°")
 
 plt.title("Points")
 plt.xlabel("x")
 plt.ylabel("y")
+plt.legend()
 
 plt.show()