Daniel Versluis, Mehmet Gülhan, Nina Wagenaar

assignment_1.py

@@ -15,9 +15,7 @@ def lower_case(string):
 
     """
 
-    ### your code starts here
-
-    ### your code ends here
+    lower_string = string.lower()
 
     return lower_string
 
@@ -37,8 +35,6 @@ def upper_case(string):
 
     """
 
-    ### your code starts here
-
-    ### your code ends here
+    upper_string = string.upper()
 
-    return lower_string
+    return upper_string

assignment_2a.py

@@ -9,11 +9,11 @@
 just give a correct one.
 """
 
-var_1 = function_2b(...)
+var_1 = function_2c(1000, 5, 10, -50)["add"]
 
-var_2 = function_2c(...)
+var_2 = function_2b("Seminars", "Borrel")["C"]
 
-var_3 = str(function_2b(...)) + function_2c(...)
+var_3 = str(function_2c(5, 10, 1000, 10)["multiply"]) + function_2b("CLS", "cLs")["L"]
 
 if var_1 == 950:
     print("Good job!")

assignment_2b.py

@@ -5,6 +5,20 @@
 No cheating! Don't show or tell hem the code directly
 """
 def function_2b(string_1, string_2):
+    """
+    given parameters
+    string_1 : string given as first given parameter
+    string_2 : string given as second given parameter
+
+    parameters made in function
+    lower : First string parameter in lower cases
+    upper: Second string parameter in upper cases
+    combined : A string of string_1 and string_2 combined
+
+    returned values:
+    dict : is a dictionary with keys "L", "U" and "C" with values lower, upper and combined
+    respectively
+    """
 
     lower = string_1.lower()
     upper = string_2.upper()
@@ -13,5 +27,4 @@ def function_2b(string_1, string_2):
     dict = {"L": lower,
                "U": upper,
                "C": combined}
-
     return dict

assignment_2c.py

@@ -5,6 +5,28 @@
 No cheating! Don't show or tell hem the code directly
 """
 def function_2c(w, x, y, z):
+    """ Performs multiplication, division, addition and subtraction on the input values. 
+    Parameters
+    ----------
+    w
+    A value to either add to z or from which z is subtracted
+    x
+    A value to either multiply by value y or which is divided by y
+    y 
+    A value to either multiply by value x or divide x by
+    z 
+    A value to add to w or to subtract from w
+
+    multiplication = x * y
+    division = x / y
+    addition = w + z
+    subtraction = w - z
+
+    Returns
+    -------
+    A dictionary containing the results to the four mathematical operations on the values, with keys 
+    "multiply", "divide", "add", "subtract". 
+    """
 
     multiplication = x * y
     division = x / y