Semaine 4, jour 5

Semaine_04/Fonctions/composition.py

@@ -0,0 +1,6 @@
+from math import pi
+
+class Point:
+    def __init__(self, x: float, y: float):
+        self.x = x
+        self.y = y

Semaine_04/Fonctions/shapes.py

@@ -1,10 +1,6 @@
 # Composition: traduit une relation "A UN" "POSSED UN" "DEPEND DE"
 from math import pi
-
-class Point:
-    def __init__(self, x: float, y: float):
-        self.x = x
-        self.y = y
+from composition import Point
 
 class Forme: # Abstraction
     def __init__(self, centre: Point):
@@ -16,14 +12,16 @@ class Forme: # Abstraction
     def perimetre(self):
         raise NotImplementedError("Attention perimetre doit etre redefini") 
 
-class Cercle(Forme):
+class Cercle:
     def __init__(self, centre: Point, rayon: float):
-        super().__init__(centre)
+        self.centre = centre
         self.rayon = rayon
     
+    @property
     def aire(self):
         return pi * self.rayon ** 2
     
+    @property
     def perimetre(self):
         return 2 * pi * self.rayon