Minor updates to exercises

irlc/ex00/fruit_homework.py

@@ -4,116 +4,55 @@ def add(a, b):
     # TODO: 1 lines missing.
     raise NotImplementedError("Implement function body")
 
-def misterfy(animals): 
+def misterfy(animals : list[str]) -> list[str]: 
     """
     Given a list of animals like animals=["cat", "wolf", "elephans"], this function should return
     a list like ["mr cat", "mr wolf", "mr elephant"]  """
     # TODO: 1 lines missing.
     raise NotImplementedError("Implement function body")
 
-def mean_value(p_dict): 
+def mean_value(p_dict : dict) -> float: 
     """
     Given a dictionary of the form: {x: probability_of_x, ...} compute the mean value of
     x, i.e. sum_i x_i * p(x_i). The recommended way is to use list comprehension and not numpy.
     Hint: Look at the .items() method and the build-in sum(my_list) method. """
     # TODO: 1 lines missing.
     raise NotImplementedError("Implement function body")
-
-def fruits_ordered(order_dict): 
-    # TODO: 1 lines missing.
-    raise NotImplementedError("Implement function body")
-
-class BasicFruitShop:
-    """ This is a simple class that represents a fruit-shop.
-    You instantiate it with a dictionary of prices """
-    def __init__(self, name, prices):
-        """ prices is a dictionary of the form {fruit_name: cost}. For instance
+#
+# def fruits_ordered(order_dict): 
+    """This is a simple class that represents a fruit-shop.
+    You should give it a dictionary of prices when you initialize it."""
+        """prices is a dictionary of the form {fruit_name: cost}. For instance
         prices = {'apple': 5, 'orange': 6} """
-        self.name = name
-        self.prices = prices
-
-    def cost(self, fruit): 
         """ Return the cost in pounds of the fruit with name 'fruit'. It uses the self.prices variable
         to get the price.
         You don't need to do exception handling here. """
-        # TODO: 1 lines missing.
-        raise NotImplementedError("Return cost of fruit as a floating point number")
-
-class OnlineFruitShop(BasicFruitShop):
-    def price_of_order(self, order): 
-        """
-        order_dict = {'apple': 5, 'pear': 2, ...} where the numbers are the quantity ordered.
-
-        Hints: Dictionary comprehension like:
-         > for fruit, pounds in order_dict.items()
-         > self.getCostPerPound(fruit) allows you to get cost of a fruit
-         > the total is sum of {pounds} * {cost_per_pound}
-        """
-        # TODO: 1 lines missing.
-        raise NotImplementedError("return the total cost of the order")
-
-
-def shop_smart(order, fruit_shops): 
-    """
-        order_dict: dictionary {'apple': 3, ...} of fruits and the pounds ordered
-        fruitShops: List of OnlineFruitShops
-
-    Hints:
-        > Remember there is a s.price_of_order method
-        > Use this method to first make a list containing the cost of the order at each fruit shop
-        > List has form [cost1, cost2], then find the index of the smallest value (the list has an index-function)
-        > return fruitShops[lowest_index].
-    """
-    # TODO: 2 lines missing.
-    raise NotImplementedError("Implement function body")
-    return best_shop
-
-
-if __name__ == '__main__':
-    "This code runs when you invoke the script from the command line (but not otherwise)"
-
+#         """
+#         order_dict = {'apple': 5, 'pear': 2, ...} where the numbers are the quantity ordered.
+#
+#         Hints: Dictionary comprehension like:
+#          > for fruit, pounds in order_dict.items()
+#          > self.getCostPerPound(fruit) allows you to get cost of a fruit
+#          > the total is sum of {pounds} * {cost_per_pound}
+#         """
+#     """
+#         order_dict: dictionary {'apple': 3, ...} of fruits and the pounds ordered
+#         fruitShops: List of OnlineFruitShops
+#
+#     Hints:
+#         > Remember there is a s.price_of_order method
+#         > Use this method to first make a list containing the cost of the order at each fruit shop
+#         > List has form [cost1, cost2], then find the index of the smallest value (the list has an index-function)
+#         > return fruitShops[lowest_index].
+#     """
     """ Quesion 1: Lists and basic data types """
