14699966, 14623366

.vs/VSWorkspaceState.json

@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\assignment_1.py",
+  "PreviewInSolutionExplorer": false
+}

assignment_1.py

@@ -16,7 +16,7 @@ def lower_case(string):
     """
 
     ### your code starts here
-
+    lower_string = string.lower()
     ### your code ends here
 
     return lower_string
@@ -38,7 +38,12 @@ def upper_case(string):
     """
 
     ### your code starts here
-
+    upper_string = string.upper()
     ### your code ends here
 
     return upper_string
+<<<<<<< HEAD
+=======
+
+>>>>>>> a56d05f31452f3198148974f311a9e5fa6a17360
+

assignment_2a.py

@@ -10,9 +10,9 @@
 just give a correct one.
 """
 
-var_1 = function_2c(...)
+var_1 = function_2c(1000, 10, 10, -50)["add"]
 
-var_2 = function_2b(...)
+var_2 = function_2b('Seminars', 'Borrel')['C']
 
 if var_1 == 950:
     print("Good job!")

assignment_2b.py

@@ -5,6 +5,15 @@
 No cheating! Don't show or tell hem the code directly
 """
 def function_2b(string_1, string_2):
+    """
+    Arguments: string_1 - string of characters converted to lower case letters
+    string_2 - string of characters converted to upper case letters
+    Return - dictionary with three options:
+    combined string of originals string "C"
+    lower case of string_1  "L"
+    uppercase of  string_2 "C"
+
+    """
 
     lower = string_1.lower()
     upper = string_2.upper()

assignment_2c.py

@@ -5,6 +5,16 @@
 No cheating! Don't show or tell hem the code directly
 """
 def function_2c(w, x, y, z):
+    """
+    Arguments:
+    w - first argument for addition and subtraction addition = w + z  subtraction = w - z
+    x - first argument for multiplication and division x*y and x/y
+    y - second argument for multiplication and division x*y and x/y cannot be 0
+    z - second argument for addition and subtraction addition = w + z  subtraction = w - z
+    Return - dictionary - results of mathematical operations :multiply, divide, add, substract
+
+
+    """
 
     multiplication = x * y
     division = x / y