Aktualizacja

Author: MichalKorzycki

17_Wstep_do_obiektowosci/README.md

@@ -1,4 +1,4 @@
-# 18. Wstęp do obiektowości
+# 17. Wstęp do obiektowości
 
 ---
 

17_Wstep_do_obiektowosci/animal_spirits.py

@@ -37,7 +37,12 @@ def play(self):
         return "Dling Dling"
 
 
-orchestra = [Guitar(), Guitar(), Drums()]
+class Kaczka:
+    def play(self):
+        return "Kwa kwa"
+
+
+orchestra = [Guitar(), Guitar(), Drums(), Kaczka()]
 for instrument in orchestra:
     print(instrument.play())
 
@@ -76,8 +81,8 @@ def get_speed(self):
 
 
 class Swallow(ABC):
-    def __init__(self):
-        self.base_speed = 120
+    def __init__(self, base_speed=120):
+        self.base_speed = base_speed
         self.load_factor = 15
         self.number_of_coconuts = 3
 
@@ -87,6 +92,7 @@ def get_speed(self):
 
 
 class EuropeanSwallow(Swallow):
+
     def get_speed(self):
         return self.base_speed
 
@@ -97,6 +103,7 @@ def get_speed(self):
 
 
 class NorwegianSwallow(Swallow):
+
     def get_speed(self):
         return self.base_speed - self.load_factor * self.number_of_coconuts * self.number_of_coconuts
 

17_Wstep_do_obiektowosci/food_items.py

@@ -17,6 +17,6 @@ def __repr__(self):
 with open('foods.csv') as csvfile:
     reader = csv.DictReader(csvfile)
     for row in reader:
-        food_list.append(FoodItem(item_id=row['Food ID'], item_name=row['Food Item'], price=row['Price']))
+        food_list.append(FoodItem(item_id=row['id'], item_name=row['name'], price=row['price']))
 
 pprint(food_list)

17_Wstep_do_obiektowosci/hermetyzacja.py

@@ -22,9 +22,12 @@ def get_salary(self):
 
 
 john = Employee('John Doe', 'computer lab', 1000)
+john.get_salary()
+
+
 john.__salary  # error
 
-john.get_salary()
+
 
 john._Employee__salary
 
@@ -36,17 +39,17 @@ def __init__(self, x, y):
         self.x = x
         self.y = y
 
-
+    @property
     def r(self):
         return math.sqrt(self.x * self.x + self.y * self.y)
 
 
 p = Point(3.0, 4.0)
-p
+
 print(p.r)
 p.r = 7  # error
-p.r()
-# Anatomia obiektu
+p.r()  # error
 
+# Anatomia obiektu
 print(p.__dict__)
 print(Point.__dict__)

17_Wstep_do_obiektowosci/oop_1.py

@@ -11,16 +11,16 @@ def f(self):
 o1 = MyClass(1)
 o2 = MyClass(2)
 
+
 o1
 
 o1.i
 o2.i
 o1.n
 o2.n
-o1.f()
+o1.f() # -> f(o1)
 o2.f()
 
-
 class MyClass:
     i = 0
 

17_Wstep_do_obiektowosci/special_methods.py

@@ -40,7 +40,8 @@ def __gt__(self, other):
 
 b > a # b.__gt__(a)
 
-b
+b < a
+
 
 
 class IntValue:
@@ -148,28 +149,38 @@ def __repr__(self):
 
 #############################################################
 
-values = ('2', '3', '4', '5', '6', '7', '8', '9', '10', 'J', 'Q', 'K', 'A')
-suits = ('clubs', 'diamonds', 'hearts', 'spades')
-
 
 class Card(object):
+    values = ('2', '3', '4', '5', '6', '7', '8', '9', '10', 'J', 'Q', 'K', 'A')
+    suits = ('clubs', 'diamonds', 'hearts', 'spades')
+
     def __init__(self, value='A', suit='spade'):
         self.value, self.suit = value, suit
         print(f"In init; value is {value}; suit is {suit}")
 
     def __repr__(self):
         return "Card('%s','%s')" % (self.value, self.suit)
 
+    def __gt__(self, other):
+        if self.suits.index(self.suit) > self.suits.index(other.suit):
+            return True
+
+        if self.suits.index(self.suit) < self.suits.index(other.suit):
+            return False
+
+        return self.values.index(self.value) > self.values.index(other.value)
+
 
 
 krol_karo = Card('K', 'diamonds')
 as_karo = Card('A', 'diamonds')
 dycha_karo = Card('10', 'diamonds')
 karty_w_rece = [ as_karo, krol_karo, dycha_karo]
 
-karty_w_rece
+print(karty_w_rece)
 
 karty_w_rece.sort()
+print(karty_w_rece)
 
 def moc_karty(karta):
     return len(values)*suits.index(karta.suit) + values.index(karta.value)