-    print("add(2,5) function should return 7, and it returned", add(2, 5))  
-
-    animals = ["cat", "giraffe", "wolf"] 
-    print("The nice animals are", misterfy(animals)) 
-
     """  
     This problem represents the probabilities of a loaded die as a dictionary such that     
     > p(roll=3) = p_dict[3] = 0.15.
     """
-    p_die = {1: 0.20,
-             2: 0.10,
-             3: 0.15,
-             4: 0.05,
-             5: 0.10,
-             6: 0.40}
-    print("Mean roll of die, sum_{i=1}^6 i * p(i) =", mean_value(p_die)) 
-
-    order = {'apples': 1.0, 
-              'oranges': 3.0}
-    print("The different fruits in the fruit-order is", fruits_ordered(order)) 
-
     """ Part B: A simple class """
-    price1 = {"apple": 4, "pear": 8, 'orange': 10} 
-    shop1 = BasicFruitShop("Alis Funky Fruits", price1)
-
-    price2 = {'banana': 9, "apple": 5, "pear": 7, 'orange': 11}
-    shop2 = BasicFruitShop("Hansen Fruit Emporium", price2)
-
-    fruit = "apple"
-    print("The cost of", fruit, "in", shop1.name, "is", shop1.cost(fruit))
-    print("The cost of", fruit, "in", shop2.name, "is", shop2.cost(fruit)) 
-
-    """ Part C: Class inheritance """
-    price_of_fruits = {'apples': 2, 'oranges': 1, 'pears': 1.5, 'mellon': 10} 
-    shopA = OnlineFruitShop('shopA', price_of_fruits)
-    print("The price of the given order in shopA is", shopA.price_of_order(order))  
-
-    """ Part C: Using classes """
-    shopB = OnlineFruitShop('shopB', {'apples': 1.0, 'oranges': 5.0}) 
-
-    shops = [shopA, shopB]
-    print("For the order", order, " the best shop is", shop_smart(order, shops).name)
-    order = {'apples': 3.0}  # test with a new order.
-    print("For the order", order, " the best shop is", shop_smart(order, shops).name) 
+    # """ Part C: Class inheritance """
+    # """ Part C: Using classes """
+# TODO: 60 lines missing.
+raise NotImplementedError("Implement function body")
+    # print("For the order", order, " the best shop is", shop_smart(order, shops).name) 

irlc/project0/fruit_project_tests.py

 # This file may not be shared/redistributed without permission. Please read copyright notice in the git repo. If this file contains other copyright notices disregard this text.
 from unitgrade import UTestCase, Report
-from irlc.ex00.fruit_homework import add, misterfy, mean_value, fruits_ordered, BasicFruitShop, OnlineFruitShop, shop_smart
+from irlc.ex00.fruit_homework import add, misterfy, mean_value, BasicFruitShop
+# from irlc.ex00.fruit_homework import add, misterfy, mean_value, fruits_ordered, BasicFruitShop, OnlineFruitShop, shop_smart
 from unitgrade import hide
 
 class AdditionQuestion(UTestCase):
@@ -37,18 +38,18 @@ class MeanOfDie(UTestCase):
 
 
 
-class FruitsOrdered(UTestCase):
-    """ Problem 4: The fruits_ordered function """
-    def test_fruits_ordered(self):
-        """ fruits_ordered """
-        order = {'apples': 1.0,
-                 'oranges': 3.0}
-        self.assertEqualC(list(sorted(fruits_ordered(order))))
-        order2 = {'banana': 4,
-                  'apples': 1.0,
-                  'oranges': 3.0,
-                  'pears': 4}
-        self.assertEqualC(list(sorted(fruits_ordered(order2))))
+# class FruitsOrdered(UTestCase):
+#     """ Problem 4: The fruits_ordered function """
+#     def test_fruits_ordered(self):
+#         """ fruits_ordered """
+#         order = {'apples': 1.0,
+#                  'oranges': 3.0}
+#         self.assertEqualC(list(sorted(fruits_ordered(order))))
+#         order2 = {'banana': 4,
+#                   'apples': 1.0,
+#                   'oranges': 3.0,
+#                   'pears': 4}
+#         self.assertEqualC(list(sorted(fruits_ordered(order2))))
 
 
 class BasicClass(UTestCase):
