Add files via upload

Author: ikokkari

Diff for: cards.py

@@ -11,7 +11,7 @@ class Card:
 
     # Normally you would only put function and name declarations
     # inside a class body, but this one just goes to show that any
-    # statements inside he class body are executed the same way as
+    # statements inside the class body are executed the same way as
     # any other statements.
     print('Here we are, declaring a class...')
 
@@ -78,7 +78,7 @@ def outranks(self, other, trump=None):
 
 print(f"Here is the directory of names in {c1}:")
 print(", ".join(dir(c1)))
-print(f"Here is the directory of names its class:")
+print("Here is the directory of names its class:")
 print(", ".join(dir(Card)))
 
 # Cards have the ability to check if they outrank other cards.
@@ -89,22 +89,23 @@ def outranks(self, other, trump=None):
 print(f"Does {c1} outrank {c3} in notrump? {c1.outranks(c3)}")
 print(f"Does {c3} outrank {c1} in notrump? {c3.outranks(c1)}")
 
+
 # Watch how much easier thinking about computations becomes once the
 # concepts are sufficiently high level. One from your graded labs:
 
-
-def winning_card(cards_, trump=None, winner_so_far=None):
-    for card in cards_:
+def winning_card(cards, trump=None):
+    winner_so_far = None
+    for card in cards:
         if card.outranks(winner_so_far, trump):
             winner_so_far = card
     return winner_so_far
 
 
-cards = [c1, c2, c3, c4]
+trick = [c1, c2, c3, c4]
 # Conversion of list to string uses repr, not str, for the list elements.
-print(f"\nCards played into the trick are: {str(cards)}.")
-# Usually you want to get a human readable representation of the list.
-print(f"Cards played are: {', '.join([str(c) for c in cards])}.")
-print(f"In notrump, trick is won by {winning_card(cards, None)}.")
-print(f"Hearts as trump, trick is won by {winning_card(cards, 'hearts')}.")
-print(f"Diamonds as trump, trick is won by {winning_card(cards, 'diamonds')}.")
+print(f"\nCards played into the trick are: {str(trick)}.")
+# Usually you want to get a human-readable representation of the list.
+print(f"Cards played are: {', '.join([str(c) for c in trick])}.")
+print(f"In notrump, trick is won by {winning_card(trick, None)}.")
+print(f"Hearts as trump, trick is won by {winning_card(trick, 'hearts')}.")
+print(f"Diamonds as trump, trick is won by {winning_card(trick, 'diamonds')}.")

Diff for: shape.py

@@ -13,6 +13,7 @@
 
 rng = Random(12345)
 
+
 class Shape(ABC):
 
     # A class attribute, so the same value is shared by everyone.
@@ -98,19 +99,19 @@ def perimeter(self):
 
 class Scaled(Shape):
 
-    def __init__(self, other, scale):
+    def __init__(self, client, scale):
         super().__init__()
-        self.other = other
+        self.client = client
         self.scale = scale
 
     def name(self):
-        return f"({self.other.name()} scaled by {self.scale})"
+        return f"({self.client.name()} scaled by {self.scale})"
 
     def area(self):
-        return self.other.area() * self.scale * self.scale
+        return self.client.area() * self.scale * self.scale
 
     def perimeter(self):
-        return self.other.perimeter() * self.scale
+        return self.client.perimeter() * self.scale
 
 
 # Demonstrate the previous classes in action.
@@ -127,10 +128,10 @@ def __demo():
     print(f"Created: {r1}.")
     r2 = Rectangle(5, 5)
     print(f"Created: {r2}.")
-    c = Circle(10)
-    print(f"Created: {c}.")
-    d = Circle(5)
-    print(f"Created: {d}.")
+    c1 = Circle(10)
+    print(f"Created: {c1}.")
+    c2 = Circle(5)
+    print(f"Created: {c2}.")
 
     # Next, we ask these objects what they think they are.
     print(f"\nObject r1 is of type {type(r1)}.")
@@ -145,24 +146,24 @@ def __demo():
     # back in horror seeing something like this. But go bananas!
 
     # First, take the original names for safekeeping.
-    tmp1, tmp2 = c.name, c.area
+    tmp1, tmp2 = c1.name, c1.area
     # Lambdas can be defined to take no parameters, thus behaving
     # essentially as data.
-    c.name = lambda: "Bob"
-    c.area = lambda: rng.randint(1, 100)
-    print(f"\nObject c is now: {c}")  # Bob
-    print(f"Object d is now: {d}")    # behaves normally
+    c1.name = lambda: "Bob"
+    c1.area = lambda: rng.randint(1, 100)
+    print(f"\nObject c1 is now: {c1}")  # Bob
+    print(f"Object c2 is now: {c2}")    # behaves normally
 
     # Restore the balance of the world.
-    c.name, c.area = tmp1, tmp2
-    print(f"Object c is now: {c}")  # behaves normally again
-    print(f"Object d is now: {d}")  # behaves normally (still)
+    c1.name, c1.area = tmp1, tmp2
+    print(f"Object c1 is now: {c1}")  # behaves normally again
+    print(f"Object c2 is now: {c2}")  # behaves normally (still)
 
     # Demonstrate an object decorator in action.
     s1 = Scaled(r1, 2)
     print(f"Created: {s1}.")
-    # Why not? Scalers are shapes, same way as any other shape.
-    # Therefore they can be further decorated.
+    # Why not? Scaled objects are shapes, same way as any other shape.
+    # Therefore, they can be further decorated.
     s2 = Scaled(s1, 3)
     print(f"Created: {s2}.")
 

Diff for: temperature.py

@@ -63,6 +63,27 @@ def __str__(self):
     def __repr__(self):
         return f"Temperature({self.K}, 'K')"
 
+    # To allow order and equality comparisons, define the following
+    # dunder methods in your class for the six operators.
+
+    def __lt__(self, other):  # <
+        return self.K < other.K
+
+    def __gt__(self, other):  # >
+        return self.K > other.K
+
+    def __eq__(self, other):  # ==
+        return self.K == other.K
+
+    def __ne__(self, other):  # !=
+        return self.K != other.K
+
+    def __le__(self, other):  # <=
+        return self.K <= other.K
+
+    def __ge__(self, other):  # >=
+        return self.K >= other.K
+
     # For temperatures, addition is meaningless, but temperatures
     # can be meaningfully subtracted from each other. Weird.
     def __sub__(self, other):
@@ -77,11 +98,14 @@ def __sub__(self, other):
 
 def __demo():
     t1 = Temperature(30, 'C')
-    print(f"Temperature is {t1.C:.1f} C, {t1.F:.1f} F, {t1.K:.1f} K.")
+    print(f"Temperature t1 is {t1.C:.1f} C, {t1.F:.1f} F, {t1.K:.1f} K.")
     t2 = Temperature(100, 'F')
-    print(f"Temperature is {t2.C:.1f} C, {t2.F:.1f} F, {t2.K:.1f} K.")
+    print(f"Temperature t2 is {t2.C:.1f} C, {t2.F:.1f} F, {t2.K:.1f} K.")
     t3 = t1 - t2
     print(f"Their difference is {t3.K:.1f} K.")
+    print(f"Does t1 < t2 ? {t1 < t2}")
+    print(f"Does t1 > t2 ? {t1 > t2}")
+    print(f"Does t1 == t1 ? {t1 == t1}")
     # And the crash.
     try:
         _ = Temperature(-400, 'C')