@@ -66,39 +67,39 @@ class BasicClass(UTestCase):
         self.assertEqualC(shop2.cost("banana"))
 
 
-class Inheritance(UTestCase):
-    title = "Problem 6: Inheritance"
-
-    def test_price_of_order(self):
-        """ Testing the price_of_order function """
-        price_of_fruits = {'apples': 2, 'oranges': 1, 'pears': 1.5, 'mellon': 10, 'banana': 1.5}
-        shopA = OnlineFruitShop('shopA', price_of_fruits)
-
-        order1 = {'apples': 1.0,
-                 'oranges': 3.0}
-        self.assertL2(shopA.price_of_order(order1), tol=1e-8)
-        order2 = {'banana': 4,
-                  'apples': 1.0,
-                  'oranges': 3.0,
-                  'pears': 4}
-        self.assertL2(shopA.price_of_order(order2), tol=1e-8)
-
-
-class ClassUse(UTestCase):
-    title = "Problem 7: Using classes"
-
-    def test_shop_smarter(self):
-        """ Testing the shop_smarter function """
-        price_of_fruits = {'apples': 2, 'oranges': 1, 'pears': 1.5, 'mellon': 10}
-        shopA = OnlineFruitShop('shopA', price_of_fruits)
-        shopB = OnlineFruitShop('shopB', {'apples': 1.0, 'oranges': 5.0})
-
-        shops = [shopA, shopB]
-        order = {'apples': 1.0,
-                 'oranges': 3.0}
-        self.assertEqualC(shop_smart(order, shops).name)
-        order = {'apples': 3.0}  # test with a new order.
-        self.assertEqualC(shop_smart(order, shops).name)
+# class Inheritance(UTestCase):
+#     title = "Problem 6: Inheritance"
+#
+#     def test_price_of_order(self):
+#         """ Testing the price_of_order function """
+#         price_of_fruits = {'apples': 2, 'oranges': 1, 'pears': 1.5, 'mellon': 10, 'banana': 1.5}
+#         shopA = OnlineFruitShop('shopA', price_of_fruits)
+#
+#         order1 = {'apples': 1.0,
+#                  'oranges': 3.0}
+#         self.assertL2(shopA.price_of_order(order1), tol=1e-8)
+#         order2 = {'banana': 4,
+#                   'apples': 1.0,
+#                   'oranges': 3.0,
+#                   'pears': 4}
+#         self.assertL2(shopA.price_of_order(order2), tol=1e-8)
+
+
+# class ClassUse(UTestCase):
+#     title = "Problem 7: Using classes"
+#
+#     def test_shop_smarter(self):
+#         """ Testing the shop_smarter function """
+#         price_of_fruits = {'apples': 2, 'oranges': 1, 'pears': 1.5, 'mellon': 10}
+#         shopA = OnlineFruitShop('shopA', price_of_fruits)
+#         shopB = OnlineFruitShop('shopB', {'apples': 1.0, 'oranges': 5.0})
+#
+#         shops = [shopA, shopB]
+#         order = {'apples': 1.0,
+#                  'oranges': 3.0}
+#         self.assertEqualC(shop_smart(order, shops).name)
+#         order = {'apples': 3.0}  # test with a new order.
+#         self.assertEqualC(shop_smart(order, shops).name)
 
 
 class FruitReport(Report):
@@ -107,10 +108,10 @@ class FruitReport(Report):
     questions = [(AdditionQuestion, 10),
                  (MisterfyQuestion, 10),
                  (MeanOfDie, 10),
-                 (FruitsOrdered, 10),
-                 (BasicClass, 10),
-                 (Inheritance, 10),
-                 (ClassUse, 10)]
+                 (BasicClass, 10)]
+                 # (FruitsOrdered, 10),
+                 # (Inheritance, 10),
+                 # (ClassUse, 10)]
 
     import irlc
     pack_imports = [irlc]

requirements_conda.txt

-# On linux, you should run this command (or equivalent) also need these packages:
-# > apt install build-essential python3.11-dev swig
-# (replace 3.11 with your python version; for instance python3.12-dev.
-gymnasium[box2d]
-torch
-sympy
-tqdm
-seaborn
-pillow
-scikit-learn
-matplotlib
-requests # Required when updating the local files (read stuff from gitlab).
-pyqt6 # Try pyqt
-pygame
-